Skip to content

Commit 2966f3b

Browse files
HofiOneHofiOne
committed
Further hardcoded color removals
Signed-off-by: Hofi <hofione@gmail.com>
1 parent 91c0072 commit 2966f3b

File tree

9 files changed

+62
-52
lines changed

9 files changed

+62
-52
lines changed

‎_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
remote_theme: mmistakes/minimal-mistakes@4.24.0
44
#theme: minimal-mistakes-jekyll
5-
minimal_mistakes_skin: "midnight" # "default" # "air", "aqua", "contrast", "dark", "dirt", "neon", "mint", "plum", "sunrise"
5+
minimal_mistakes_skin: "midnight" # "default", "air", "aqua", "contrast", "dark", "dirt", "midnight", "mint", "neon", "plum", "sunrise"
66

77
# Disable caching of content to disk in order to skip creating a .jekyll-cache or similar directory
88
disable_disk_cache: true

‎_sass/minimal-mistakes/minimal-mistakes/_archive.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
right: 0;
102102
margin: 0 auto;
103103
padding: 2px 5px;
104-
color: #fff;
104+
color: #fff; // FIXME: archive is not used, add to _variables,scss if used
105105
font-family: $caption-font-family;
106106
font-size: $type-size-8;
107107
background: #000;
@@ -115,7 +115,7 @@
115115
}
116116

117117
a {
118-
color: #fff;
118+
color: #fff;// FIXME: archive is not used, add to _variables,scss if used
119119
text-decoration: none;
120120
}
121121
}

