Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Color notices based on skin colors instead of fixed values #2887

Merged
merged 4 commits into from
Apr 13, 2021
Merged

Color notices based on skin colors instead of fixed values #2887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91701b7
Made notice Sass color mixing in based on $background-color and $text…
Mar 25, 2021
08ace24
Made some style adjustments to notices to improve readability.
tsmanner Mar 29, 2021
59aa6e7
Adjusted sunrise $notice-background-mix to 75%
tsmanner Mar 29, 2021
73f5442
Adjusted dark theme notice background mix colors back to the default
tsmanner Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions _sass/minimal-mistakes/_notices.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
@mixin notice($notice-color) {
margin: 2em 0 !important; /* override*/
padding: 1em;
color: $dark-gray;
color: $text-color;
font-family: $global-font-family;
font-size: $type-size-6 !important;
text-indent: initial; /* override*/
background-color: mix(#fff, $notice-color, 90%);
background-color: mix($background-color, $notice-color, $notice-background-mix);
border-radius: $border-radius;
box-shadow: 0 1px 1px rgba($notice-color, 0.25);

Expand Down Expand Up @@ -46,15 +46,15 @@
}

a {
color: $notice-color;
color: mix(#000, $notice-color, 10%);

&:hover {
color: mix(#000, $notice-color, 40%);
color: mix(#000, $notice-color, 50%);
}
}

code {
background-color: mix(#fff, $notice-color, 95%)
background-color: mix($background-color, $notice-color, $code-notice-background-mix)
}

pre code {
Expand Down
4 changes: 4 additions & 0 deletions _sass/minimal-mistakes/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ $masthead-link-color: $primary-color !default;
$masthead-link-color-hover: mix(#000, $primary-color, 25%) !default;
$navicon-link-color-hover: mix(#fff, $primary-color, 75%) !default;

/* notices */
$notice-background-mix: 80% !default;
$code-notice-background-mix: 90% !default;

/* syntax highlighting (base16) */
$base00: #263238 !default;
$base01: #2e3c43 !default;
Expand Down
6 changes: 5 additions & 1 deletion _sass/minimal-mistakes/skins/_aqua.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,8 @@ $link-color : $info-color !default;
$link-color-hover : mix(#000, $link-color, 25%) !default;
$link-color-visited : mix(#fff, $link-color, 25%) !default;
$masthead-link-color : $primary-color !default;
$masthead-link-color-hover : mix(#000, $primary-color, 25%) !default;
$masthead-link-color-hover : mix(#000, $primary-color, 25%) !default;

/* notices */
$notice-background-mix: 90% !default;
$code-notice-background-mix: 95% !default;
2 changes: 1 addition & 1 deletion _sass/minimal-mistakes/skins/_dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ $navicon-link-color-hover: mix(#000, $background-color, 30%) !default;

.ais-search-box .ais-search-box--input {
background-color: $form-background-color;
}
}
4 changes: 4 additions & 0 deletions _sass/minimal-mistakes/skins/_neon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ $masthead-link-color: $text-color !default;
$masthead-link-color-hover: mix(#000, $text-color, 20%) !default;
$navicon-link-color-hover: mix(#000, $background-color, 30%) !default;

/* notices */
$notice-background-mix: 90% !default;
$code-notice-background-mix: 95% !default;

/* neon syntax highlighting (base16) */
$base00: #ffffff !default;
$base01: #e0e0e0 !default;
Expand Down
4 changes: 4 additions & 0 deletions _sass/minimal-mistakes/skins/_plum.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ $masthead-link-color: $text-color !default;
$masthead-link-color-hover: mix(#000, $text-color, 20%) !default;
$navicon-link-color-hover: mix(#000, $background-color, 30%) !default;

/* notices */
$notice-background-mix: 70% !default;
$code-notice-background-mix: 80% !default;

/* plum syntax highlighting (base16) */
$base00: #ffffff !default;
$base01: #e0e0e0 !default;
Expand Down
3 changes: 3 additions & 0 deletions _sass/minimal-mistakes/skins/_sunrise.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ $masthead-link-color: $text-color !default;
$masthead-link-color-hover: mix(#000, $text-color, 20%) !default;
$navicon-link-color-hover: mix(#000, $background-color, 30%) !default;

/* notices */
$notice-background-mix: 75% !default;

/* sunrise syntax highlighting (base16) */
$base00: #1d1f21 !default;
$base01: #282a2e !default;
Expand Down