Skip to content
This repository was archived by the owner on Jun 7, 2023. It is now read-only.

Commit 3d9c185

Browse files
committedApr 9, 2019
IW-1808 | Update of DS after design review
1 parent 7b379e9 commit 3d9c185

File tree

6 files changed

+55
-31
lines changed

6 files changed

+55
-31
lines changed
 

‎extensions/wikia/DesignSystem/node_modules/design-system/dist/css/styles.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extensions/wikia/DesignSystem/node_modules/design-system/dist/scss/wds-components/_global-navigation-wikia-org.scss

+16-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extensions/wikia/DesignSystem/package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extensions/wikia/DesignSystem/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"build-templates": "npm install && npx grunt"
66
},
77
"dependencies": {
8-
"design-system": "git://github.com/Wikia/design-system.git#34ff33e9598998281f58416b55871ac88fa597e4",
8+
"design-system": "git://github.com/Wikia/design-system.git#aceb52edb3c9698b1c63d9e3098c798f59d28693",
99
"design-system-i18n": "Wikia/design-system-i18n#2.0.2",
1010
"ember-fetch": "^6.4.0",
1111
"grunt": "~0.4.2",

‎extensions/wikia/DesignSystem/services/templates/DesignSystemGlobalNavigation_index.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="wds-global-navigation-wrapper">
2-
<div id="globalNavigation" class="wds-global-navigation wds-search-is-always-visible<?= !empty($model['partner-slot']) ? ' wds-has-partner-slot' : ''?><?= !empty($model['is-wikia-org']) ? ' wds-is-wikia-org' : ''?>">
2+
<div id="globalNavigation" class="wds-global-navigation wds-search-is-always-visible<?= !empty($model['partner-slot']) && empty($model['is-wikia-org']) ? ' wds-has-partner-slot' : ''?><?= !empty($model['is-wikia-org']) ? ' wds-is-wikia-org' : ''?>">
33
<div class="wds-global-navigation__content-bar-left">
44
<a
55
href="<?= Sanitizer::encodeAttribute( $model['logo']['href'] ); ?>"
@@ -32,7 +32,7 @@ class="wds-global-navigation__logo"
3232
<?php endif; ?>
3333
</div>
3434
</div>
35-
<?php if ( !empty( $model['partner-slot'] ) ): ?>
35+
<?php if ( !empty( $model['partner-slot'] ) && empty($model['is-wikia-org']) ): ?>
3636
<?= $app->renderView(
3737
'DesignSystemGlobalNavigationService',
3838
'partnerSlot',

‎package-lock.json

+33-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
This repository has been archived.