‎_sass/minimal-mistakes/minimal-mistakes/_forms.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ input[type="file"] {
148148

149149
select {
150150
width: auto;
151-
background-color: #fff;
151+
background-color: red; // FIXME: forms is not used, add to _variables,scss if used
152152
}
153153

154154
select[multiple],
@@ -346,7 +346,7 @@ select:focus {
346346
left: 0;
347347
width: 100%;
348348
height: 100%;
349-
background-color: rgba(255, 255, 255, 0.7);
349+
background-color: rgba(255, 255, 255, 0.7); // FIXME: forms is not used, add to _variables,scss if used
350350
z-index: 10;
351351
}
352352

‎_sass/minimal-mistakes/minimal-mistakes/_navigation.scss

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
text-align: center;
9090
text-decoration: none;
9191
color: $link-color;
92-
border: 1px solid mix(#000, $border-color, 25%);
92+
border: 1px solid $darker-border-color;
9393
border-radius: 0;
9494

9595
&:hover {
@@ -98,12 +98,12 @@
9898

9999
&.current,
100100
&.current.disabled {
101-
color: #fff;
102-
background: $primary-color;
101+
color: $menuitem-hovered-color;
102+
background-color: $menuitem-hovered-background-color;
103103
}
104104

105105
&.disabled {
106-
color: rgba($muted-text-color, 0.5);
106+
color: $semi-transparent-muted-text-color;
107107
pointer-events: none;
108108
cursor: not-allowed;
109109
}
@@ -166,15 +166,18 @@
166166
text-decoration: none;
167167
color: $link-color;
168168

169-
border: 1px solid mix(#000, $border-color, 25%);
169+
border: 1px solid $darker-border-color;
170170
border-radius: $border-radius;
171171

172172
padding: 16px;
173173
margin-right: 0;
174174
margin-left: 0px;
175175

176176
&:hover {
177-
@include yiq-contrasted($muted-text-color);
177+
//@include yiq-contrasted($muted-text-color);
178+
// This one is confor to the other menu item colors
179+
color: $menuitem-hovered-color;
180+
background-color: $menuitem-hovered-background-color;
178181
}
179182

180183
&:first-child {
@@ -190,7 +193,7 @@
190193
}
191194

192195
&.disabled {
193-
color: rgba($muted-text-color, 0.5);
196+
color: $semi-transparent-muted-text-color;
194197
pointer-events: none;
195198
cursor: not-allowed;
196199
}
@@ -566,6 +569,7 @@
566569
transition: 0.2s ease-out;
567570
cursor: pointer;
568571

572+
// Menu item fold/unfold right + -
569573
&:before,
570574
&:after {
571575
content: "";
@@ -634,7 +638,7 @@
634638
color: inherit;
635639
}
636640
.active {
637-
@include yiq-contrasted($active-color);
641+
@include yiq-contrasted($menuitem-selected-background-color);
638642
}
639643
&:hover {
640644
text-decoration: underline;
@@ -647,7 +651,7 @@
647651
padding-left: 0.5em;
648652
padding-right: 0.5em;
649653

650-
@include yiq-contrasted($active-color);
654+
@include yiq-contrasted($menuitem-selected-background-color);
651655

652656
&:not(.nav__sub-title) {
653657
margin-left: -0.25em;
@@ -825,17 +829,17 @@
825829

826830
.toc {
827831
font-family: $sans-serif-narrow;
828-
color: $gray;
832+
color: $menuitem-color;
829833
background-color: $background-color;
830834
border: 1px solid $border-color;
831835
border-radius: $border-radius;
832836
-webkit-box-shadow: $box-shadow;
833837
box-shadow: $box-shadow;
834838

835839
.nav__title {
836-
color: $menuitem-hovered-color;
837840
font-size: $type-size-6;
838-
background: $primary-color;
841+
color: $menuitem-hovered-color;
842+
background: $menuitem-hovered-background-color;
839843
border: 0px;
840844
border-top-left-radius: $border-radius;
841845
border-top-right-radius: $border-radius;
@@ -847,7 +851,7 @@
847851

848852
// Scrollspy marks toc items as .active when they are in focus
849853
.active a {
850-
@include yiq-contrasted($active-color);
854+
@include yiq-contrasted($menuitem-selected-background-color);
851855
}
852856

853857
h4 {
@@ -873,7 +877,7 @@
873877
a {
874878
display: block;
875879
padding: 0.25rem 0.75rem;
876-
color: $muted-text-color;
880+
color: $menuitem-color;
877881
font-weight: bold;
878882
line-height: 1.5;
879883
border-bottom: 1px solid $border-color;

‎_sass/minimal-mistakes/minimal-mistakes/_page.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ body {
227227
animation-delay: 0.25s;
228228

229229
a {
230-
color: #fff;
230+
color: #fff; // FIXME: page__hero is not used, add to _variables,scss if used
231231
}
232232

233233
.wrapper {
@@ -243,7 +243,7 @@ body {
243243
.page__meta,
244244
.page__lead,
245245
.btn {
246-
color: #fff;
246+
color: #fff; // FIXME: page__hero is not used, add to _variables,scss if used
247247
text-shadow: 1px 1px 4px rgba(#000, 0.5);
248248
}
249249

@@ -273,7 +273,7 @@ body {
273273
right: 0;
274274
margin: 0 auto;
275275
padding: 2px 5px;
276-
color: #fff;
276+
color: #fff; // FIXME: page__hero is not used, add to _variables,scss if used
277277
font-family: $caption-font-family;
278278
font-size: $type-size-7;
279279
background: #000;
@@ -287,7 +287,7 @@ body {
287287
}
288288

289289
a {
290-
color: #fff;
290+
color: #fff; // FIXME: page__hero is not used, add to _variables,scss if used
291291
text-decoration: none;
292292
}
293293
}

‎_sass/minimal-mistakes/minimal-mistakes/_print.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
body {
2525
margin: 0 auto;
26-
background: #fff !important;
27-
color: #000 !important;
26+
background: #fff !important; // FIXME: print is not used, add to _variables,scss if used
27+
color: #000 !important; // FIXME: print is not used, add to _variables,scss if used
2828
font-size: 1rem;
2929
line-height: 1.5;
3030
-moz-osx-font-smoothing: grayscale;
@@ -38,7 +38,7 @@
3838
h4,
3939
h5,
4040
h6 {
41-
color: #000;
41+
color: #000; // FIXME: print is not used, add to _variables,scss if used
4242
line-height: 1.2;
4343
margin-bottom: 0.75rem;
4444
margin-top: 0;
@@ -70,7 +70,7 @@
7070

7171
a,
7272
a:visited {
73-
color: #000;
73+
color: #000; // FIXME: print is not used, add to _variables,scss if used
7474
text-decoration: underline;
7575
word-wrap: break-word;
7676
}
@@ -219,12 +219,12 @@
219219
}
220220

221221
.page__hero-caption {
222-
color: #000 !important;
222+
color: #000 !important; // FIXME: print is not used, add to _variables,scss if used
223223
background: #fff !important;
224224
opacity: 1;
225225

226226
a {
227-
color: #000 !important;
227+
color: #000 !important; // FIXME: print is not used, add to _variables,scss if used
228228
}
229229
}
230230

‎_sass/minimal-mistakes/minimal-mistakes/_reset.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ body { margin: 0; }
3333
/* Selected elements */
3434

3535
::-moz-selection {
36-
color: #fff;
37-
background: #000;
36+
color: $selection-color;
37+
background: $selection-background-color;
3838
}
3939

4040
::selection {

‎_sass/minimal-mistakes/minimal-mistakes/_utilities.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ body:hover .visually-hidden button {
451451
min-height: 20px;
452452
padding: 19px;
453453
margin-bottom: 20px;
454-
background-color: #f5f5f5;
454+
background-color: red;
455455
border: 1px solid #e3e3e3;
456456
border-radius: $border-radius;
457457
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
@@ -473,7 +473,7 @@ body:hover .visually-hidden button {
473473
width: 100%;
474474
height: 100%;
475475
z-index: 999;
476-
background-color: rgba(255, 255, 255, 0.85);
476+
background-color: rgba($white, 0.85);
477477
}
478478

479479
.modal {

‎_sass/minimal-mistakes/minimal-mistakes/_variables.scss

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,48 +55,54 @@ $h-size-6: 1em !default; // ~16px
5555
Colors
5656
========================================================================== */
5757

58+
$white: white !default;
59+
$black: black !default;
5860
$gray: #7a8288 !default;
59-
$dark-gray: mix(black, $gray, 50%) !default;
60-
$darker-gray: mix(black, $gray, 60%) !default;
61-
$light-gray: mix(white, $gray, 50%) !default;
62-
$lighter-gray: mix(white, $gray, 90%) !default;
61+
$dark-gray: mix($black, $gray, 50%) !default;
62+
$darker-gray: mix($black, $gray, 60%) !default;
63+
$light-gray: mix($white, $gray, 50%) !default;
64+
$lighter-gray: mix($white, $gray, 90%) !default;
6365

64-
$background-color: white !default;
66+
$background-color: $white !default;
6567
$text-color: $dark-gray !default;
66-
$muted-text-color: mix(white, $text-color, 20%) !default;
67-
$selection-color: white !default;
68-
$selection-background-color: black !default;
68+
$muted-text-color: mix($white, $text-color, 20%) !default;
69+
$semi-transparent-muted-text-color: rgba($muted-text-color, 0.5) !default;
70+
$selection-color: $white !default;
71+
$selection-background-color: $black !default;
6972
$form-background-color: $lighter-gray !default;
7073
$footer-background-color: $lighter-gray !default;
7174
$code-background-color: #fafafa !default;
7275
$code-background-color-dark: $light-gray !default;
7376
$border-color: $lighter-gray !default;
77+
$darker-border-color: mix(#000, $border-color, 25%) !default;
7478

7579
$primary-color: #6f777d !default;
7680
$success-color: #3fa63f !default;
7781
$warning-color: #d67f05 !default;
7882
$danger-color: #ee5f5b !default;
7983
$info-color: #3b9cba !default;
8084
$focus-color: $primary-color !default;
81-
$active-color: mix(white, $primary-color, 80%) !default;
85+
$active-color: mix($white, $primary-color, 80%) !default;
8286

87+
$menuitem-color: $muted-text-color !default;
8388
$menuitem-background-color: $background-color !default;
89+
$menuitem-selected-background-color: $active-color !default;
8490
$menuitem-hovered-background-color: $primary-color !default; // mix($active-color, $gray) !default;
8591
$menuitem-hovered-color: $lighter-gray !default;
8692

8793
$border-color: $lighter-gray !default;
88-
$box-shadow-color: rgba(mix(black, $background-color), 0.5) !default; //rgba(0, 0, 0, 0.125) !default;
94+
$box-shadow-color: rgba(mix($black, $background-color), 0.5) !default; //rgba(0, 0, 0, 0.125) !default;
8995

90-
$tooltip-background-color: rgba(mix(white, $background-color, 7%), 0.925) !default;
96+
$tooltip-background-color: rgba(mix($white, $background-color, 7%), 0.925) !default;
9197
$tooltip-arrow-background-color: $tooltip-background-color !default;
9298
$tooltip-color: mix($gray, $text-color, 50%) !default;
9399
//$tooltip-text-shadow-color: #111 !default;
94-
$tooltip-box-shadow-color: $box-shadow-color !default; // rgba(mix(black, $background-color, 70%), 0.5) !default;
95-
//$tooltip-border-color: $border-color !default; // rgba(mix(black, $background-color, 80%), 0.9) !default;
100+
$tooltip-box-shadow-color: $box-shadow-color !default; // rgba(mix($black, $background-color, 70%), 0.5) !default;
101+
//$tooltip-border-color: $border-color !default; // rgba(mix($black, $background-color, 80%), 0.9) !default;
96102

97103
/* YIQ color contrast */
98104
$yiq-contrasted-dark-default: $dark-gray !default;
99-
$yiq-contrasted-light-default: white !default;
105+
$yiq-contrasted-light-default: $white !default;
100106
$yiq-contrasted-threshold: 175 !default;
101107
$yiq-debug: false !default;
102108

@@ -127,13 +133,13 @@ $youtube-color: #bb0000 !default;
127133
$xing-color: #006567 !default;
128134

129135
/* links */
130-
$link-color: mix(black, $info-color, 20%) !default;
131-
$link-color-hover: mix(black, $link-color, 25%) !default;
132-
$link-color-visited: mix(white, $link-color, 15%) !default;
136+
$link-color: mix($black, $info-color, 20%) !default;
137+
$link-color-hover: mix($black, $link-color, 25%) !default;
138+
$link-color-visited: mix($white, $link-color, 15%) !default;
133139
$link-color-selected: $selection-color !default;
134140
$masthead-link-color: $primary-color !default;
135-
$masthead-link-color-hover: mix(black, $primary-color, 25%) !default;
136-
$navicon-link-color-hover: mix(white, $primary-color, 75%) !default;
141+
$masthead-link-color-hover: mix($black, $primary-color, 25%) !default;
142+
$navicon-link-color-hover: mix($white, $primary-color, 75%) !default;
137143

138144
/* notices */
139145
$notice-background-mix: 80% !default;

0 commit comments

Comments
 (0)