Skip to content

Commit

Permalink
SHARE: title image credits, darken active menu item color
Browse files Browse the repository at this point in the history
  • Loading branch information
@nursix
nursix committed Jul 10, 2018
1 parent de60ce7 commit 1497739
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
@@ -1 +1 @@
nursix-dev-2252-ga54a69e (2018-07-09 15:08:17)
nursix-dev-2253-gde60ce7 (2018-07-10 17:01:26)
2 changes: 1 addition & 1 deletion static/themes/SHARE/eden.min.css
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions static/themes/SHARE/foundation/foundation.css
View file
Expand Up @@ -6064,7 +6064,7 @@ meta.foundation-mq-topbar {
}
/* line 331, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section ul li {
background: #fed14c;
background: #ffbe00;
}
/* line 334, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section ul li > a {
Expand Down Expand Up @@ -6256,7 +6256,7 @@ meta.foundation-mq-topbar {
.top-bar-section ul li:hover:not(.has-form) > a {
background-color: #555555;
color: #FFFFFF;
background: #ffbe00;
background: #fba629;
}
/* line 383, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section ul li.active > a {
Expand All @@ -6265,7 +6265,7 @@ meta.foundation-mq-topbar {
}
/* line 387, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section ul li.active > a:hover {
background: #ffbe00;
background: #fba629;
color: #FFFFFF;
}
/* line 395, ../../foundation/scss/components/_top-bar.scss */
Expand Down Expand Up @@ -6461,7 +6461,7 @@ meta.foundation-mq-topbar {
/* line 553, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section li.hover > a:not(.button) {
background-color: #555555;
background: #ffbe00;
background: #fba629;
color: #FFFFFF;
}
/* line 563, ../../foundation/scss/components/_top-bar.scss */
Expand All @@ -6473,7 +6473,7 @@ meta.foundation-mq-topbar {
/* line 567, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section li:not(.has-form) a:not(.button):hover {
background-color: #555555;
background: #ffbe00;
background: #fba629;
}
/* line 577, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section li.active:not(.has-form) a:not(.button) {
Expand All @@ -6484,7 +6484,7 @@ meta.foundation-mq-topbar {
}
/* line 582, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section li.active:not(.has-form) a:not(.button):hover {
background: #ffbe00;
background: #fba629;
color: #FFFFFF;
}
/* line 592, ../../foundation/scss/components/_top-bar.scss */
Expand Down Expand Up @@ -6552,22 +6552,22 @@ meta.foundation-mq-topbar {
}
/* line 640, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section .dropdown li a {
background: #fed14c;
background: #ffbe00;
color: #FFFFFF;
line-height: 2.8125rem;
padding: 12px 0.9375rem;
white-space: nowrap;
}
/* line 649, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section .dropdown li:not(.has-form):not(.active) > a:not(.button) {
background: #fed14c;
background: #ffbe00;
color: #FFFFFF;
}
/* line 654, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section .dropdown li:not(.has-form):not(.active):hover > a:not(.button) {
background-color: #555555;
color: #FFFFFF;
background: #ffbe00;
background: #fba629;
}
/* line 663, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section .dropdown li label {
Expand Down Expand Up @@ -6617,7 +6617,7 @@ meta.foundation-mq-topbar {
/* line 716, ../../foundation/scss/components/_top-bar.scss */
.no-js .top-bar-section ul li:hover > a {
background-color: #555555;
background: #ffbe00;
background: #fba629;
color: #FFFFFF;
}
/* line 725, ../../foundation/scss/components/_top-bar.scss */
Expand Down
2 changes: 1 addition & 1 deletion static/themes/SHARE/foundation/foundation.min.css
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions static/themes/SHARE/foundation/foundation.rtl.css
View file
Expand Up @@ -6065,7 +6065,7 @@ meta.foundation-mq-topbar {
}
/* line 331, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section ul li {
background: #fed14c;
background: #ffbe00;
}
/* line 334, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section ul li > a {
Expand Down Expand Up @@ -6257,7 +6257,7 @@ meta.foundation-mq-topbar {
.top-bar-section ul li:hover:not(.has-form) > a {
background-color: #555555;
color: #FFFFFF;
background: #ffbe00;
background: #fba629;
}
/* line 383, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section ul li.active > a {
Expand All @@ -6266,7 +6266,7 @@ meta.foundation-mq-topbar {
}
/* line 387, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section ul li.active > a:hover {
background: #ffbe00;
background: #fba629;
color: #FFFFFF;
}
/* line 395, ../../foundation/scss/components/_top-bar.scss */
Expand Down Expand Up @@ -6462,7 +6462,7 @@ meta.foundation-mq-topbar {
/* line 553, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section li.hover > a:not(.button) {
background-color: #555555;
background: #ffbe00;
background: #fba629;
color: #FFFFFF;
}
/* line 563, ../../foundation/scss/components/_top-bar.scss */
Expand All @@ -6474,7 +6474,7 @@ meta.foundation-mq-topbar {
/* line 567, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section li:not(.has-form) a:not(.button):hover {
background-color: #555555;
background: #ffbe00;
background: #fba629;
}
/* line 577, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section li.active:not(.has-form) a:not(.button) {
Expand All @@ -6485,7 +6485,7 @@ meta.foundation-mq-topbar {
}
/* line 582, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section li.active:not(.has-form) a:not(.button):hover {
background: #ffbe00;
background: #fba629;
color: #FFFFFF;
}
/* line 592, ../../foundation/scss/components/_top-bar.scss */
Expand Down Expand Up @@ -6553,22 +6553,22 @@ meta.foundation-mq-topbar {
}
/* line 640, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section .dropdown li a {
background: #fed14c;
background: #ffbe00;
color: #FFFFFF;
line-height: 2.8125rem;
padding: 12px 0.9375rem;
white-space: nowrap;
}
/* line 649, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section .dropdown li:not(.has-form):not(.active) > a:not(.button) {
background: #fed14c;
background: #ffbe00;
color: #FFFFFF;
}
/* line 654, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section .dropdown li:not(.has-form):not(.active):hover > a:not(.button) {
background-color: #555555;
color: #FFFFFF;
background: #ffbe00;
background: #fba629;
}
/* line 663, ../../foundation/scss/components/_top-bar.scss */
.top-bar-section .dropdown li label {
Expand Down Expand Up @@ -6618,7 +6618,7 @@ meta.foundation-mq-topbar {
/* line 716, ../../foundation/scss/components/_top-bar.scss */
.no-js .top-bar-section ul li:hover > a {
background-color: #555555;
background: #ffbe00;
background: #fba629;
color: #FFFFFF;
}
/* line 725, ../../foundation/scss/components/_top-bar.scss */
Expand Down
2 changes: 1 addition & 1 deletion static/themes/SHARE/foundation/foundation.rtl.min.css
View file

Large diffs are not rendered by default.

Binary file modified static/themes/SHARE/img/intro.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions static/themes/SHARE/scss/_settings.scss
View file
Expand Up @@ -117,8 +117,8 @@ $oil : #333333;

// SHARE Color Theme
$skyblue : #0c9cd0;
$amber : #fba629;
$honey : #ffbe00;
$brightyellow : #fed14c;
$forest : #6c8c20;
$grass : #90c147;
$darkrose : #c42648;
Expand Down Expand Up @@ -1433,10 +1433,10 @@ $topbar-link-weight: bold;
// $topbar-link-font-size: rem-calc(13);
// $topbar-link-hover-lightness: -10%; // Darken by 10%
// $topbar-link-bg: $topbar-bg;
$topbar-link-bg-hover: $honey;
$topbar-link-bg-hover: $amber;
// $topbar-link-bg-color-hover: $charcoal;
$topbar-link-bg-active: scale-color($primary-color, $lightness: -10%);
$topbar-link-bg-active-hover: $honey;
$topbar-link-bg-active-hover: $amber;
// $topbar-link-font-family: $body-font-family;
// $topbar-link-text-transform: none;
// $topbar-link-padding: ($topbar-height / 3);
Expand All @@ -1446,7 +1446,7 @@ $topbar-link-bg-active-hover: $honey;
// $topbar-button-top: 7px;

// Style the top bar dropdown elements
$topbar-dropdown-bg: $brightyellow;
$topbar-dropdown-bg: $honey;
// $topbar-dropdown-link-color: $white;
// $topbar-dropdown-link-color-hover: $topbar-link-color-hover;
$topbar-dropdown-link-bg: $topbar-dropdown-bg;
Expand Down
2 changes: 1 addition & 1 deletion static/themes/SHARE/scss/theme/_misc.scss
View file
Expand Up @@ -19,7 +19,7 @@
}

#intro {
background: url(img/intro.png) center no-repeat !important;
background: url(img/intro.png) left center no-repeat !important;
min-height: 260px;
h1 {
color: white;
Expand Down
2 changes: 1 addition & 1 deletion static/themes/SHARE/theme.css
View file
Expand Up @@ -1592,7 +1592,7 @@ form.anonymize-form,

/* line 21, ../scss/theme/_misc.scss */
#intro {
background: url(img/intro.png) center no-repeat !important;
background: url(img/intro.png) left center no-repeat !important;
min-height: 260px;
}
/* line 24, ../scss/theme/_misc.scss */
Expand Down

0 comments on commit 1497739

Please sign in to comment.