some bug fixes

This commit is contained in:
Sam Hewitt 2016-05-04 22:29:30 -04:00
parent 9ba6f63059
commit a898d9517e
17 changed files with 2498 additions and 2311 deletions

View File

@ -4,7 +4,7 @@
// Main definitions
$base_color: if($variant == 'light', #ffffff, #636E73);
$bg_color: if($variant == 'light', #f7f7f7, #4F585C);
$fg_color: if($variant == 'light', #444, lighten(#A1A8AB, 10%));
$fg_color: if($variant == 'light', #444, lighten(#e4e6e7, 10%));
$text_color: if($variant == 'light', $fg_color, $fg_color);
$headerbar_bg_color: if($variant == 'light', #636E73, #3B4245);
$headerbar_fg_color: if($variant == 'light', #ffffff, transparentize(#ffffff, 0.5));
@ -42,7 +42,7 @@ $success_color: if($variant == 'light', $green, darken($green,10%));
$destructive_color: if($variant == 'light', $red, darken($red,10%));
$suggested_color: if($variant == 'light', $selected_bg_color, darken($selected_bg_color,10%));
$osd_fg_color: #A1A8AB;
$osd_fg_color: #e4e6e7;
$osd_text_color: white;
$osd_bg_color: transparentize(#202526, 0.2);
$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);

File diff suppressed because it is too large Load Diff

View File

@ -239,11 +239,11 @@ GtkLabel:backdrop {
.app-notification,
.app-notification.frame, .osd .scale-popup, .csd .popover .background.touch-selection, .csd .popover .background.magnifier, .popover .background.touch-selection, .popover .background.magnifier, .csd .popover .background.osd, .popover .background.osd,
.osd {
color: #A1A8AB;
color: #e4e6e7;
border: none;
background-color: rgba(32, 37, 38, 0.8);
background-clip: padding-box;
outline-color: rgba(161, 168, 171, 0.3);
outline-color: rgba(228, 230, 231, 0.3);
text-shadow: 0 1px black;
icon-shadow: 0 1px black; }
.app-notification:backdrop, .osd .scale-popup:backdrop, .popover .background.touch-selection:backdrop, .popover .background.magnifier:backdrop, .popover .background.osd:backdrop,
@ -476,17 +476,17 @@ row:selected
.button.flat:not(:active):not(:checked):not(:hover):not(disabled):backdrop {
color: #fcfcfc; }
.button.osd {
color: #A1A8AB;
color: #e4e6e7;
border-radius: 5px;
outline-color: rgba(161, 168, 171, 0.3);
color: #A1A8AB;
outline-color: rgba(228, 230, 231, 0.3);
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3);
outline-color: rgba(228, 230, 231, 0.3);
border: none;
box-shadow: none; }
.button.osd:hover {
@ -497,7 +497,7 @@ row:selected
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3);
outline-color: rgba(228, 230, 231, 0.3);
border: none;
box-shadow: none; }
.button.osd:active,
@ -509,23 +509,23 @@ row:selected
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3);
outline-color: rgba(228, 230, 231, 0.3);
border: none;
box-shadow: none; }
.button.osd:insensitive:backdrop,
.button.osd:insensitive,
.button.osd:insensitive:backdrop,
.button.osd:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
icon-shadow: none;
border: none; }
.button.osd:backdrop {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
@ -537,14 +537,14 @@ row:selected
.app-notification.frame .button,
.app-notification.frame button, .csd .popover .background.touch-selection button, .csd .popover .background.magnifier button, .popover .background.touch-selection button, .popover .background.magnifier button, .osd
.button {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.app-notification .button:hover, .app-notification button:hover, .popover .background.touch-selection button:hover, .popover .background.magnifier button:hover, .osd
.button:hover {
color: white;
@ -554,7 +554,7 @@ row:selected
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.app-notification .button:active:backdrop, .app-notification button:active:backdrop, .popover .background.touch-selection button:active:backdrop, .popover .background.magnifier button:active:backdrop, .app-notification .button:active, .app-notification button:active, .popover .background.touch-selection button:active, .popover .background.magnifier button:active, .app-notification .button:checked:backdrop, .app-notification button:checked:backdrop, .popover .background.touch-selection button:checked:backdrop, .popover .background.magnifier button:checked:backdrop, .app-notification .button:checked, .app-notification button:checked, .popover .background.touch-selection button:checked, .popover .background.magnifier button:checked, .osd
.button:active:backdrop, .osd
.button:active, .osd
@ -567,20 +567,20 @@ row:selected
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.app-notification .button:insensitive:backdrop, .app-notification button:insensitive:backdrop, .popover .background.touch-selection button:insensitive:backdrop, .popover .background.magnifier button:insensitive:backdrop, .app-notification .button:insensitive, .app-notification button:insensitive, .popover .background.touch-selection button:insensitive, .popover .background.magnifier button:insensitive, .osd
.button:insensitive:backdrop, .osd
.button:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
icon-shadow: none; }
.app-notification .button:backdrop, .app-notification button:backdrop, .popover .background.touch-selection button:backdrop, .popover .background.magnifier button:backdrop, .osd
.button:backdrop {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
@ -605,12 +605,12 @@ row:selected
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.app-notification .flat.button:insensitive, .app-notification button.flat:insensitive, .popover .background.touch-selection button.flat:insensitive, .popover .background.magnifier button.flat:insensitive, .osd
.button.flat:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
@ -636,7 +636,7 @@ row:selected
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.button.suggested-action {
color: white;
outline-color: rgba(255, 255, 255, 0.3);
@ -769,14 +769,14 @@ row:selected
color: #b7cdd7; }
.osd
.button.suggested-action {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(52, 125, 159, 0.5));
background-clip: padding-box;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd
.button.suggested-action:hover {
color: white;
@ -786,7 +786,7 @@ row:selected
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd
.button.suggested-action:active:backdrop, .osd
.button.suggested-action:active, .osd
@ -799,20 +799,20 @@ row:selected
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd
.button.suggested-action:insensitive:backdrop, .osd
.button.suggested-action:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
icon-shadow: none; }
.osd
.button.suggested-action:backdrop {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(52, 125, 159, 0.5));
background-clip: padding-box;
@ -951,14 +951,14 @@ row:selected
color: #fbb5b1; }
.osd
.button.destructive-action {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(243, 66, 53, 0.5));
background-clip: padding-box;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd
.button.destructive-action:hover {
color: white;
@ -968,7 +968,7 @@ row:selected
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd
.button.destructive-action:active:backdrop, .osd
.button.destructive-action:active, .osd
@ -981,20 +981,20 @@ row:selected
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd
.button.destructive-action:insensitive:backdrop, .osd
.button.destructive-action:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
icon-shadow: none; }
.osd
.button.destructive-action:backdrop {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(243, 66, 53, 0.5));
background-clip: padding-box;
@ -3638,12 +3638,12 @@ GtkLevelBar .trough,
border-color: rgba(0, 0, 0, 0.7);
background-color: rgba(0, 0, 0, 0.5);
box-shadow: none;
outline-color: rgba(161, 168, 171, 0.2); }
outline-color: rgba(228, 230, 231, 0.2); }
.osd GtkLevelBar .trough:insensitive, GtkLevelBar .osd .trough:insensitive,
.osd .level-bar .trough:insensitive,
.level-bar .osd .trough:insensitive, .osd GtkProgressBar:insensitive,
.osd .progressbar:insensitive, .osd .scale .trough:insensitive, .scale .osd .trough:insensitive, .osd .scale fill:insensitive, .scale .osd fill:insensitive {
background-color: rgba(45, 50, 51, 0.5); }
background-color: rgba(52, 56, 57, 0.5); }
GtkProgressBar .progressbar,
.progressbar .progressbar, .scale .highlight, .scale.fine-tune .highlight {
@ -3722,14 +3722,14 @@ GtkProgressBar .progressbar,
row:selected .scale .slider, row:selected .scale .slider:insensitive {
border-color: #275f79; }
.osd .scale .slider {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3);
outline-color: rgba(228, 230, 231, 0.3);
border-color: rgba(0, 0, 0, 0.7);
background-color: #202526; }
.osd .scale .slider:hover {
@ -3740,7 +3740,7 @@ GtkProgressBar .progressbar,
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd .scale .slider:active {
color: white;
border-color: rgba(0, 0, 0, 0.7);
@ -3749,17 +3749,17 @@ GtkProgressBar .progressbar,
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd .scale .slider:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
icon-shadow: none; }
.osd .scale .slider:backdrop {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
@ -3797,7 +3797,7 @@ GtkProgressBar .progressbar,
border-color: transparent;
background-color: transparent; }
.osd .scale fill {
background-color: rgba(62, 64, 65, 0.775); }
background-color: rgba(87, 88, 88, 0.775); }
.osd .scale fill:insensitive, .osd .scale fill:insensitive:backdrop {
border-color: transparent;
background-color: transparent; }
@ -4085,7 +4085,7 @@ OsScrollbar {
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
icon-shadow: none;
color: #A1A8AB;
color: #e4e6e7;
border-style: none none none solid;
border-color: rgba(0, 0, 0, 0.4);
border-radius: 0;
@ -4099,9 +4099,9 @@ OsScrollbar {
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
icon-shadow: none;
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.5);
background-color: rgba(161, 168, 171, 0.1);
background-color: rgba(228, 230, 231, 0.1);
box-shadow: none; }
.osd .spinbutton:not(.vertical) .button:backdrop {
border-color: transparent;
@ -4110,7 +4110,7 @@ OsScrollbar {
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
icon-shadow: none;
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.5);
box-shadow: none; }
.osd .spinbutton:not(.vertical) .button:insensitive {
@ -4120,7 +4120,7 @@ OsScrollbar {
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
icon-shadow: none;
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.5);
box-shadow: none; }
.osd .spinbutton:not(.vertical) .button:last-child {
@ -4154,14 +4154,14 @@ OsScrollbar {
border-radius: 0 0 3px 3px;
border-style: none solid solid solid; }
.osd .spinbutton.vertical button:first-child {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd .spinbutton.vertical button:first-child:hover {
color: white;
border-color: rgba(0, 0, 0, 0.7);
@ -4170,7 +4170,7 @@ OsScrollbar {
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd .spinbutton.vertical button:first-child:active {
color: white;
border-color: rgba(0, 0, 0, 0.7);
@ -4179,17 +4179,17 @@ OsScrollbar {
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd .spinbutton.vertical button:first-child:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
icon-shadow: none; }
.osd .spinbutton.vertical button:first-child:backdrop {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
@ -6001,14 +6001,14 @@ ConversationListView {
border-width: 0 1px 1px 1px; }
#buttonbox_frame button {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
#buttonbox_frame button:hover {
color: white;
border-color: rgba(0, 0, 0, 0.7);
@ -6017,7 +6017,7 @@ ConversationListView {
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
#buttonbox_frame button:active, #buttonbox_frame button:checked {
color: white;
border-color: rgba(0, 0, 0, 0.7);
@ -6026,11 +6026,11 @@ ConversationListView {
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
#buttonbox_frame button:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;

View File

@ -4,7 +4,7 @@
// Main definitions
$base_color: if($variant == 'light', #ffffff, #636E73);
$bg_color: if($variant == 'light', #f7f7f7, #4F585C);
$fg_color: if($variant == 'light', #444, lighten(#A1A8AB, 10%));
$fg_color: if($variant == 'light', #444, lighten(#e4e6e7, 10%));
$text_color: if($variant == 'light', $fg_color, $fg_color);
$headerbar_bg_color: if($variant == 'light', #636E73, #3B4245);
$headerbar_fg_color: if($variant == 'light', #ffffff, transparentize(#ffffff, 0.5));
@ -42,7 +42,7 @@ $success_color: if($variant == 'light', $green, darken($green,10%));
$destructive_color: if($variant == 'light', $red, darken($red,10%));
$suggested_color: if($variant == 'light', $selected_bg_color, darken($selected_bg_color,10%));
$osd_fg_color: #A1A8AB;
$osd_fg_color: #e4e6e7;
$osd_text_color: white;
$osd_bg_color: transparentize(#202526, 0.2);
$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);

File diff suppressed because it is too large Load Diff

View File

@ -239,11 +239,11 @@ GtkLabel:backdrop {
.app-notification,
.app-notification.frame, .osd .scale-popup, .csd .popover .background.touch-selection, .csd .popover .background.magnifier, .popover .background.touch-selection, .popover .background.magnifier, .csd .popover .background.osd, .popover .background.osd,
.osd {
color: #A1A8AB;
color: #e4e6e7;
border: none;
background-color: rgba(32, 37, 38, 0.8);
background-clip: padding-box;
outline-color: rgba(161, 168, 171, 0.3);
outline-color: rgba(228, 230, 231, 0.3);
text-shadow: 0 1px black;
icon-shadow: 0 1px black; }
.app-notification:backdrop, .osd .scale-popup:backdrop, .popover .background.touch-selection:backdrop, .popover .background.magnifier:backdrop, .popover .background.osd:backdrop,
@ -476,17 +476,17 @@ row:selected
.button.flat:not(:active):not(:checked):not(:hover):not(disabled):backdrop {
color: #fcfcfc; }
.button.osd {
color: #A1A8AB;
color: #e4e6e7;
border-radius: 5px;
outline-color: rgba(161, 168, 171, 0.3);
color: #A1A8AB;
outline-color: rgba(228, 230, 231, 0.3);
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3);
outline-color: rgba(228, 230, 231, 0.3);
border: none;
box-shadow: none; }
.button.osd:hover {
@ -497,7 +497,7 @@ row:selected
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3);
outline-color: rgba(228, 230, 231, 0.3);
border: none;
box-shadow: none; }
.button.osd:active,
@ -509,23 +509,23 @@ row:selected
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3);
outline-color: rgba(228, 230, 231, 0.3);
border: none;
box-shadow: none; }
.button.osd:insensitive:backdrop,
.button.osd:insensitive,
.button.osd:insensitive:backdrop,
.button.osd:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
icon-shadow: none;
border: none; }
.button.osd:backdrop {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
@ -537,14 +537,14 @@ row:selected
.app-notification.frame .button,
.app-notification.frame button, .csd .popover .background.touch-selection button, .csd .popover .background.magnifier button, .popover .background.touch-selection button, .popover .background.magnifier button, .osd
.button {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.app-notification .button:hover, .app-notification button:hover, .popover .background.touch-selection button:hover, .popover .background.magnifier button:hover, .osd
.button:hover {
color: white;
@ -554,7 +554,7 @@ row:selected
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.app-notification .button:active:backdrop, .app-notification button:active:backdrop, .popover .background.touch-selection button:active:backdrop, .popover .background.magnifier button:active:backdrop, .app-notification .button:active, .app-notification button:active, .popover .background.touch-selection button:active, .popover .background.magnifier button:active, .app-notification .button:checked:backdrop, .app-notification button:checked:backdrop, .popover .background.touch-selection button:checked:backdrop, .popover .background.magnifier button:checked:backdrop, .app-notification .button:checked, .app-notification button:checked, .popover .background.touch-selection button:checked, .popover .background.magnifier button:checked, .osd
.button:active:backdrop, .osd
.button:active, .osd
@ -567,20 +567,20 @@ row:selected
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.app-notification .button:insensitive:backdrop, .app-notification button:insensitive:backdrop, .popover .background.touch-selection button:insensitive:backdrop, .popover .background.magnifier button:insensitive:backdrop, .app-notification .button:insensitive, .app-notification button:insensitive, .popover .background.touch-selection button:insensitive, .popover .background.magnifier button:insensitive, .osd
.button:insensitive:backdrop, .osd
.button:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
icon-shadow: none; }
.app-notification .button:backdrop, .app-notification button:backdrop, .popover .background.touch-selection button:backdrop, .popover .background.magnifier button:backdrop, .osd
.button:backdrop {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
@ -605,12 +605,12 @@ row:selected
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.app-notification .flat.button:insensitive, .app-notification button.flat:insensitive, .popover .background.touch-selection button.flat:insensitive, .popover .background.magnifier button.flat:insensitive, .osd
.button.flat:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
@ -636,7 +636,7 @@ row:selected
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.button.suggested-action {
color: white;
outline-color: rgba(255, 255, 255, 0.3);
@ -769,14 +769,14 @@ row:selected
color: #b7cdd7; }
.osd
.button.suggested-action {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(52, 125, 159, 0.5));
background-clip: padding-box;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd
.button.suggested-action:hover {
color: white;
@ -786,7 +786,7 @@ row:selected
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd
.button.suggested-action:active:backdrop, .osd
.button.suggested-action:active, .osd
@ -799,20 +799,20 @@ row:selected
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd
.button.suggested-action:insensitive:backdrop, .osd
.button.suggested-action:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
icon-shadow: none; }
.osd
.button.suggested-action:backdrop {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(52, 125, 159, 0.5));
background-clip: padding-box;
@ -951,14 +951,14 @@ row:selected
color: #fbb5b1; }
.osd
.button.destructive-action {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(243, 66, 53, 0.5));
background-clip: padding-box;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd
.button.destructive-action:hover {
color: white;
@ -968,7 +968,7 @@ row:selected
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd
.button.destructive-action:active:backdrop, .osd
.button.destructive-action:active, .osd
@ -981,20 +981,20 @@ row:selected
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd
.button.destructive-action:insensitive:backdrop, .osd
.button.destructive-action:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
icon-shadow: none; }
.osd
.button.destructive-action:backdrop {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(243, 66, 53, 0.5));
background-clip: padding-box;
@ -3638,12 +3638,12 @@ GtkLevelBar .trough,
border-color: rgba(0, 0, 0, 0.7);
background-color: rgba(0, 0, 0, 0.5);
box-shadow: none;
outline-color: rgba(161, 168, 171, 0.2); }
outline-color: rgba(228, 230, 231, 0.2); }
.osd GtkLevelBar .trough:insensitive, GtkLevelBar .osd .trough:insensitive,
.osd .level-bar .trough:insensitive,
.level-bar .osd .trough:insensitive, .osd GtkProgressBar:insensitive,
.osd .progressbar:insensitive, .osd .scale .trough:insensitive, .scale .osd .trough:insensitive, .osd .scale fill:insensitive, .scale .osd fill:insensitive {
background-color: rgba(45, 50, 51, 0.5); }
background-color: rgba(52, 56, 57, 0.5); }
GtkProgressBar .progressbar,
.progressbar .progressbar, .scale .highlight, .scale.fine-tune .highlight {
@ -3722,14 +3722,14 @@ GtkProgressBar .progressbar,
row:selected .scale .slider, row:selected .scale .slider:insensitive {
border-color: #275f79; }
.osd .scale .slider {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3);
outline-color: rgba(228, 230, 231, 0.3);
border-color: rgba(0, 0, 0, 0.7);
background-color: #202526; }
.osd .scale .slider:hover {
@ -3740,7 +3740,7 @@ GtkProgressBar .progressbar,
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd .scale .slider:active {
color: white;
border-color: rgba(0, 0, 0, 0.7);
@ -3749,17 +3749,17 @@ GtkProgressBar .progressbar,
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd .scale .slider:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
icon-shadow: none; }
.osd .scale .slider:backdrop {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
@ -3797,7 +3797,7 @@ GtkProgressBar .progressbar,
border-color: transparent;
background-color: transparent; }
.osd .scale fill {
background-color: rgba(62, 64, 65, 0.775); }
background-color: rgba(87, 88, 88, 0.775); }
.osd .scale fill:insensitive, .osd .scale fill:insensitive:backdrop {
border-color: transparent;
background-color: transparent; }
@ -4085,7 +4085,7 @@ OsScrollbar {
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
icon-shadow: none;
color: #A1A8AB;
color: #e4e6e7;
border-style: none none none solid;
border-color: rgba(0, 0, 0, 0.4);
border-radius: 0;
@ -4099,9 +4099,9 @@ OsScrollbar {
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
icon-shadow: none;
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.5);
background-color: rgba(161, 168, 171, 0.1);
background-color: rgba(228, 230, 231, 0.1);
box-shadow: none; }
.osd .spinbutton:not(.vertical) .button:backdrop {
border-color: transparent;
@ -4110,7 +4110,7 @@ OsScrollbar {
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
icon-shadow: none;
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.5);
box-shadow: none; }
.osd .spinbutton:not(.vertical) .button:insensitive {
@ -4120,7 +4120,7 @@ OsScrollbar {
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
icon-shadow: none;
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.5);
box-shadow: none; }
.osd .spinbutton:not(.vertical) .button:last-child {
@ -4154,14 +4154,14 @@ OsScrollbar {
border-radius: 0 0 3px 3px;
border-style: none solid solid solid; }
.osd .spinbutton.vertical button:first-child {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd .spinbutton.vertical button:first-child:hover {
color: white;
border-color: rgba(0, 0, 0, 0.7);
@ -4170,7 +4170,7 @@ OsScrollbar {
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd .spinbutton.vertical button:first-child:active {
color: white;
border-color: rgba(0, 0, 0, 0.7);
@ -4179,17 +4179,17 @@ OsScrollbar {
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
.osd .spinbutton.vertical button:first-child:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
icon-shadow: none; }
.osd .spinbutton.vertical button:first-child:backdrop {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
@ -4868,8 +4868,6 @@ treeview.view header button:active {
border-radius: 0; }
.popup .window-frame {
box-shadow: none; }
.ssd .window-frame {
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.5); }
.csd.popup .window-frame {
border-radius: 0;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); }
@ -6001,14 +5999,14 @@ ConversationListView {
border-width: 0 1px 1px 1px; }
#buttonbox_frame button {
color: #A1A8AB;
color: #e4e6e7;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
background-clip: padding-box;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
#buttonbox_frame button:hover {
color: white;
border-color: rgba(0, 0, 0, 0.7);
@ -6017,7 +6015,7 @@ ConversationListView {
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
#buttonbox_frame button:active, #buttonbox_frame button:checked {
color: white;
border-color: rgba(0, 0, 0, 0.7);
@ -6026,11 +6024,11 @@ ConversationListView {
box-shadow: none;
text-shadow: none;
icon-shadow: none;
outline-color: rgba(161, 168, 171, 0.3); }
outline-color: rgba(228, 230, 231, 0.3); }
#buttonbox_frame button:insensitive {
color: #616769;
color: #828687;
border-color: rgba(0, 0, 0, 0.7);
background-image: linear-gradient(to bottom, rgba(45, 50, 51, 0.5));
background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
background-clip: padding-box;
box-shadow: none;
text-shadow: none;

View File

@ -23,9 +23,6 @@
.popup & { box-shadow: none; }
// server-side decorations as used by mutter
.ssd & { box-shadow: 0 0 0 1px transparentize(black,0.5);}
.csd.popup & {
border-radius: 0;
box-shadow: 0 1px 2px transparentize(black, 0.8);

View File

@ -4,7 +4,7 @@
// Main definitions
$base_color: if($variant == 'light', #ffffff, #636E73);
$bg_color: if($variant == 'light', #f7f7f7, #4F585C);
$fg_color: if($variant == 'light', #444, #A1A8AB);
$fg_color: if($variant == 'light', #444, #e4e6e7);
$text_color: if($variant == 'light', $fg_color, $fg_color);
$headerbar_bg_color: if($variant == 'light', #636E73, #3B4245);
$headerbar_fg_color: if($variant == 'light', #ffffff, transparentize(#ffffff, 0.2));
@ -42,7 +42,7 @@ $success_color: if($variant == 'light', $green, darken($green,10%));
$destructive_color: if($variant == 'light', $red, darken($red,10%));
$suggested_color: if($variant == 'light', $selected_bg_color, darken($selected_bg_color,10%));
$osd_fg_color: #A1A8AB;
$osd_fg_color: #e4e6e7;
$osd_text_color: white;
$osd_bg_color: transparentize(#202526, 0.2);
$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);

View File

@ -55,14 +55,6 @@ CheeseThumbView /* Cheese */
************/
$gnome_terminal: #636E73;
$terminal_bg_color: transparentize(#002B36, 0.1);
$terminal_fg_color: #839495;
TerminalScreen,
VteTerminal {
background-color: $terminal_bg_color;
color: $terminal_fg_color;
}
TerminalWindow {
.titlebar,

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -191,3 +191,23 @@ label {
-gtk-icon-shadow: none;
}
}
%selected_items {
background-color: $selected_bg_color;
@at-root %nobg_selected_items, & {
color: $selected_fg_color;
@if $variant == 'light' { outline-color: transparentize($selected_fg_color, 0.7); }
&:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); }
&:backdrop {
color: $backdrop_selected_fg_color;
&:disabled { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); }
}
}
}
.monospace { font: Monospace; }

View File

@ -61,15 +61,15 @@
(':hover:selected', '-unchecked'),
(':active:selected', '-unchecked'),
(':backdrop:selected', '-unchecked'),
(':insensitive:selected', '-unchecked'),
(':insensitive:backdrop:selected', '-unchecked') {
(':disabled:selected', '-unchecked'),
(':disabled:backdrop:selected', '-unchecked') {
check#{$s}{
-gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-checkbox#{$un}.png"),url("../assets/selected-checkbox#{$un}@2.png")), -gtk-scaled(url("../assets/selected-checkbox#{$un}-dark.png"),url("../assets/selected-checkbox#{$un}-dark@2.png")));
icon-shadow: none;
-gtk-icon-shadow: none;
}
radio#{$s}{
-gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-radio#{$un}.png"),url("../assets/selected-radio#{$un}@2.png")), -gtk-scaled(url("../assets/selected-radio#{$un}-dark.png"),url("../assets/selected-radio#{$un}-dark@2.png")));
icon-shadow: none;
-gtk-icon-shadow: none;
}
}
@ -78,33 +78,33 @@
(':checked:hover:selected', '-checked'),
(':checked:active:selected', '-checked'),
(':checked:backdrop:selected', '-checked'),
(':checked:insensitive:selected', '-checked'),
(':checked:insensitive:backdrop:selected', '-checked') {
(':checked:disabled:selected', '-checked'),
(':checked:disabled:backdrop:selected', '-checked') {
check#{$s}{
-gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-checkbox#{$ch}.png"),url("../assets/selected-checkbox#{$ch}@2.png")), -gtk-scaled(url("../assets/selected-checkbox#{$ch}-dark.png"),url("../assets/selected-checkbox#{$ch}-dark@2.png")));
icon-shadow: none;
-gtk-icon-shadow: none;
}
radio#{$s}{
-gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-radio#{$ch}.png"),url("../assets/selected-radio#{$ch}@2.png")), -gtk-scaled(url("../assets/selected-radio#{$ch}-dark.png"),url("../assets/selected-radio#{$ch}-dark@2.png")));
icon-shadow: none;
-gtk-icon-shadow: none;
}
}
// mixed:selected
@each $s,$mx in (':inconsistent:selected', '-mixed'),
(':inconsistent:hover:selected', '-mixed'),
(':inconsistent:active:selected', '-mixed'),
(':inconsistent:backdrop:selected', '-mixed'),
(':inconsistent:insensitive:selected', '-mixed'),
(':inconsistent:insensitive:backdrop:selected', '-mixed') {
@each $s,$mx in (':indeterminate:selected', '-mixed'),
(':indeterminate:hover:selected', '-mixed'),
(':indeterminate:active:selected', '-mixed'),
(':indeterminate:backdrop:selected', '-mixed'),
(':indeterminate:disabled:selected', '-mixed'),
(':indeterminate:disabled:backdrop:selected', '-mixed') {
check#{$s}{
-gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-checkbox#{$mx}.png"),url("../assets/selected-checkbox#{$mx}@2.png")), -gtk-scaled(url("../assets/selected-checkbox#{$mx}-dark.png"),url("../assets/selected-checkbox#{$mx}-dark@2.png")));
icon-shadow: none;
-gtk-icon-shadow: none;
}
radio#{$s}{
-gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-radio#{$mx}.png"),url("../assets/selected-radio#{$mx}@2.png")), -gtk-scaled(url("../assets/selected-radio#{$mx}-dark.png"),url("../assets/selected-radio#{$mx}-dark@2.png")));
icon-shadow: none;
-gtk-icon-shadow: none;
}
}

View File

@ -2,9 +2,8 @@
* Header Bars *
***************/
%titlebar,
%headerbar,
headerbar {
min-height: 40px;
padding:0 8px;
border: none;
border-radius: 4px 4px 0 0;
@ -44,7 +43,6 @@ headerbar {
}
// selection mode
&.selection-mode {
border-radius: 4px 4px 0 0;
@ -89,50 +87,18 @@ headerbar {
&.default-decoration {
padding: 6px;
min-height: 28px;
background-color: $headerbar_bg_color;
color: $headerbar_fg_color;
.maximized {
padding: 6px;
padding: 6px;
border-radius:0;
}
&:backdrop {
background-color: $backdrop_headerbar_bg_color;
color: $backdrop_headerbar_fg_color;
}
.button,
button {
&.titlebutton {
min-height: 16px;
min-width: 16px;
padding: 1px;
border-radius:50%;
background-color:transparent;
box-shadow: none;
text-shadow: none;
-gtk-icon-shadow: none;
&:hover {
background-color:transparent;
color:lighten($headerbar_fg_color, 10%);
}
&:backdrop {
background-color:transparent;
color:$backdrop_headerbar_fg_color;
}
&:active {
background-color:$headerbar_fg_color;
color:$headerbar_bg_color;
border-radius:50%;
box-shadow:none;
}
}
}
}
// Entries
@ -140,7 +106,6 @@ headerbar {
entry {
margin:6px 0;
min-height: 16px;
border-radius: 2px;
padding: 4px;
@ -211,20 +176,27 @@ headerbar {
border-radius: 0px;
border: none;
box-shadow: none;
text-shadow: none;
-gtk-icon-shadow: none;
padding: 10px;
margin: 0;
color: $headerbar_fg_color;
padding: 10px;
text-shadow: none;
&.back-button,
&.suggested-action,
&.menu-button,
&.text-button,
&.image-button,
&.linked,
&.flat {
box-shadow: none;
text-shadow: none;
-gtk-icon-shadow: none;
background-color: transparent;
background-image: none;
border-radius: 0px;
border: none;
box-shadow: none;
-gtk-icon-shadow: none;
margin: 0;
padding: 10px;
text-shadow: none;
color: $headerbar_fg_color;
&:backdrop {
@ -233,13 +205,28 @@ headerbar {
text-shadow: none;
color: $backdrop_headerbar_fg_color;
}
&:hover {
background-image:none;
background-color: transparentize(black, 0.85);
color:lighten($headerbar_fg_color, 10%);
box-shadow:none;
text-shadow:none;
}
}
&.linked {
border-radius: 0px;
margin: 0;
label,
image {
color: $headerbar_fg_color;
&:backdrop,
&:disabled {
color: $backdrop_headerbar_fg_color;
-gtk-icon-effect: dim;
}
}
&:focus,
&:hover {
background-image:none;
background-color: transparentize(black, 0.85);
@ -252,11 +239,14 @@ headerbar {
background-color: transparent;
background-image: none;
color: $backdrop_headerbar_fg_color;
image {
color: $backdrop_headerbar_fg_color;
}
}
&:active,
&:checked {
font:bold;
border-radius: 0px;
text-shadow: none;
@ -275,38 +265,42 @@ headerbar {
box-shadow: inset 0 -2px 0 0 $backdrop_headerbar_fg_color;
}
&:focus,
&:hover {
background-image:none;
background-color: transparentize(black, 0.85);
color:lighten($headerbar_fg_color, 10%);
box-shadow: inset 0 -2px 0 0 $headerbar_fg_color;
}
}
&:disabled {
&:disabled,
&:disabled:backdrop {
color: $backdrop_headerbar_fg_color;
background-color: transparent;
background-image: none;
&:backdrop {
color: $backdrop_headerbar_fg_color;
background-color: transparent;
background-image: none;
image {
-gtk-icon-effect: dim;
}
image {
-gtk-icon-effect: dim;
}
}
// Title Button
&.titlebutton {
min-height: 16px;
min-width: 16px;
padding: 1px;
border-radius:50%;
background-color:transparent;
background-image: none;
border-radius:50%;
border: none;
box-shadow: none;
text-shadow: none;
-gtk-icon-shadow: none;
margin: 0;
padding: 1px;
text-shadow: none;
color:$headerbar_fg_color;
&:hover {
background-color:transparent;
background-color:transparentize($headerbar_fg_color, 0.9);
color:lighten($headerbar_fg_color, 10%);
}
@ -320,57 +314,81 @@ headerbar {
color:$headerbar_bg_color;
border-radius:50%;
box-shadow:none;
image {
color:$headerbar_bg_color;
}
}
}
// Menu Button
&.menu-button,
&.title-menu-button {
padding: 1px;
background-color:transparent;
box-shadow: none;
text-shadow: none;
-gtk-icon-shadow: none;
&:hover {
background-color: transparentize(black, 0.9);
color:lighten($headerbar_fg_color, 10%);
}
&:backdrop {
background-color:transparent;
color:$backdrop_headerbar_fg_color;
}
&:active {
background-color:darken($headerbar_bg_color,10%);
color:$headerbar_fg_color;
box-shadow:none;
&.menu-button {
.menu {
.menuitem {
label {
color: $fg_color;
&:disabled { color: $insensitive_fg_color; }
}
.separator { color: $borders_color;}
&:hover { label {color: $selected_fg_color;}}
}
}
}
// Suggested Action Butotn
// Suggested Button
&.suggested-action {
font-weight: bold;
padding:0;
padding: 5px 10px;
border-radius: 2px;
background-color: $headerbar_fg_color;
color: $selected_bg_color;
box-shadow: 0 1px 0 0 transparentize(black, 0.8);
label { color: $selected_bg_color;}
&:hover {
}
background-color: $headerbar_fg_color;
box-shadow: 0 1px 2px 0 transparentize(black, 0.6);
label {color: $selected_bg_color;}
&:active {
&:backdrop {
background-color: transparentize($headerbar_fg_color, 0.2);
box-shadow:none;
label { color:transparentize($selected_bg_color, 0.2);}
}
}
&:disabled {
background-color: transparentize(black, 0.9);
box-shadow:none;
label { color:transparentize($headerbar_fg_color, 0.5);}
&:backdrop {
background-color: transparentize(black, 0.9);
box-shadow:none;
label { color:transparentize($headerbar_fg_color, 0.5);}
}
}
&:backdrop {
background-color: transparentize($headerbar_fg_color, 0.9);
box-shadow: none;
label {color:transparentize($selected_bg_color, 0.8);}
}
}
&:backdrop:disabled {
// Linked button
&.linked {
&:first-child,
&:last-child {
border-radius:0;
}
}
}
// Separator
.separator {
color: transparent;
background-color: transparent;
@ -378,7 +396,6 @@ headerbar {
}
.titlebar {
&, &:backdrop {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
@ -386,6 +403,7 @@ headerbar {
}
headerbar {
.separator:first-child + &,
separator:first-child + &, // tackles the paned container case
&:first-child { &, &:backdrop { border-top-left-radius: 4px; }}
@ -407,5 +425,5 @@ headerbar {
}
}
@extend %titlebar;
@extend %headerbar;
}

View File

@ -1,17 +1,18 @@
/************
* GtkScale *
************/
%scale_trough {
border:none;
background-color: $base_color;
box-shadow: inset 0 0 0 1px transparentize(black, 0.8), 0px 1px $bottom_highlight;
box-shadow: 0px 1px $bottom_highlight;
border:1px solid $borders_color;
padding:0;
margin: 0;
&:disabled {
background-color: $insensitive_bg_color;
box-shadow: none;
}
&:backdrop {
@ -21,7 +22,7 @@
&:disabled { background-color: $insensitive_bg_color; }
}
// on selected list rows
// ...on selected list rows
row:selected & {
box-shadow: none;
@ -43,20 +44,19 @@
border: 1px solid $selected_borders_color;
background-color: $selected_bg_color;
box-shadow: 0px 1px $bottom_highlight;
box-shadow: inset 0px 1px $top_highlight;
border-radius: 4px;
min-height: 8px;
&:disabled {
border: 1px solid darken($borders_color, 15%);
background-color: darken($bg_color, 20%);
border: 1px solid $borders_color;
background-color: transparentize(black, 0.9);
}
&:backdrop,
&:active:backdrop {
border-color: if($variant=='light', $selected_bg_color, $selected_borders_color);
border-color: lighten($selected_bg_color, 10%);
background-color: lighten($selected_bg_color, 10%);
&:disabled {
background-color: transparent;
@ -64,8 +64,7 @@
}
}
// on selected list rows
.list-row:selected & { &:disabled, & { border-color: $selected_borders_color; } }
// ...on selected list rows
row:selected & { &:disabled, & { border-color: $selected_borders_color; } }
// OSD
@ -76,12 +75,10 @@
}
}
// Scale
scale {
// sizing
$_marks_length: 6px;
$_marks_lenght: 6px;
$_marks_distance: 6px;
min-height: 10px;
@ -92,15 +89,19 @@ scale {
fill,
highlight { margin: -1px; }
// Slider, the scale handle
// the slider is inside the trough, so to have make it bigger there's a negative margin
slider {
min-height: 16px;
min-width: 16px;
margin: 2px;
min-height: 18px;
min-width: 18px;
margin: -9px 0;
&.horizontal {
margin: 0 -9px;
}
background-color:$base_color;
box-shadow:0 1px 1px 0 transparentize(black, 0.8);
border: 1px solid transparentize(black, 0.7);
box-shadow:0 1px 2px 0 transparentize(black, 0.7);
border: 1px solid $borders_color;
border-radius: 12px;
transition: $button_transition;
@ -108,7 +109,7 @@ scale {
&:hover {}
&:active {
box-shadow:0 1px 1px 0 transparentize($selected_bg_color, 0.5);
box-shadow:0 1px 2px 0 transparentize($selected_bg_color, 0.5);
border: 1px solid $selected_bg_color;
&:disabled {
@ -116,63 +117,10 @@ scale {
border: 1px solid transparentize(black, 0.8);
}
}
&:disabled {
box-shadow:none;
}
&:backdrop {}
.list-row:selected & { &, &:disabled { border-color: $selected_borders_color; } }
row:selected & { &, &:disabled { border-color: $selected_borders_color; } }
// OSD
.osd & {
@include button(osd);
border-color: darken($osd_borders_color, 3%);
background-color: opacify($osd_bg_color, 1); // solid background needed here
&:hover { @include button(osd-hover); }
&:active { @include button(osd-active); }
&:disabled { @include button(osd-insensitive); }
&:backdrop {
@include button(osd-backdrop);
&:disabled { @include button(osd-backdrop-insensitive); }
}
}
}
// Trough
trough {
@extend %scale_trough;
border-radius: 2px;
margin: 6px;
outline-offset: 2px;
-gtk-outline-radius: 5px;
&.horizontal {
}
&.vertical {
}
}
// The coloured part of the Trough
fill,
highlight {
@extend %scale_highlight;
}
// Fine-tune mode
// when you click-and-hold the slider
// click-and-hold the slider to activate
&.fine-tune {
&.horizontal {
padding-top: 9px;
padding-bottom: 9px;
@ -186,39 +134,31 @@ scale {
}
// to make the trough grow in fine-tune mode
slider {
min-height: 16px;
min-width: 16px;
background-color:$base_color;
border-color:$base_color;
border: 1px solid transparentize(black, 0.7);
border-radius: 12px;
box-shadow:none;
}
trough {
@extend %scale_trough;
border-radius:6px;
outline-offset: 2px;
-gtk-outline-radius: 5px;
margin: 2px;
}
slider { margin: -6px; }
fill,
highlight {
@extend %scale_highlight;
highlight,
trough {
border-radius: 5px;
-gtk-outline-radius: 7px;
}
}
// the backing bit
trough {
@extend %scale_trough;
outline-offset: 2px;
-gtk-outline-radius: 5px;
}
// the colored part of the backing bit
highlight { @extend %scale_highlight; }
// this is another differently styled part of the backing bit, the most relevant use case is for example
// in media player to indicate how much video stream as been cached
fill {
@extend %scale_trough;
border-radius: 2px;
&, &:backdrop {
background-color: $borders_color;
@ -245,6 +185,51 @@ scale {
}
}
slider {
@include button(normal-alt, $edge: $shadow_color);
border: 1px solid darken($borders_color, 3%);
border-radius: 100%;
transition: $button_transition;
transition-property: background, border, box-shadow;
&:hover { @include button(hover-alt, $edge: $shadow_color); }
&:active { border-color: $selected_borders_color; }
&:disabled { @include button (insensitive); }
&:backdrop {
transition: $backdrop_transition;
@include button(backdrop);
&:disabled { @include button(backdrop-insensitive); }
}
// ...on selected list rows
row:selected & { &, &:disabled { border-color: $selected_borders_color; } }
// OSD
.osd & {
@include button(osd);
border-color: darken($osd_borders_color, 3%);
background-color: opacify($osd_bg_color, 1); // solid background needed here
&:hover { @include button(osd-hover); }
&:active { @include button(osd-active); }
&:disabled { @include button(osd-insensitive); }
&:backdrop {
@include button(osd-backdrop);
&:disabled { @include button(osd-backdrop-insensitive); }
}
}
}
value { color: gtkalpha(currentColor, 0.4); }
marks {
@ -256,7 +241,7 @@ scale {
(bottom, right, left) {
&.#{$marks_class} {
margin-#{$marks_margin}: $_marks_distance;
margin-#{$marks_pos}: -($_marks_distance + $_marks_length);
margin-#{$marks_pos}: -($_marks_distance + $_marks_lenght);
}
}
}
@ -268,25 +253,25 @@ scale {
(bottom, right, left) {
&.#{$marks_class} {
margin-#{$marks_margin}: $_marks_distance;
margin-#{$marks_pos}: -($_marks_distance + $_marks_length - 3px);
margin-#{$marks_pos}: -($_marks_distance + $_marks_lenght - 3px);
}
}
}
&.horizontal {
indicator {
min-height: $_marks_length;
min-height: $_marks_lenght;
min-width: 1px;
}
&.fine-tune indicator { min-height: ($_marks_length - 3px); }
&.fine-tune indicator { min-height: ($_marks_lenght - 3px); }
}
&.vertical {
indicator {
min-height: 1px;
min-width: $_marks_length;
min-width: $_marks_lenght;
}
&.fine-tune indicator { min-width: ($_marks_length - 3px); }
&.fine-tune indicator { min-width: ($_marks_lenght - 3px); }
}
// *WARNING* scale with marks madness following
@ -379,7 +364,6 @@ scale {
min-height: 0;
min-width: 0;
.trough,
trough {
background-image: linear-gradient(to top, $borders_color);
background-repeat: no-repeat;
@ -388,7 +372,6 @@ scale {
&.horizontal {
padding: 0 0 15px 0;
.trough,
trough {
padding-bottom: 4px;
background-position: 0 -3px;
@ -396,7 +379,6 @@ scale {
border-top-right-radius: 0;
}
.slider,
slider {
&:hover, &:backdrop, &:disabled, &:backdrop:disabled, & {
@extend %scale-has-marks-above-horz;
@ -411,7 +393,6 @@ scale {
&:dir(ltr) {
padding: 0 0 0 15px;
.trough,
trough {
padding-left: 4px;
background-position: 3px 0;
@ -419,7 +400,6 @@ scale {
border-top-right-radius: 0;
}
.slider,
slider {
&:hover, &:backdrop, &:disabled, &:backdrop:disabled, & {
@extend %scale-has-marks-below-vert;
@ -433,7 +413,6 @@ scale {
&:dir(rtl) {
padding: 0 15px 0 0;
.trough,
trough {
padding-right: 4px;
background-position: -3px 0;
@ -441,7 +420,6 @@ scale {
border-top-left-radius: 0;
}
.slider,
slider {
&:hover, &:backdrop, &:disabled, &:backdrop:disabled, & {
@extend %scale-has-marks-above-vert;
@ -457,13 +435,11 @@ scale {
&.horizontal {
padding: 0 0 12px 0;
.trough,
trough {
padding-bottom: 7px;
background-position: 0 -6px;
}
.slider,
slider {
@extend %scale-has-marks-above-horz-fine-tune;
@ -476,13 +452,11 @@ scale {
&:dir(ltr) {
padding: 0 0 0 12px;
.trough,
trough {
padding-left: 7px;
background-position: 6px 0;
}
.slider,
slider {
@extend %scale-has-marks-below-vert-fine-tune;
@ -494,13 +468,11 @@ scale {
&:dir(rtl) {
padding: 0 12px 0 0;
.trough,
trough {
padding-right: 7px;
background-position: -6px 0;
}
.slider,
slider {
@extend %scale-has-marks-above-vert-fine-tune;

View File

@ -17,47 +17,142 @@ toolbar {
// on OSD
.osd & { box-shadow:none; background-color: transparent; }
// buttons
// Buttons
button {
border: none;
background: none;
text-shadow: none;
background-color: transparent;
color: $headerbar_fg_color;
background-image: none;
border-radius: 0px;
border: none;
box-shadow: none;
icon-shadow: none;
margin: 0;
padding: 10px;
text-shadow: none;
&:focus,
&:active {
color: $headerbar_fg_color;
&.suggested-action,
&.text-button,
&.menu-button,
&.image-button,
&.linked,
&.flat {
background-color: transparent;
background-image: none;
border-radius: 0px;
border: none;
box-shadow: none;
icon-shadow: none;
margin: 0;
padding: 10px;
text-shadow: none;
box-shadow: inset 0 -2px 0 0 $headerbar_fg_color;
background-color: transparentize(white, 0.9);
color: $headerbar_fg_color;
&:backdrop {
background-color: transparent;
background-image: none;
text-shadow: none;
color: $backdrop_headerbar_fg_color;
}
&:hover {
background-image:none;
background-color: transparentize(black, 0.85);
color:lighten($headerbar_fg_color, 10%);
box-shadow:none;
text-shadow:none;
}
&:disabled {
color: $backdrop_headerbar_fg_color;
-gtk-image-effect: dim;
}
}
label,
image {
color: $headerbar_fg_color;
&:disabled,
&:backdrop {
color: $backdrop_headerbar_fg_color;
-gtk-image-effect: dim;
}
}
&:focus,
&:hover {
background-image:none;
background-color: transparentize(black, 0.85);
color:lighten($headerbar_fg_color, 10%);
box-shadow:none;
text-shadow:none;
}
&:backdrop {
background-color: transparent;
background-image: none;
color: $backdrop_headerbar_fg_color;
image {
color: $backdrop_headerbar_fg_color;
}
}
&:hover {
background-color: transparentize(white, 0.9);
&:active,
&:checked {
border-radius: 0px;
text-shadow: none;
color: $headerbar_fg_color;
icon-shadow: none;
box-shadow: inset 0 -2px 0 0 $headerbar_fg_color;
background-color: transparent;
background-image: none;
color: $headerbar_fg_color;
&:backdrop {
background-color: transparent;
background-image: none;
color: $backdrop_headerbar_fg_color;
box-shadow: inset 0 -2px 0 0 $backdrop_headerbar_fg_color;
}
&:focus,
&:hover {
background-image:none;
background-color: transparentize(black, 0.85);
color:lighten($headerbar_fg_color, 10%);
box-shadow: inset 0 -2px 0 0 $headerbar_fg_color;
}
}
&:disabled {
background:none;
background-color: transparent;
color: transparentize($headerbar_fg_color,0.5);
}
&:backdrop {
background:none;
background-color: transparent;
&:disabled,
&:disabled:backdrop {
color: $backdrop_headerbar_fg_color;
background-color: transparent;
background-image: none;
image,
image {
-gtk-image-effect: dim;
}
}
// Menu Button
&.menu-button {
.menu {
.menuitem {
label {
color: $fg_color;
&:disabled { color: $insensitive_fg_color; }
}
.separator { color: $borders_color;}
&:hover { label {color: $selected_fg_color;}}
}
}
}
}
@ -92,6 +187,7 @@ toolbar {
%inline-toolbar,
.inline-toolbar {
-GtkWidget-window-dragging: true;
background-color: darken($bg_color, 2%);
color: $fg_color;
@ -110,14 +206,31 @@ toolbar {
// buttons
button {
border: none;
background: none;
text-shadow: none;
box-shadow: none;
background-color: transparent;
color: $fg_color;
background-image: none;
border-radius: 0px;
border: none;
box-shadow: none;
icon-shadow: none;
margin: 0;
padding: 10px;
text-shadow: none;
&.suggested-action,
&.text-button,
&.menu-button,
&.image-button,
&.linked,
&.flat {
border: none;
background: none;
text-shadow: none;
box-shadow: none;
background-color: transparent;
color: $fg_color;
border-radius: 0px;
padding: 10px;
}
&:focus,
&:active {
@ -152,9 +265,21 @@ toolbar {
background:none;
background-color: transparent;
color: $backdrop_fg_color;
}
label,
image {
color: $fg_color;
&:disabled,
&:backdrop {
color: $backdrop_fg_color;
-gtk-image-effect: dim;
}
}
}
.entry,
entry {
background: none;
color: $fg_color;

View File

@ -2,7 +2,6 @@
* Window Decorations *
*********************/
.window-frame,
decoration {
border-radius: 4px;
@ -24,27 +23,14 @@ decoration {
.popup & { box-shadow: none; }
// server-side decorations as used by mutter
.ssd & { box-shadow: 0 0 0 1px transparentize(black,0.5);}
// server-side decorations
.ssd & { box-shadow: 0 0 0 1px transparentize(black,0.9);}
.csd.popup & {
border-radius: 0;
box-shadow: 0 1px 2px transparentize(black, 0.8);
}
.tooltip.csd &,
tooltip.csd & {
border-radius: 5px;
box-shadow: none;
}
GtkMessageDialog.csd &,
messagedialog.csd & {
border-radius: 5px;
box-shadow: 0 3px 6px transparentize(black, 0.8),
0 1px 3px transparentize(black,0.7);
}
.solid-csd & {
border-radius: 0;
margin: 4px;
@ -52,53 +38,4 @@ decoration {
border: 0px solid $backdrop_borders_color;
box-shadow: none;
}
}
// // Window Close button
// .button.titlebutton,
// button.titlebutton {
// @extend %button_basic;
// @extend %button_basic.flat;
// @include _button_text_shadow;
// .selection-mode & {
// @extend %button.flat.suggested-action;
// @extend %nobg_selected_items;
// }
// &:backdrop { -gtk-icon-shadow: none; }
// }
// .header-bar.selection-mode button.titlebutton,
// headerbar.selection-mode button.titlebutton,
// .titlebar.selection-mode button.titlebutton {
// @include _button_text_shadow(white, $selected_bg_color);
// &:backdrop { -gtk-icon-shadow: none; }
// }
// catch all extend :)
%selected_items {
background-color: $selected_bg_color;
@at-root %nobg_selected_items, & {
color: $selected_fg_color;
@if $variant == 'light' { outline-color: transparentize($selected_fg_color, 0.7); }
&:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); }
&:backdrop {
color: $backdrop_selected_fg_color;
&:disabled { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); }
}
}
}
.monospace { font: Monospace; }
}