diff options
Diffstat (limited to 'common/gtk-3.0/3.18/sass/_common.scss')
| -rw-r--r-- | common/gtk-3.0/3.18/sass/_common.scss | 61 |
1 files changed, 37 insertions, 24 deletions
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 83aff34..86ae0b7 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -237,20 +237,20 @@ $vert_padding: 5px; box-shadow: none; } - @each $e_type, $e_color in (warning, $warning_color), - (error, $error_color) { + @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $warning_fg_color), + (error, $error_color, $error_fg_color) { &.#{$e_type} { color: $selected_fg_color; border-color: if($variant=='light', $e_color, $entry_border); background-image: linear-gradient(to bottom, mix($e_color, $base_color, 60%)); &:focus { - color: $selected_fg_color; + color: $e_fg_color; background-image: linear-gradient(to bottom, $e_color); box-shadow: none; } &:selected, &:selected:focus { - background-color: $selected_fg_color; + background-color: $e_fg_color; color: $e_color; } } @@ -327,6 +327,8 @@ $_dot_color: $selected_bg_color; background-clip: if($variant=='light', border-box, padding-box); @include button(active); transition-duration: 50ms; + + &:not(:insensitive) .label:insensitive { color: inherit; opacity: 0.6; } } //Webkitgtk workaround start @@ -389,10 +391,10 @@ $_dot_color: $selected_bg_color; .osd .linked:not(.vertical):not(.path-bar) > &:hover:not(:checked):not(:active) + &:not(:checked):not(:active) { box-shadow: none; } // Suggested and Destructive Action buttons - @each $b_type, $b_color in (suggested-action, $suggested_color), - (destructive-action, $destructive_color) { + @each $b_type, $b_color, $b_fg in (suggested-action, $suggested_color, $suggested_fg_color), + (destructive-action, $destructive_color, $destructive_fg_color) { &.#{$b_type} { - @include button(suggested_destructive, $b_color); + @include button(suggested_destructive, $b_color, $b_fg); &.flat { @include button(undecorated); @@ -400,10 +402,10 @@ $_dot_color: $selected_bg_color; outline-color: transparentize($b_color, 0.7); } &:hover { - @include button(suggested_destructive, lighten($b_color, 10%)); + @include button(suggested_destructive, lighten($b_color, 10%), $b_fg); } &:active, &:checked { - @include button(suggested_destructive, darken($b_color, 10%)); + @include button(suggested_destructive, darken($b_color, 10%), $b_fg); } &.flat:insensitive { @include button(undecorated); @@ -971,14 +973,14 @@ GtkComboBox { // Selectionmode &.selection-mode, &.titlebar.selection-mode { - color: $selected_fg_color; + color: $selection_mode_fg; background-color: $selection_mode_bg; border-color: darken($selection_mode_bg, 4%); box-shadow: none; &:backdrop { background-color: $selection_mode_bg; - color: transparentize($selected_fg_color, 0.4); + color: transparentize($selection_mode_fg, 0.4); } .subtitle:link { @extend *:link:selected; } @@ -1128,19 +1130,19 @@ GtkComboBox { background-color: transparent; } - @each $e_type, $e_color in (warning, $warning_color), - (error, $error_color) { + @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $warning_fg_color), + (error, $error_color, $error_fg_color) { &.#{$e_type} { - color: $selected_fg_color; + color: $e_fg_color; border-color: if($darker=='false' and $variant=='light', $e_color, $header_entry_border); background-image: linear-gradient(to bottom, mix($e_color, $header_bg, 60%)); &:focus { - color: $selected_fg_color; + color: $e_fg_color; background-image: linear-gradient(to bottom, $e_color); } &:selected, &:selected:focus { - background-color: $selected_fg_color; + background-color: $e_fg_color; color: $e_color; } } @@ -1205,10 +1207,10 @@ GtkComboBox { } // Headerbar Suggested and Destructive Action buttons - @each $b_type, $b_color in (suggested-action, $suggested_color), - (destructive-action, $destructive_color) { + @each $b_type, $b_color, $b_fg in (suggested-action, $suggested_color, $suggested_fg_color), + (destructive-action, $destructive_color, $destructive_fg_color) { .button.#{$b_type} { - @include button(suggested_destructive, $b_color); + @include button(suggested_destructive, $b_color, $b_fg); &.flat { @include button(undecorated); @@ -1216,10 +1218,10 @@ GtkComboBox { outline-color: transparentize($b_color, 0.7); } &:hover { - @include button(suggested_destructive, lighten($b_color, 10%)); + @include button(suggested_destructive, lighten($b_color, 10%), $b_fg); } &:active, &:checked { - @include button(suggested_destructive, darken($b_color, 10%)); + @include button(suggested_destructive, darken($b_color, 10%), $b_fg); } &.flat:insensitive, &:insensitive { @include button(header-insensitive); } @@ -1394,22 +1396,29 @@ GtkTreeView.view { // treeview grid lines a } } - &.progressbar { // progress bar in treeviews + &.progressbar, &.progressbar:focus { // progress bar in treeviews color: $selected_fg_color; border-radius: 3px; background-image: linear-gradient(to bottom, $selected_bg_color); - &:selected { + &:selected, &:selected:focus { color: $selected_bg_color; box-shadow: none; background-image: linear-gradient(to bottom, $selected_fg_color); } } - &.trough, &.trough:selected { // progress bar trough in treeviews + &.trough { // progress bar trough in treeviews color: $fg_color; background-image: linear-gradient(to bottom, $button_border); border-radius: 3px; border-width: 0; + + &:selected, &:selected:focus { + color: $selected_fg_color; + background-image: linear-gradient(to bottom, transparentize(black, 0.8)); + border-radius: 3px; + border-width: 0; + } } } @@ -1916,6 +1925,7 @@ GtkSwitch { background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); } + WingpanelWidgetsIndicatorPopover.popover .menuitem:hover GtkSwitch.trough#{$k}, .menu .menuitem:hover GtkSwitch.trough#{$k}, .list-row:selected GtkSwitch.trough#{$k}, GtkInfoBar GtkSwitch.trough#{$k} { @@ -1955,6 +1965,7 @@ GtkSwitch { // the borders of checks and radios are // too similar in luminosity to the selected background color, hence // we need special casing. + WingpanelWidgetsIndicatorPopover.popover .menuitem:hover .#{$w}#{$s}, .menu .menuitem.#{$w}#{$s}:hover, GtkTreeView.view.#{$w}#{$s}:selected, .list-row:selected .#{$w}#{$s}, @@ -2036,6 +2047,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } //selected list-row and infobar sliders + WingpanelWidgetsIndicatorPopover.popover .menuitem:hover &, .menu .menuitem:hover &, .list-row:selected &, GtkInfoBar & { @@ -2085,6 +2097,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { &:insensitive { } } // troughs in selected list-rows and infobars + WingpanelWidgetsIndicatorPopover.popover .menuitem:hover &, .menu .menuitem:hover &, .list-row:selected &, GtkInfoBar & { |