diff options
Diffstat (limited to 'gtk-3.0/_common.scss')
-rw-r--r-- | gtk-3.0/_common.scss | 100 |
1 files changed, 62 insertions, 38 deletions
diff --git a/gtk-3.0/_common.scss b/gtk-3.0/_common.scss index d56bf8d..164ed58 100644 --- a/gtk-3.0/_common.scss +++ b/gtk-3.0/_common.scss @@ -1025,15 +1025,18 @@ GtkComboBox { border-color: darken($header_bg, 7%); color: $header_fg; - background-color: $header_bg; + background-color: opacify($header_bg, 1); + + .csd & { background-color: $header_bg; } // Transparent header-bars only in csd windows &:backdrop { color: transparentize($header_fg, 0.3); - background-color: lighten($header_bg, 3%); + background-color: lighten(opacify($header_bg, 1), 3%); + + .csd & { background-color: lighten($header_bg, 3%); } // Transparent header-bars only in csd windows } .title { - font-weight: bold; padding: 0px 12px; } @@ -1050,20 +1053,53 @@ GtkComboBox { border-color: darken($selection_mode_bg, 4%); box-shadow: none; - &:backdrop { background-color: $selection_mode_bg; } + &:backdrop { + background-color: $selection_mode_bg; + color: transparentize($selected_fg_color, 0.4); + } .subtitle:link { @extend *:link:selected; } .button { - @extend %selected-button + color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); + background-color: transparentize($selected_fg_color, 1); + border-color: transparentize($selected_fg_color, 1); + + &.flat { + @include button(undecorated); + color: $selected_fg_color; + background-color: transparentize($selected_fg_color, 1); + } + &:hover { + color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); + background-color: transparentize($selected_fg_color, 0.95); + border-color: transparentize($selected_fg_color, 0.5); + } + &:active, &:checked { + color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); + background-color: transparentize(black, 0.8); + border-color: transparentize(black, 0.8); + } + &:insensitive { + color: transparentize($selected_fg_color, 0.6); + background-color: transparentize($selected_fg_color, 1); + border-color: transparentize($selected_fg_color, 1); + + &:active, &:checked { + color: transparentize($selected_fg_color, 0.6); + background-color: transparentize(black, 0.85); + border-color: transparentize(black, 0.85); + } + } } .selection-menu { box-shadow: none; padding-left: 10px; padding-right: 10px; - padding-top: 12px; - padding-bottom: 12px; GtkArrow { -GtkArrow-arrow-scaling: 1; } .arrow { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); @@ -1087,7 +1123,7 @@ GtkComboBox { padding-top: 5px; // less padding for ssd padding-bottom: 5px; // background-color: opacify($header_bg, 1); - border-bottom: none; + border-bottom-width: 0; &:backdrop { background-color: lighten(opacify($header_bg, 1), 3%); } } @@ -1131,7 +1167,10 @@ GtkComboBox { &:backdrop { opacity: 0.85; } - &:focus { @include entry(header-focus); } + &:focus { + @include entry(header-focus); + background-clip: border-box; + } &:insensitive { @include entry(header-insensitive); } &:selected:focus { @@ -1167,30 +1206,34 @@ GtkComboBox { @extend %linked; } - // Suggested and Destructive Action buttons + // Header-bar Suggested and Destructive Action buttons @each $b_type, $b_color in (suggested-action, $suggested_color), (destructive-action, $destructive_color) { .button.#{$b_type} { color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); border-color: $b_color; background-color: $b_color; &.flat { @include button(undecorated); color: $b_color; + outline-color: transparentize($b_color, 0.7); } &:hover { color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); border-color: lighten($b_color, 9%); background-color: lighten($b_color, 9%); } &:active, &:checked { color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); border-color: darken($b_color, 7%); background-color: darken($b_color, 7%); } &.flat:insensitive { - + color: transparentize($b_color, 0.55); } &:insensitive { color: transparentize($selected_fg_color, 0.4); @@ -1246,6 +1289,7 @@ GtkComboBox { &:backdrop { opacity: 0.75; } } + // Header-bar Scale .scale { &:backdrop { opacity: 0.75; } @@ -1461,7 +1505,7 @@ column-header.button.dnd { // for treeview-like derive widgets color: $insensitive_fg_color; } - &.separator { color: $base_color; } + &.separator { color: transparentize($base_color, 1); } //submenu indicators &.arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); } @@ -1497,7 +1541,7 @@ column-header.button.dnd { // for treeview-like derive widgets box-shadow: 0 2px 6px 1px transparentize(black, 0.93); - & .separator { color: transparentize(black, 1); } + & .separator { color: transparentize($base_color, 1); } .label.separator { @extend .label.separator; } // Noice > .list, @@ -1632,7 +1676,6 @@ column-header.button.dnd { // for treeview-like derive widgets } GtkLabel { //tab text padding: 0 2px; // needed for a nicer focus ring - font-weight: bold; color: $insensitive_fg_color; } .prelight-page GtkLabel, GtkLabel.prelight-page { @@ -2404,7 +2447,8 @@ GtkInfoBar { .info, .question, .warning, -.error { +.error, +GtkInfoBar { background-color: $selected_bg_color; color: $selected_fg_color; } @@ -2601,6 +2645,8 @@ GtkVolumeButton.button { padding: 8px; } &.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px $_wm_border; + + &.maximized { border-radius: 0; } } &.csd { &.popup, &.menu { @@ -2640,6 +2686,7 @@ GtkVolumeButton.button { padding: 8px; } padding: 7px 4px; @include button(undecorated); + background-color: transparentize($header_bg, 1); border-width: 0; &:hover { @@ -2648,7 +2695,6 @@ GtkVolumeButton.button { padding: 8px; } &:active, &:checked { @include button(header-active); } - //&:backdrop { color: $wm_unfocused_title; } &.close, &.maximize, &.minimize { @@ -2680,28 +2726,6 @@ GtkVolumeButton.button { padding: 8px; } // catch all extend :) -%dark_button { - color: $header_fg; - background-color: lighten($header_bg, 12.5%); - - GtkLabel, GtkImage { color: $header_fg; } - - &:hover { - color: $header_fg; - background-color: lighten($header_bg, 15%); - - GtkLabel, GtkImage { color: $header_fg; } - } - &:active, &:checked { - color: $selected_bg_color; - background-image: none; - background-color: transparentize(darken($header_bg, 10%), 0.4); - border-color: transparentize(darken($header_bg, 14%), 0.4); - - GtkLabel, GtkImage { color: $selected_bg_color; } - } -} - %selected_items { background-image: none; background-color: $selected_bg_color; |