updated 3.16

This commit is contained in:
Sam Hewitt 2016-04-27 16:02:37 -04:00
parent 382538dbe2
commit d8ef599376
6 changed files with 368 additions and 269 deletions

View File

@ -12,7 +12,7 @@ $headerbar_fg_color: if($variant == 'light', #ffffff, transparentize(#ffffff, 0.
// Primary colors // Primary colors
$red: #f34235; $red: #f34235;
$orange: #fe9700; $orange: #fe9700;
$yellow: #feea3a; $yellow: #fec006;
$green: #4bae4f; $green: #4bae4f;
$blue: #2095f2; $blue: #2095f2;
$purple: #9b26af; $purple: #9b26af;

View File

@ -115,6 +115,7 @@
} }
/********* /*********
* Panel * * Panel *
********/ ********/
@ -136,25 +137,23 @@
.composited-indicator { .composited-indicator {
> GtkRevealer, > GtkRevealer,
> GtkImage, > GtkRevealer GtkImage,
> GtkLabel { > GtkRevealer GtkLabel {
color: white; color: white;
font-weight: bold; font-weight: bold;
text-shadow: 0 1px transparentize(black, 0.2); text-shadow: 0 1px 2px transparentize(black, 0.8), 0 1px 2px transparentize(black, 0.9);
icon-shadow: 0 1px transparentize(black, 0.2); icon-shadow: 0 1px 2px transparentize(black, 0.8), 0 1px 2px transparentize(black, 0.9);
} }
} }
.panel.color-light .composited-indicator { .panel.color-light .composited-indicator {
> GtkRevealer, > GtkRevealer,
> GtkImage, > GtkRevealer GtkImage,
> GtkLabel { > GtkRevealer GtkLabel {
color: transparentize(black, 0.65); color: transparentize(black, 0.4);
text-shadow: 0 0 2px transparentize(white, 0.7), text-shadow: 0 1px transparentize(white, 0.9);
0 1px 0 transparentize(white, 0.75); icon-shadow: 0 1px transparentize(white, 0.9);
icon-shadow: 0 0 2px transparentize(white, 0.7),
0 1px 0 transparentize(white, 0.75);
} }
} }

View File

