encounter/numix-blue-gtk-theme
0
0
Fork 0
mirror of https://github.com/encounter/numix-blue-gtk-theme.git synced 2026-07-10 12:18:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Luke Street
2017-02-14 23:51:33 -05:00
parent 421b186812 ec299d4047
commit df9f200180
10 changed files with 164 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gtk-3.20/scss/_global.scss
+1 -1
View File
@@ -3,7 +3,7 @@
@import "functions";
// default color scheme
$bg_color: if($variant == "dark", #444, #eee);
$bg_color: if($variant == "dark", #444, #dedede);
$fg_color: if($variant == "dark", #ddd, #555);
$base_color: if($variant == "dark", #333, #fff);
$text_color: if($variant == "dark", #eee, #333);
src/gtk-3.20/scss/apps/_gnome-applications.scss
+28
View File
@@ -29,3 +29,31 @@
}
}
}
/************************
! Unity-Control-Center *
*************************/
@include exports("unity-control-center") {
// Fixed: https://github.com/numixproject/numix-gtk-theme/issues/634
.background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame {
// hide unwanted frames
border: 0 none transparent;
> stack > scrolledwindow > viewport > box.vertical > frame > box.vertical {
// reset $base_color;
iconview.view {
&, &:backdrop {
background-color: transparent;
}
&:selected {
&:focus, & {
@extend %selected_items;
}
}
}
}
}
}
src/gtk-3.20/scss/apps/_unity.scss
+10
View File
@@ -33,6 +33,16 @@
color: mix($titlebar_fg_color, $titlebar_bg_color, .1);
text-shadow: none;
// Fixed: https://github.com/numixproject/numix-gtk-theme/issues/632
// for L.I.M's selected menuitem
&:hover {
border-radius: 0;
border-color: mix($panel_bg_color, $panel_fg_color, .21);
background-color: mix($panel_bg_color, $panel_fg_color, .21);
background-image: none;
color: shade($panel_fg_color, 1.08);
}
&:backdrop {
border: 1px solid $wm_border_unfocused;
color: mix($titlebar_fg_color, $titlebar_bg_color, .4);
src/gtk-3.20/scss/widgets/_button.scss
+52 -24
View File
@@ -273,14 +273,19 @@
$border_strength: if(lightness($bg) > 50, 0, .1);
$shadow_strength: if(lightness($bg) > 50, 0, .1);
$button_bg: if(hue($bg) == 0deg, shade($bg, 1.2), $bg);
$button_bg: if(lightness($bg) > 50, $bg, shade($bg, 1.2));
@extend %button;
@include linear-gradient($button_bg);
@include border(rgba(0, 0, 0, .12 + $border_strength));
@if (lightness($button_bg) > 50) {
border-color: border_normal($button_bg);
@include linear-gradient(shade($button_bg, 1.08));
} @else {
@include linear-gradient($button_bg);
@include border(rgba(0, 0, 0, .12 + $border_strength));
}
color: $fg;
box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength);
&.flat {
border-color: alpha($button_bg, 0);
@@ -291,24 +296,32 @@
&, &.flat {
&:focus, &:hover {
@include linear-gradient(shade($button_bg, 1.2));
@include border(rgba(0, 0, 0, .2 + $border_strength));
@if (lightness($button_bg) > 50) {
border-color: border_active($button_bg);
@include linear-gradient(shade($button_bg, 1.11));
} @else {
@include linear-gradient(shade($button_bg, 1.2));
@include border(rgba(0, 0, 0, .2 + $border_strength));
}
box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength);
}
&:checked, &:active {
@include linear-gradient(shade($button_bg, .7), to top);
@if (lightness($button_bg) > 50) {
@include linear-gradient(shade($button_bg, .8), to top);
} @else {
@include linear-gradient(shade($button_bg, .7), to top);
}
color: $white;
box-shadow: inset 1px 0 alpha($dark_shadow, .06),
inset 0 1px alpha($dark_shadow, .07),
inset -1px 0 alpha($dark_shadow, .06),
inset 0 -1px alpha($dark_shadow, .05);
&:focus, &:hover {
@include linear-gradient(shade($button_bg, .65), to top);
@if (lightness($button_bg) > 50) {
@include linear-gradient(shade($button_bg, .75), to top);
} @else {
@include linear-gradient(shade($button_bg, .65), to top);
}
color: $white;
}
}
@@ -379,12 +392,12 @@
}
button {
@include button(shade($bg_color, 1.2), $fg_color);
@include button($bg_color, $fg_color);
.inline-toolbar &,
.linked > & { @include linked_button(shade($bg_color, 1.2)); }
.linked > & { @include linked_button($bg_color); }
.linked.vertical > & { @include linked_vertical_button(shade($bg_color, 1.2)); }
.linked.vertical > & { @include linked_vertical_button($bg_color); }
&.circular,
&.circular-button { // FIXME: aggregate to buttons
@@ -412,9 +425,16 @@
}
&:not(.vertical) {
@extend %entry;
@include linear-gradient($base_color, to top);
@include border($base_color);
@if (lightness($bg_color) > 50) {
border: 1px solid border_normal($bg_color);
background-color: transparent;
background-image: none;
box-shadow: inset 1px 0 shade($base_color, .9);
} @else {
@extend %entry;
@include linear-gradient($base_color, to top);
@include border($base_color);
}
padding: 0;
@@ -425,7 +445,6 @@
&:disabled {
@include linear-gradient(shade($base_color, .9), to top);
color: mix($base_color, $text_color, .5);
}
@@ -443,6 +462,16 @@
background-image: none;
box-shadow: none;
@if (lightness($bg_color) > 50) {
background-color: shade($bg_color, 1.08);
}
&:hover {
@if (lightness($bg_color) > 50) {
background-color: shade($bg_color, 1.11);
}
}
&:dir(rtl) { border-style: none solid none none; }
&:active { box-shadow: inset 0 2px 3px -1px transparentize($black, .8); }
@@ -451,7 +480,6 @@
&:backdrop:disabled {
border-style: none none none solid; // It is needed or it gets overridden
&:dir(rtl) { border-style: none solid none none; }
}
src/gtk-3.20/scss/widgets/_entry.scss
+10 -5
View File
@@ -90,11 +90,16 @@
border-width: 1px;
border-style: solid;
border-radius: $roundness;
transition: border 150ms ease;
box-shadow: inset 1px 1px alpha($dark_shadow, .06),
inset -1px 0 alpha($dark_shadow, .06);
border-color: border_normal($bg_color);
transition: border 100ms ease-out;
&:focus, &:hover, &:active { transition: border 100ms ease-in; }
box-shadow: inset 1px 0 alpha($dark_shadow, 0.10),
inset 0 1px alpha($dark_shadow, 0.12),
inset -1px 0 alpha($dark_shadow, 0.10),
inset 0 -1px alpha($dark_shadow, 0.05);
&:focus, &:hover, &:active { transition: none; }
&:selected {
&, &:selected:focus {
@@ -149,7 +154,7 @@
@mixin entry($bg, $fg, $border: $borders_color) {
@extend %entry;
@include linear-gradient($bg, to top);
@include border($bg);
border-color: border_normal($bg);
padding: $spacing;
src/gtk-3.20/scss/widgets/_menu.scss
+39 -35
View File
@@ -1,6 +1,32 @@
@import "entry";
@mixin menu_calendar($bg, $fg) {
color: $fg;
&.header {
border-bottom: 1px solid shade($bg, ($contrast + .1));
border-radius: 0;
&:backdrop { border-color: shade($bg, ($contrast + .1)); }
}
&.button {
@extend %undecorated_button;
color: alpha($fg, .55);
&:hover {
@extend %undecorated_button;
color: $fg;
}
}
&:indeterminate,
&:indeterminate:backdrop { color: mix($fg, $bg, .5); }
}
/*********
! Menubar
**********/
@@ -47,7 +73,7 @@
.context-menu {
border: 0;
border-radius: 0;
padding: 2px 0;
padding: 0;
background-color: $menu_bg_color;
color: $menu_fg_color;
@@ -59,7 +85,7 @@
separator,
.csd & separator {
background-color: shade($menu_bg_color, ($contrast + .1));
margin: ($spacing - 2px) 0;
margin: 1px 0;
}
// Firefox workaround
@@ -67,7 +93,7 @@
.csd & .separator { color: shade($menu_bg_color, ($contrast + .1)); }
menuitem {
min-height: 16px;
min-height: 14px;
min-width: 40px;
padding: $spacing - 1px;
border-radius: 0;
@@ -85,8 +111,8 @@
// submenu indicators
arrow {
min-height: 16px;
min-width: 16px;
min-height: 14px;
min-width: 14px;
&:dir(ltr) {
-gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
@@ -115,31 +141,7 @@
}
}
calendar {
color: $menu_fg_color;
&.header {
border-bottom: 1px solid shade($menu_bg_color, ($contrast + .1));
border-radius: 0;
&:backdrop { border-color: shade($menu_bg_color, ($contrast + .1)); }
}
&.button {
@extend %undecorated_button;
color: alpha($menu_fg_color, .55);
&:hover {
@extend %undecorated_button;
color: $menu_fg_color;
}
}
&:indeterminate,
&:indeterminate:backdrop { color: mix($menu_fg_color, $menu_bg_color, .5); }
}
calendar { @include menu_calendar($menu_bg_color, $menu_fg_color); }
// avoids labels color being overridden, see
// https://bugzilla.gnome.org/show_bug.cgi?id=767058
@@ -150,8 +152,8 @@
> arrow {
//@include button(undecorated);
min-height: 16px;
min-width: 16px;
min-height: 14px;
min-width: 14px;
padding: $spacing;
background-color: $menu_bg_color;
border-radius: 0;
@@ -194,8 +196,8 @@
}
check, radio {
min-height: 16px;
min-width: 16px;
min-height: 14px;
min-width: 14px;
&:dir(ltr) { margin-right: 7px; }
&:dir(rtl) { margin-left: 7px; }
@@ -276,6 +278,8 @@
button { @include button($menu_bg_color, $menu_fg_color); }
calendar { @include menu_calendar($menu_bg_color, $menu_fg_color); }
> list, > .view, > toolbar {
border-style: none;
background-color: transparent;
@@ -284,7 +288,7 @@
modelbutton.flat,
menuitem.button.flat {
padding: $spacing ($spacing + 2px);
padding: ($spacing - 1px) ($spacing + 1px);
outline-color: transparent;
transition: none;
src/gtk-3.20/scss/widgets/_misc.scss
+2 -2
View File
@@ -42,8 +42,8 @@
@include exports("dialogs") {
messagedialog, .message-dialog, .prompt {
-GtkDialog-content-area-border: 0;
-GtkDialog-action-area-border: $spacing;
-GtkDialog-button-spacing: 0;
-GtkDialog-action-area-border: 0;
-GtkDialog-button-spacing: $spacing;
margin: 0;
padding: 0;
src/gtk-3.20/scss/widgets/_notebook.scss
+12 -8
View File
@@ -179,7 +179,7 @@
min-width: 16px;
padding: 0;
margin-left: $spacing * 2;
border: 1px solid transparent;
//border: 1px solid transparent;
transition: all .1s linear;
}
@@ -187,15 +187,15 @@
background-color: shade($base_color, .93);
border-color: transparent;
outline: none;
button,
button.flat {
border: 1px solid alpha($bg_color, .1);
}
}
&:checked {
background-color: mix($bg_color, $base_color, .4);
@if (lightness($bg_color) > 50) {
background-color: mix($bg_color, $base_color, .7);
} @else {
background-color: mix($bg_color, $base_color, .4);
}
border-bottom-color: transparent;
outline: none;
@@ -204,7 +204,11 @@
}
&:hover {
background-color: mix($bg_color, $base_color, .6);
@if (lightness($bg_color) > 50) {
background-color: mix($bg_color, $base_color, .9);
} @else {
background-color: mix($bg_color, $base_color, .6);
}
}
}
src/gtk-3.20/scss/widgets/_toggle.scss
+7 -3
View File
@@ -104,18 +104,22 @@ $suffix: if($variant == "dark", "-dark", "");
@include exports("switch") {
switch {
min-height: 16px;
padding: $spacing - 2px;
border-radius: $roundness;
padding: $spacing - 1px;
border: none;
outline: none;
transition: background-color .3s linear;
min-width: 88px;
min-height: 24px;
background-color: $switch_bg_color;
color: $switch_fg_color;
box-shadow: inset 1px -1px 0 alpha($dark_shadow, .06), inset -1px 1px 0 alpha($dark_shadow, .06);
slider {
min-height: 18px;
min-width: 26px;
padding: 0 2px;
background-color: $switch_slider_bg_color;
transition: all 0.3s ease-in;
box-shadow: 0 1px 2px 0 alpha($dark_shadow, .07), 1px 0 2px 0 alpha($dark_shadow, .07);
src/gtk-3.20/scss/widgets/_toolbar.scss
+3 -2
View File
@@ -50,11 +50,12 @@
}
@mixin inline-toolbar($bg, $fg) {
background-image: none;
padding: 1px;
border-width: 0 1px 1px;
border-style: solid;
border-color: $borders_color;
background-color: mix($borders_color, $bg_color, .7);
background-color: shade($bg, 1.08);
background-image: none;
&:backdrop {
border-color: $backdrop_borders_color;