Skip to content

Commit f089a99

Browse files
committed
fixes #1610 - more adjustments to new design with colors and link states
1 parent f12b936 commit f089a99

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

assets/sass/base/_variables.scss

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
$purple: #652f8f;
22
$pink: #e90e8b;
33
$gray: #999999;
4+
$dark-gray: #333333;
45
$gray-border: #cecece;
56

67
// derived from bootstrap variables
78

89
// Extra small screen / phone
9-
$screen-xs: 480px !default;
10-
$screen-phone: $screen-xs !default;
10+
$screen-xs: 480px !default;
11+
$screen-phone: $screen-xs !default;
1112

1213
// Small screen / tablet
13-
$screen-sm: 768px !default;
14-
$screen-tablet: $screen-sm !default;
14+
$screen-sm: 768px !default;
15+
$screen-tablet: $screen-sm !default;
1516

1617
// Medium screen / desktop
17-
$screen-md: 1024px !default;
18-
$screen-desktop: $screen-md !default;
18+
$screen-md: 1024px !default;
19+
$screen-desktop: $screen-md !default;
1920

2021
// Large screen / wide desktop
21-
$screen-lg: 1366px !default;
22-
$screen-lg-desktop: $screen-lg !default;
22+
$screen-lg: 1366px !default;
23+
$screen-lg-desktop: $screen-lg !default;
2324

2425
// So media queries don't overlap when required, provide a maximum
25-
$screen-xs-max: ($screen-sm - 1) !default;
26-
$screen-sm-max: ($screen-md - 1) !default;
27-
$screen-md-max: ($screen-lg - 1) !default;
26+
$screen-xs-max: ($screen-sm - 1) !default;
27+
$screen-sm-max: ($screen-md - 1) !default;
28+
$screen-md-max: ($screen-lg - 1) !default;

assets/sass/layout/_header.scss

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,25 @@
1919
padding: 0 25px;
2020
margin: 20px 0;
2121
}
22-
23-
a.active {
24-
color: color.adjust(variables.$purple, $lightness: -15%, $space: hsl);
25-
}
2622
}
2723

2824
.top-navigation {
29-
background-color: #333;
25+
background-color: variables.$dark-gray;
3026
@include mixins.readable-content;
3127

3228
.navigation {
3329
margin-left: 15px;
3430
padding: 10px;
31+
3532
a {
3633
font-size: 16px;
3734
color: #aaa;
3835
margin-right: 40px;
3936

37+
&.active {
38+
color: #fff;
39+
}
40+
4041
&:hover {
4142
color: #fff;
4243
}
@@ -100,11 +101,15 @@
100101

101102
a {
102103
margin-right: 30px;
103-
color: #63338f;
104+
color: variables.$purple;
104105
white-space: nowrap;
105106

107+
&.active {
108+
color: variables.$dark-gray;
109+
}
110+
106111
&:hover {
107-
color: color.adjust(variables.$purple, $lightness: -15%, $space: hsl);
112+
color: variables.$dark-gray;
108113
}
109114
}
110115
}

0 commit comments

Comments
 (0)