@ -53,7 +53,7 @@
/* widgets main borders color on backdrop windows */ /* widgets main borders color on backdrop windows */
@define-color unfocused_borders #394144; @define-color unfocused_borders #394144;
/* these are pretty self explicative */ /* these are pretty self explicative */
@define-color warning_color #feea3a; @define-color warning_color #fec006;
@define-color error_color #f34235; @define-color error_color #f34235;
@define-color success_color #3c8a3f; @define-color success_color #3c8a3f;
/* these colors are exported for the window manager and shouldn't be used in applications, /* these colors are exported for the window manager and shouldn't be used in applications,
@ -2047,16 +2047,16 @@ GtkFileChooserDialog {
background-color: #f34235; } background-color: #f34235; }
.warning.spinbutton:not(.vertical), GeditWindow > .warning.entry, .warning.spinbutton:not(.vertical), GeditWindow > .warning.entry,
.entry.warning { .entry.warning {
color: #feea3a; color: #fec006;
border-color: #857701; } border-color: #513d00; }
.warning.spinbutton:focus:not(.vertical), GeditWindow > .warning.entry:focus, .warning.spinbutton:focus:not(.vertical), GeditWindow > .warning.entry:focus,
.entry.warning:focus { .entry.warning:focus {
box-shadow: inset 0 1px 2px 0 rgba(0, 0, 0, 0.05), inset 0 1px 1px 0 rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px 0 rgba(0, 0, 0, 0.05), inset 0 1px 1px 0 rgba(0, 0, 0, 0.1);
border-color: #857701; } border-color: #513d00; }
.warning.spinbutton:selected:focus:not(.vertical), GeditWindow > .warning.entry:selected:focus, .warning.spinbutton:selected:not(.vertical), GeditWindow > .warning.entry:selected, .warning.spinbutton:selected:focus:not(.vertical), GeditWindow > .warning.entry:selected:focus, .warning.spinbutton:selected:not(.vertical), GeditWindow > .warning.entry:selected,
.entry.warning:selected:focus, .entry.warning:selected:focus,
.entry.warning:selected { .entry.warning:selected {
background-color: #feea3a; } background-color: #fec006; }
.spinbutton:not(.vertical) .progressbar, GeditWindow > .entry .progressbar, .spinbutton:not(.vertical) .progressbar, GeditWindow > .entry .progressbar,
.entry .progressbar { .entry .progressbar {
margin: 2px -6px; margin: 2px -6px;
@ -2409,7 +2409,7 @@ GraniteWidgetsWelcome {
background-color: transparent; background-color: transparent;
padding: 8px 6px; } padding: 8px 6px; }
.storage-bar .fill-block { .storage-bar .fill-block {
background-color: #feea3a; background-color: #fec006;
border: none; border: none;
box-shadow: inset 0 1px 0 0 rgba(0, 0, 0, 0.1), inset 0 -1px 0 0 rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 0 0 rgba(0, 0, 0, 0.1), inset 0 -1px 0 0 rgba(0, 0, 0, 0.1);
transition: all 200ms ease-in-out; transition: all 200ms ease-in-out;
@ -2632,11 +2632,15 @@ GraniteWidgetsWelcome {
.header-bar .button GtkLabel, .header-bar .button GtkLabel,
.header-bar .button GtkImage { .header-bar .button GtkImage {
color: rgba(255, 255, 255, 0.5); } color: rgba(255, 255, 255, 0.5); }
.titlebar:not(headerbar) .button GtkLabel:backdrop, .titlebar:not(headerbar) .button GtkLabel:backdrop, .titlebar:not(headerbar) .button GtkLabel:insensitive,
.titlebar:not(headerbar) .button GtkImage:backdrop, .titlebar:not(headerbar) .button GtkImage:backdrop,
.titlebar:not(headerbar) .button GtkImage:insensitive,
.header-bar .button GtkLabel:backdrop, .header-bar .button GtkLabel:backdrop,
.header-bar .button GtkImage:backdrop { .header-bar .button GtkLabel:insensitive,
color: rgba(255, 255, 255, 0.3); } .header-bar .button GtkImage:backdrop,
.header-bar .button GtkImage:insensitive {
color: rgba(255, 255, 255, 0.3);
-gtk-image-effect: dim; }
.titlebar:not(headerbar) .button:focus, .titlebar:not(headerbar) .button:hover, .titlebar:not(headerbar) .button:focus, .titlebar:not(headerbar) .button:hover,
.header-bar .button:focus, .header-bar .button:focus,
.header-bar .button:hover { .header-bar .button:hover {
@ -2685,12 +2689,8 @@ GraniteWidgetsWelcome {
color: rgba(255, 255, 255, 0.3); color: rgba(255, 255, 255, 0.3);
background-color: transparent; background-color: transparent;
background-image: none; } background-image: none; }
.titlebar:not(headerbar) .button:insensitive image, .titlebar:not(headerbar) .button:insensitive GtkImage, .titlebar:not(headerbar) .button:insensitive:backdrop GtkImage,
.titlebar:not(headerbar) .button:insensitive GtkImage, .titlebar:not(headerbar) .button:insensitive:backdrop image,
.titlebar:not(headerbar) .button:insensitive:backdrop GtkImage,
.header-bar .button:insensitive image,
.header-bar .button:insensitive GtkImage, .header-bar .button:insensitive GtkImage,
.header-bar .button:insensitive:backdrop image,
.header-bar .button:insensitive:backdrop GtkImage { .header-bar .button:insensitive:backdrop GtkImage {
-gtk-image-effect: dim; } -gtk-image-effect: dim; }
.titlebar:not(headerbar) .button.titlebutton, .titlebar:not(headerbar) .button.titlebutton,
@ -2722,6 +2722,18 @@ GraniteWidgetsWelcome {
.titlebar:not(headerbar) .button.titlebutton:active GtkImage, .titlebar:not(headerbar) .button.titlebutton:active GtkImage,
.header-bar .button.titlebutton:active GtkImage { .header-bar .button.titlebutton:active GtkImage {
color: #3B4245; } color: #3B4245; }
.titlebar:not(headerbar) .button.menu-button .menu .menuitem GtkLabel,
.header-bar .button.menu-button .menu .menuitem GtkLabel {
color: #bcc1c3; }
.titlebar:not(headerbar) .button.menu-button .menu .menuitem GtkLabel:insensitive,
.header-bar .button.menu-button .menu .menuitem GtkLabel:insensitive {
color: #868d90; }
.titlebar:not(headerbar) .button.menu-button .menu .menuitem .separator,
.header-bar .button.menu-button .menu .menuitem .separator {
color: #373e41; }
.titlebar:not(headerbar) .button.menu-button .menu .menuitem:hover GtkLabel,
.header-bar .button.menu-button .menu .menuitem:hover GtkLabel {
color: #ffffff; }
.titlebar:not(headerbar) .button.suggested-action, .titlebar:not(headerbar) .button.suggested-action,
.header-bar .button.suggested-action { .header-bar .button.suggested-action {
font-weight: bold; font-weight: bold;
@ -2891,9 +2903,9 @@ infobar {
color: rgba(255, 255, 255, 0.5); } color: rgba(255, 255, 255, 0.5); }
.warning { .warning {
background-color: #feea3a; } background-color: #fec006; }
.warning:backdrop { .warning:backdrop {
background-color: #feef6d; background-color: #fecd39;
color: rgba(255, 255, 255, 0.5); } color: rgba(255, 255, 255, 0.5); }
.question { .question {
@ -2959,8 +2971,8 @@ GtkLevelBar,
.level-bar.vertical .level-low.fill-block, .level-bar.vertical .level-low.fill-block,
.level-bar .fill-block.low, .level-bar .fill-block.low,
.level-bar .fill-block.level-low { .level-bar .fill-block.level-low {
border: 1px solid #fee507; border: 1px solid #d09c01;
background-color: #feea3a; } background-color: #fec006; }
GtkLevelBar.vertical .low.fill-block:backdrop, GtkLevelBar.vertical .low.fill-block:backdrop,
GtkLevelBar .level-bar.vertical .low.fill-block:backdrop, GtkLevelBar .level-bar.vertical .low.fill-block:backdrop,
.level-bar.vertical GtkLevelBar .low.fill-block:backdrop, GtkLevelBar.vertical .level-low.fill-block:backdrop, .level-bar.vertical GtkLevelBar .low.fill-block:backdrop, GtkLevelBar.vertical .level-low.fill-block:backdrop,
@ -2976,7 +2988,7 @@ GtkLevelBar,
.level-bar.vertical .level-low.fill-block:backdrop, .level-bar.vertical .level-low.fill-block:backdrop,
.level-bar .fill-block.low:backdrop, .level-bar .fill-block.low:backdrop,
.level-bar .fill-block.level-low:backdrop { .level-bar .fill-block.level-low:backdrop {
border: 1px solid #feea3a; } border: 1px solid #fec006; }
GtkLevelBar.vertical .high.fill-block, GtkLevelBar.vertical .high.fill-block,
GtkLevelBar .level-bar.vertical .high.fill-block, GtkLevelBar .level-bar.vertical .high.fill-block,
.level-bar.vertical GtkLevelBar .high.fill-block, GtkLevelBar.vertical .level-high.fill-block, .level-bar.vertical GtkLevelBar .high.fill-block, GtkLevelBar.vertical .level-high.fill-block,
@ -4285,7 +4297,7 @@ GtkSwitch {
margin: 0; margin: 0;
padding: 10px; padding: 10px;
text-shadow: none; } text-shadow: none; }
.toolbar .button.suggested-action, .toolbar .button.text-button, .toolbar .button.image-button, .toolbar .button.linked, .toolbar .button.flat { .toolbar .button.suggested-action, .toolbar .button.text-button, .toolbar .button.menu-button, .toolbar .button.image-button, .toolbar .button.linked, .toolbar .button.flat {
background-color: transparent; background-color: transparent;
background-image: none; background-image: none;
border-radius: 0px; border-radius: 0px;
@ -4296,23 +4308,28 @@ GtkSwitch {
padding: 10px; padding: 10px;
text-shadow: none; text-shadow: none;
color: rgba(255, 255, 255, 0.5); } color: rgba(255, 255, 255, 0.5); }
.toolbar .button.suggested-action:backdrop, .toolbar .button.text-button:backdrop, .toolbar .button.image-button:backdrop, .toolbar .button.linked:backdrop, .toolbar .button.flat:backdrop { .toolbar .button.suggested-action:backdrop, .toolbar .button.text-button:backdrop, .toolbar .button.menu-button:backdrop, .toolbar .button.image-button:backdrop, .toolbar .button.linked:backdrop, .toolbar .button.flat:backdrop {
background-color: transparent; background-color: transparent;
background-image: none; background-image: none;
text-shadow: none; text-shadow: none;
color: rgba(255, 255, 255, 0.3); } color: rgba(255, 255, 255, 0.3); }
.toolbar .button.suggested-action:hover, .toolbar .button.text-button:hover, .toolbar .button.image-button:hover, .toolbar .button.linked:hover, .toolbar .button.flat:hover { .toolbar .button.suggested-action:hover, .toolbar .button.text-button:hover, .toolbar .button.menu-button:hover, .toolbar .button.image-button:hover, .toolbar .button.linked:hover, .toolbar .button.flat:hover {
background-image: none; background-image: none;
background-color: rgba(0, 0, 0, 0.15); background-color: rgba(0, 0, 0, 0.15);
color: rgba(255, 255, 255, 0.5); color: rgba(255, 255, 255, 0.5);
box-shadow: none; box-shadow: none;
text-shadow: none; } text-shadow: none; }
.toolbar .button.suggested-action:insensitive, .toolbar .button.text-button:insensitive, .toolbar .button.menu-button:insensitive, .toolbar .button.image-button:insensitive, .toolbar .button.linked:insensitive, .toolbar .button.flat:insensitive {
color: rgba(255, 255, 255, 0.3);
-gtk-image-effect: dim; }
.toolbar .button GtkLabel, .toolbar .button GtkLabel,
.toolbar .button GtkImage { .toolbar .button GtkImage {
color: rgba(255, 255, 255, 0.5); } color: rgba(255, 255, 255, 0.5); }
.toolbar .button GtkLabel:backdrop, .toolbar .button GtkLabel:insensitive, .toolbar .button GtkLabel:backdrop,
.toolbar .button GtkImage:insensitive,
.toolbar .button GtkImage:backdrop { .toolbar .button GtkImage:backdrop {
color: rgba(255, 255, 255, 0.3); } color: rgba(255, 255, 255, 0.3);
-gtk-image-effect: dim; }
.toolbar .button:focus, .toolbar .button:hover { .toolbar .button:focus, .toolbar .button:hover {
background-image: none; background-image: none;
background-color: rgba(0, 0, 0, 0.15); background-color: rgba(0, 0, 0, 0.15);
@ -4351,6 +4368,14 @@ GtkSwitch {
.toolbar .button:insensitive GtkImage, .toolbar .button:insensitive:backdrop image, .toolbar .button:insensitive GtkImage, .toolbar .button:insensitive:backdrop image,
.toolbar .button:insensitive:backdrop GtkImage { .toolbar .button:insensitive:backdrop GtkImage {
-gtk-image-effect: dim; } -gtk-image-effect: dim; }
.toolbar .button.menu-button .menu .menuitem GtkLabel {
color: #bcc1c3; }
.toolbar .button.menu-button .menu .menuitem GtkLabel:insensitive {
color: #868d90; }
.toolbar .button.menu-button .menu .menuitem .separator {
color: #373e41; }
.toolbar .button.menu-button .menu .menuitem:hover GtkLabel {
color: #ffffff; }
.toolbar .separator { .toolbar .separator {
color: transparent; color: transparent;
background-color: transparent; } background-color: transparent; }
@ -5589,21 +5614,27 @@ YelpWindow .header-bar {
********/ ********/
.panel { .panel {
background-color: transparent; background-color: transparent;
transition: all 100ms ease-in-out; } transition: all 100ms ease-in-out;
.panel .maximized { color: white; }
.panel.maximized {
background-color: #000; } background-color: #000; }
.panel .translucent { .panel.translucent {
background-color: rgba(0, 0, 0, 0.5); } background-color: rgba(0, 0, 0, 0.5); }
.panel .color-light .composited-indicator GtkRevealer {
color: rgba(0, 0, 0, 0.35);
text-shadow: 0 0 2px rgba(255, 255, 255, 0.3), 0 1px 0 rgba(255, 255, 255, 0.25);
icon-shadow: 0 0 2px rgba(255, 255, 255, 0.3), 0 1px 0 rgba(255, 255, 255, 0.25); }
.composited-indicator GtkRevealer { .composited-indicator > GtkRevealer,
color: #636E73; .composited-indicator > GtkRevealer GtkImage,
.composited-indicator > GtkRevealer GtkLabel {
color: white;
font-weight: bold; font-weight: bold;
text-shadow: 0 0 2px rgba(0, 0, 0, 0.3), 0 1px 2px rgba(0, 0, 0, 0.6); text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 1px 2px rgba(0, 0, 0, 0.1);
icon-shadow: 0 0 2px rgba(0, 0, 0, 0.3), 0 1px 2px rgba(0, 0, 0, 0.6); } icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 1px 2px rgba(0, 0, 0, 0.1); }
.panel.color-light .composited-indicator > GtkRevealer,
.panel.color-light .composited-indicator > GtkRevealer GtkImage,
.panel.color-light .composited-indicator > GtkRevealer GtkLabel {
color: rgba(0, 0, 0, 0.6);
text-shadow: 0 1px rgba(255, 255, 255, 0.1);
icon-shadow: 0 1px rgba(255, 255, 255, 0.1); }
/************* /*************
* AppCenter * * AppCenter *

File diff suppressed because it is too large Load Diff

View File

@ -219,8 +219,10 @@
GtkImage { GtkImage {
color: $headerbar_fg_color; color: $headerbar_fg_color;
&:backdrop { &:backdrop,
&:insensitive {
color: $backdrop_headerbar_fg_color; color: $backdrop_headerbar_fg_color;
-gtk-image-effect: dim;
} }
} }
@ -279,7 +281,6 @@
background-color: transparent; background-color: transparent;
background-image: none; background-image: none;
image,
GtkImage { GtkImage {
-gtk-image-effect: dim; -gtk-image-effect: dim;
} }
@ -320,6 +321,20 @@
} }
} }
// Menu Button
&.menu-button {
.menu {
.menuitem {
GtkLabel {
color: $fg_color;
&:insensitive { color: $insensitive_fg_color; }
}
.separator { color: $borders_color;}
&:hover { GtkLabel {color: $selected_fg_color;}}
}
}
}
// Suggested Button // Suggested Button
&.suggested-action { &.suggested-action {
font-weight: bold; font-weight: bold;

View File

@ -33,6 +33,7 @@
&.suggested-action, &.suggested-action,
&.text-button, &.text-button,
&.menu-button,
&.image-button, &.image-button,
&.linked, &.linked,
&.flat { &.flat {
@ -61,14 +62,21 @@
box-shadow:none; box-shadow:none;
text-shadow:none; text-shadow:none;
} }
&:insensitive {
color: $backdrop_headerbar_fg_color;
-gtk-image-effect: dim;
}
} }
GtkLabel, GtkLabel,
GtkImage { GtkImage {
color: $headerbar_fg_color; color: $headerbar_fg_color;
&:insensitive,
&:backdrop { &:backdrop {
color: $backdrop_headerbar_fg_color; color: $backdrop_headerbar_fg_color;
-gtk-image-effect: dim;
} }
} }
@ -132,6 +140,21 @@
-gtk-image-effect: dim; -gtk-image-effect: dim;
} }
} }
// Menu Button
&.menu-button {
.menu {
.menuitem {
GtkLabel {
color: $fg_color;
&:insensitive { color: $insensitive_fg_color; }
}
.separator { color: $borders_color;}
&:hover { GtkLabel {color: $selected_fg_color;}}
}
}
}
} }
.separator { .separator {