diff options
author | Lapo Calamandrei <calamandrei@gmail.com> | 2016-02-18 12:26:19 +0100 |
---|---|---|
committer | Lapo Calamandrei <calamandrei@gmail.com> | 2016-02-18 12:26:19 +0100 |
commit | a93fdd8201ff94c5ee155809640b2061d27ee29e (patch) | |
tree | 75880757bdb7488ac0fa5a03b1ac9d8dcc3097b1 | |
parent | 71c36bb8755587086eb051f2e53ecdacd2ee3978 (diff) | |
download | gtk+-a93fdd8201ff94c5ee155809640b2061d27ee29e.tar.gz |
Adwaita: housekeeping
cleaned up unneded selectors and leftovers from previous versions.
-rw-r--r-- | gtk/theme/Adwaita/_common.scss | 209 | ||||
-rw-r--r-- | gtk/theme/Adwaita/gtk-contained-dark.css | 333 | ||||
-rw-r--r-- | gtk/theme/Adwaita/gtk-contained.css | 341 |
3 files changed, 101 insertions, 782 deletions
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 50992f900b..bee9621344 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -249,8 +249,8 @@ entry { &.flat:focus { min-height: 0; padding: 2px; - @include entry(normal, $edge:none); - border: none; + background-image: none; + border-color: transparent; border-radius: 0; } @@ -263,9 +263,7 @@ entry { &:backdrop:disabled { @include entry(backdrop-insensitive); } selection, - selection:focus { - @extend %selected_items; - } + selection:focus { @extend %selected_items; } progress { margin: 1px; @@ -720,7 +718,7 @@ button { // all the following is for the +|- buttons on inline toolbars, that way // should really be deprecated... .inline-toolbar toolbutton > button { // redefining the button look is - // needed since those are flat... + // needed since those are flat... @include button(normal); &:hover { @include button(hover); } @@ -1047,31 +1045,7 @@ spinbutton { min-width: 32px; padding: 0; - &.up { - @extend %top_button; - @include button(normal, $edge:none); - - &:active { - @extend %top_button; - @include button(active, $edge:none); - } - - &:hover { - @extend %top_button; - @include button(hover, $edge:none); - } - - &:disabled { - @extend %top_button; - @include button(insensitive, $edge:none); - } - - &:backdrop { - @extend %top_button; - @include button(backdrop, $edge:none); - &:disabled { @include button(backdrop-insensitive, $edge:none); } - } - } + &.up { @extend %top_button; } &.down { @extend %bottom_button; } } @@ -1264,78 +1238,75 @@ headerbar { .subtitle:link { @extend *:link:selected; } button { - @include button(normal, $selected_bg_color, $selected_fg_color, $_hc); + @include button(normal, $selected_bg_color, $selected_fg_color); &.flat { @include button(undecorated); } - &:hover { @include button(hover, $selected_bg_color, $selected_fg_color, $_hc); } + &:hover { @include button(hover, $selected_bg_color, $selected_fg_color); } - &:active, &:checked { @include button(active, $selected_bg_color, $selected_fg_color, $_hc); } + &:active, &:checked { @include button(active, $selected_bg_color, $selected_fg_color); } &:backdrop, &.flat:backdrop { - @include button(backdrop, $selected_bg_color, $selected_fg_color, $_hc); + @include button(backdrop, $selected_bg_color, $selected_fg_color); -gtk-icon-effect: none; border-color: $selected_borders_color; &:active, &:checked { - @include button(backdrop-active, $selected_bg_color, $selected_fg_color, $_hc); + @include button(backdrop-active, $selected_bg_color, $selected_fg_color); border-color: $selected_borders_color; } &:disabled { - @include button(backdrop-insensitive, $selected_bg_color, $selected_fg_color, $_hc); + @include button(backdrop-insensitive, $selected_bg_color, $selected_fg_color); border-color: $selected_borders_color; } &:disabled:active, &:disabled:checked { - @include button(backdrop-insensitive-active, $selected_bg_color, - $selected_fg_color, $_hc); + @include button(backdrop-insensitive-active, $selected_bg_color, $selected_fg_color); border-color: $selected_borders_color; } } &.flat:backdrop, &.flat:disabled, - &.flat:disabled:backdrop { - @include button(undecorated); - } + &.flat:disabled:backdrop { @include button(undecorated); } &:disabled { - @include button(insensitive, $selected_bg_color, $selected_fg_color, $_hc); + @include button(insensitive, $selected_bg_color, $selected_fg_color); &:active, - &:checked { @include button(insensitive-active, $selected_bg_color, $selected_fg_color, $_hc); } + &:checked { @include button(insensitive-active, $selected_bg_color, $selected_fg_color); } } &.suggested-action { - @include button(normal, $edge:$_hc); + @include button(normal); border-color: $selected_borders_color; &:hover { - @include button(hover, $edge:$_hc); + @include button(hover); border-color: $selected_borders_color; } &:active { - @include button(active, $edge:$_hc); + @include button(active); border-color: $selected_borders_color; } &:disabled { - @include button(insensitive, $edge:$_hc); + @include button(insensitive); border-color: $selected_borders_color; } &:backdrop { - @include button(backdrop, $edge:$_hc); + @include button(backdrop); border-color: $selected_borders_color; } &:backdrop:disabled { - @include button(backdrop-insensitive, $edge:$_hc); + @include button(backdrop-insensitive); border-color: $selected_borders_color; } } @@ -2240,7 +2211,7 @@ switch { &:active slider { border: 1px solid $selected_borders_color; } - &:disabled slider { @include button(insensitive, $edge: none); } + &:disabled slider { @include button(insensitive); } &:backdrop { slider { @include button(backdrop); } @@ -2957,59 +2928,13 @@ row:selected { @extend %selected_items; button { - @include button(normal, $edge:none); @if $variant == 'light' { border-color: $selected_borders_color; } - &.flat { - @include button(undecorated, $edge:none); + &.flat:not(:active):not(:checked):not(:hover):not(disabled) { color: $selected_fg_color; - } - - &:hover { - @include button(hover, $edge:none); - @if $variant == 'light' { border-color: $selected_borders_color; } - } - - &:active, - &:checked { - @include button(active, $edge:none); - @if $variant == 'light' { border-color: $selected_borders_color; } - } - - &:backdrop, - &.flat:backdrop { - @include button(backdrop, $edge:none); - @if $variant == 'light' { border-color: $selected_borders_color; } - - &:active, - &:checked { - @include button(backdrop-active, $edge:none); - @if $variant == 'light' { border-color: $selected_borders_color; } - } - - &:disabled { - @include button(backdrop-insensitive, $edge:none); - @if $variant == 'light' { border-color: $selected_borders_color; } - - &:active, - &:checked { - @include button(backdrop-insensitive-active, $edge:none); - @if $variant == 'light' { border-color: $selected_borders_color; } - } - } - } - - &.flat:backdrop { - @include button(undecorated); - color: if($variant=='light', $backdrop_base_color, $backdrop_fg_color); - } - - &:disabled { - @include button(insensitive, $edge:none); - @if $variant == 'light' { border-color: $selected_borders_color; } + border-color: transparent; - &:active, - &:checked { @include button(insensitive-active, $edge:none); } + &:backdrop { color: if($variant=='light', $backdrop_base_color, $backdrop_fg_color); } } } } @@ -3140,86 +3065,20 @@ messagedialog { // Message Dialog styling .dialog-action-area button { padding: 10px 14px; // labels are not vertically centered on message dialog, this is a workaround border-radius: 0; - @include button(normal, $edge:none); - @extend %middle_button; - - &:hover { - @include button(hover, $edge:none); - @extend %middle_button; - } - - &:active { - @include button(active, $edge:none); - @extend %middle_button; - } - - &:disabled { - @include button(insensitive, $edge:none); - @extend %middle_button; - } - - &:backdrop { - @include button(backdrop, $edge:none); - @extend %middle_button; - } - - &:backdrop:disabled { - @include button(backdrop-insensitive, $edge:none); - @extend %middle_button; - } - - @each $b_type, $b_color in (suggested-action, $selected_bg_color), - (destructive-action, $destructive_color) { - &.#{$b_type} { - @include button(normal, $b_color, white, $edge:none); - @extend %middle_button; - - &:hover { - @include button(hover, $b_color, white, $edge:none); - @extend %middle_button; - } - - &:active { - @include button(active, $b_color, white, $edge:none); - @extend %middle_button; - } - - &:backdrop { - @include button(backdrop, $b_color, white, $edge:none); - @extend %middle_button; - - &:disabled { - @include button(backdrop-insensitive, $edge:none); - @extend %middle_button; - } - } - - &:disabled { - @include button(insensitive, $edge:none); - @extend %middle_button; - } - } - } - - &:first-child{ @extend %first_button; } - &:last-child { @extend %last_button; } - } - - %middle_button { border-left-style: solid; border-right-style: none; border-bottom-style: none; - } - %last_button { - border-bottom-right-radius: 7px; - -gtk-outline-bottom-right-radius: 5px; - } + &:first-child{ + border-left-style: none; + border-bottom-left-radius: 7px; + -gtk-outline-bottom-left-radius: 5px; + } - %first_button { - border-left-style: none; - border-bottom-left-radius: 7px; - -gtk-outline-bottom-left-radius: 5px; + &:last-child { + border-bottom-right-radius: 7px; + -gtk-outline-bottom-right-radius: 5px; + } } } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 20b4788bc5..80df69eba3 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -197,12 +197,8 @@ entry, spinbutton:not(.vertical) { entry.flat, spinbutton.flat:not(.vertical), entry.flat:focus, spinbutton.flat:focus:not(.vertical) { min-height: 0; padding: 2px; - background-color: #292929; - background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%); - color: white; - border-color: #1c1f1f; - box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0); - border: none; + background-image: none; + border-color: transparent; border-radius: 0; } entry:focus, spinbutton:focus:not(.vertical) { background-color: #292929; @@ -1362,52 +1358,7 @@ spinbutton.vertical button { min-height: 32px; min-width: 32px; padding: 0; } - spinbutton.vertical button.up { - color: #eeeeec; - outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #343a3a, #2f3434 60%, #2a2f2f); - text-shadow: 0 -1px rgba(0, 0, 0, 0.81176); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } - spinbutton.vertical button.up:active { - color: #eeeeec; - outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #232727, #2d3232); - text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } - spinbutton.vertical button.up:hover { - color: #eeeeec; - outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #3b4242, #343a3a 60%, #2f3434); - text-shadow: 0 -1px rgba(0, 0, 0, 0.76376); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } - spinbutton.vertical button.up:disabled { - color: #949796; - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #333636); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - spinbutton.vertical button.up:backdrop { - color: #949796; - border-color: #1f2222; - background-image: linear-gradient(to bottom, #393f3f); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - spinbutton.vertical button.up:backdrop:disabled { - color: #5d6767; - border-color: #1f2222; - background-image: linear-gradient(to bottom, #333636); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } -spinbutton.vertical button.up, spinbutton.vertical button.up:active, spinbutton.vertical button.up:hover, spinbutton.vertical button.up:disabled, spinbutton.vertical button.up:backdrop { +spinbutton.vertical button.up { border-radius: 3px 3px 0 0; border-style: solid solid none solid; } spinbutton.vertical button.down { @@ -1573,7 +1524,7 @@ headerbar { background-image: linear-gradient(to bottom, #1f5894, #1d538b 60%, #1b4e83); text-shadow: 0 -1px rgba(0, 0, 0, 0.70353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0.535); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow, .selection-mode.titlebar:not(headerbar) button.sidebar-button, .selection-mode.titlebar:not(headerbar) button.titlebutton, headerbar.selection-mode button.flat, @@ -1594,7 +1545,7 @@ headerbar { background-image: linear-gradient(to bottom, #2260a0, #1f5894 60%, #1d538b); text-shadow: 0 -1px rgba(0, 0, 0, 0.65553); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.65553); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0.535); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked, headerbar.selection-mode button:active, headerbar.selection-mode button:checked { @@ -1604,7 +1555,7 @@ headerbar { background-image: linear-gradient(to bottom, #194776, #1c5187); text-shadow: 0 -1px rgba(0, 0, 0, 0.78353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(40, 98, 159, 0.535); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop, .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop, headerbar.selection-mode button:backdrop, @@ -1617,7 +1568,7 @@ headerbar { background-image: linear-gradient(to bottom, #215d9c); text-shadow: none; -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: none; border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:active, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:active, @@ -1636,7 +1587,7 @@ headerbar { color: #d1dae3; border-color: #0b1e33; background-image: linear-gradient(to bottom, #184472); - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled, @@ -1650,7 +1601,7 @@ headerbar { background-image: linear-gradient(to bottom, #22558b); text-shadow: none; -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked, @@ -1668,7 +1619,7 @@ headerbar { color: #6c88a7; border-color: #0b1e33; background-image: linear-gradient(to bottom, #1d4877); - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop, .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:disabled, @@ -1699,14 +1650,14 @@ headerbar { background-image: linear-gradient(to bottom, #22558b); text-shadow: none; -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0.535); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked, headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked { color: #a5b6c9; border-color: #0b1e33; background-image: linear-gradient(to bottom, #1b4470, #1d4877); - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0.535); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .selection-mode.titlebar:not(headerbar) button.suggested-action, headerbar.selection-mode button.suggested-action { color: #eeeeec; @@ -1715,7 +1666,7 @@ headerbar { background-image: linear-gradient(to bottom, #343a3a, #2f3434 60%, #2a2f2f); text-shadow: 0 -1px rgba(0, 0, 0, 0.81176); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0.535); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { @@ -1725,7 +1676,7 @@ headerbar { background-image: linear-gradient(to bottom, #3b4242, #343a3a 60%, #2f3434); text-shadow: 0 -1px rgba(0, 0, 0, 0.76376); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0.535); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { @@ -1735,7 +1686,7 @@ headerbar { background-image: linear-gradient(to bottom, #232727, #2d3232); text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(40, 98, 159, 0.535); + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, headerbar.selection-mode button.suggested-action:disabled { @@ -1744,7 +1695,7 @@ headerbar { background-image: linear-gradient(to bottom, #333636); text-shadow: none; -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0.535); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop, headerbar.selection-mode button.suggested-action:backdrop { @@ -1753,7 +1704,7 @@ headerbar { background-image: linear-gradient(to bottom, #393f3f); text-shadow: none; -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled, headerbar.selection-mode button.suggested-action:backdrop:disabled { @@ -1762,7 +1713,7 @@ headerbar { background-image: linear-gradient(to bottom, #333636); text-shadow: none; -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop, headerbar.selection-mode .selection-menu, @@ -3333,98 +3284,15 @@ row.activatable:selected.has-open-popup, row.activatable:selected:hover { row.activatable:selected:backdrop { background-color: #215d9c; } -row:selected button { - color: #eeeeec; - outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #343a3a, #2f3434 60%, #2a2f2f); - text-shadow: 0 -1px rgba(0, 0, 0, 0.81176); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } - row:selected button.flat, row:selected notebook > header > tabs > arrow, row:selected button.sidebar-button, row:selected headerbar button.titlebutton, headerbar row:selected button.titlebutton, - row:selected .titlebar button.titlebutton, - .titlebar row:selected button.titlebutton { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: #ffffff; } - row:selected button:hover { - color: #eeeeec; - outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #3b4242, #343a3a 60%, #2f3434); - text-shadow: 0 -1px rgba(0, 0, 0, 0.76376); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } - row:selected button:active, row:selected button:checked { - color: #eeeeec; - outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #232727, #2d3232); - text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } - row:selected button:backdrop, row:selected button.flat:backdrop, row:selected notebook > header > tabs > arrow:backdrop, row:selected button.sidebar-button:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop, - row:selected .titlebar button.titlebutton:backdrop, - .titlebar row:selected button.titlebutton:backdrop { - color: #949796; - border-color: #1f2222; - background-image: linear-gradient(to bottom, #393f3f); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - row:selected button:backdrop:active, row:selected button:backdrop:checked, row:selected button.flat:backdrop:active, row:selected notebook > header > tabs > arrow:backdrop:active, row:selected button.sidebar-button:backdrop:active, row:selected headerbar button.titlebutton:backdrop:active, headerbar row:selected button.titlebutton:backdrop:active, - row:selected .titlebar button.titlebutton:backdrop:active, - .titlebar row:selected button.titlebutton:backdrop:active, row:selected button.flat:backdrop:checked, row:selected notebook > header > tabs > arrow:backdrop:checked, row:selected button.sidebar-button:backdrop:checked, row:selected headerbar button.titlebutton:backdrop:checked, headerbar row:selected button.titlebutton:backdrop:checked, - row:selected .titlebar button.titlebutton:backdrop:checked, - .titlebar row:selected button.titlebutton:backdrop:checked { - color: #949796; - border-color: #1f2222; - background-image: linear-gradient(to bottom, #303535); - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - row:selected button:backdrop:disabled, row:selected button.flat:backdrop:disabled, row:selected notebook > header > tabs > arrow:backdrop:disabled, row:selected button.sidebar-button:backdrop:disabled, row:selected headerbar button.titlebutton:backdrop:disabled, headerbar row:selected button.titlebutton:backdrop:disabled, - row:selected .titlebar button.titlebutton:backdrop:disabled, - .titlebar row:selected button.titlebutton:backdrop:disabled { - color: #5d6767; - border-color: #1f2222; - background-image: linear-gradient(to bottom, #333636); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - row:selected button:backdrop:disabled:active, row:selected button:backdrop:disabled:checked, row:selected button.flat:backdrop:disabled:active, row:selected notebook > header > tabs > arrow:backdrop:disabled:active, row:selected button.sidebar-button:backdrop:disabled:active, row:selected headerbar button.titlebutton:backdrop:disabled:active, headerbar row:selected button.titlebutton:backdrop:disabled:active, - row:selected .titlebar button.titlebutton:backdrop:disabled:active, - .titlebar row:selected button.titlebutton:backdrop:disabled:active, row:selected button.flat:backdrop:disabled:checked, row:selected notebook > header > tabs > arrow:backdrop:disabled:checked, row:selected button.sidebar-button:backdrop:disabled:checked, row:selected headerbar button.titlebutton:backdrop:disabled:checked, headerbar row:selected button.titlebutton:backdrop:disabled:checked, - row:selected .titlebar button.titlebutton:backdrop:disabled:checked, - .titlebar row:selected button.titlebutton:backdrop:disabled:checked { - color: #5d6767; - border-color: #1f2222; - background-image: linear-gradient(to bottom, #272929); - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - row:selected button.flat:backdrop, row:selected notebook > header > tabs > arrow:backdrop, row:selected button.sidebar-button:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop, - row:selected .titlebar button.titlebutton:backdrop, - .titlebar row:selected button.titlebutton:backdrop { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; +row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled), row:selected notebook > header > tabs > arrow:not(:active):not(:checked):not(:hover):not(disabled), row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled), row:selected headerbar button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled), headerbar row:selected button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled), +row:selected .titlebar button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled), +.titlebar row:selected button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled) { + color: #ffffff; + border-color: transparent; } + row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected notebook > header > tabs > arrow:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected headerbar button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled):backdrop, headerbar row:selected button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled):backdrop, + row:selected .titlebar button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled):backdrop, + .titlebar row:selected button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled):backdrop { color: #949796; } - row:selected button:disabled { - color: #949796; - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #333636); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - row:selected button:disabled:active, row:selected button:disabled:checked { - color: #949796; - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #313434, #333636); - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } row { transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } @@ -3508,151 +3376,16 @@ messagedialog.csd.background { messagedialog.csd .dialog-action-area button { padding: 10px 14px; border-radius: 0; - color: #eeeeec; - outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #343a3a, #2f3434 60%, #2a2f2f); - text-shadow: 0 -1px rgba(0, 0, 0, 0.81176); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } - messagedialog.csd .dialog-action-area button:hover { - color: #eeeeec; - outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #3b4242, #343a3a 60%, #2f3434); - text-shadow: 0 -1px rgba(0, 0, 0, 0.76376); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } - messagedialog.csd .dialog-action-area button:active { - color: #eeeeec; - outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #232727, #2d3232); - text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } - messagedialog.csd .dialog-action-area button:disabled { - color: #949796; - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #333636); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button:backdrop { - color: #949796; - border-color: #1f2222; - background-image: linear-gradient(to bottom, #393f3f); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button:backdrop:disabled { - color: #5d6767; - border-color: #1f2222; - background-image: linear-gradient(to bottom, #333636); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button.suggested-action { - color: white; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #1f5894, #1d538b 60%, #1b4e83); - text-shadow: 0 -1px rgba(0, 0, 0, 0.70353); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } - messagedialog.csd .dialog-action-area button.suggested-action:hover { - color: white; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #2260a0, #1f5894 60%, #1d538b); - text-shadow: 0 -1px rgba(0, 0, 0, 0.65553); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.65553); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } - messagedialog.csd .dialog-action-area button.suggested-action:active { - color: white; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #194776, #1c5187); - text-shadow: 0 -1px rgba(0, 0, 0, 0.78353); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } - messagedialog.csd .dialog-action-area button.suggested-action:backdrop { - color: #d3dfeb; - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #215d9c); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled { - color: #5d6767; - border-color: #1f2222; - background-image: linear-gradient(to bottom, #333636); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button.suggested-action:disabled { - color: #949796; - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #333636); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button.destructive-action { - color: white; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #5e0707; - background-image: linear-gradient(to bottom, #cc0f0f, #c20f0f 60%, #b90e0e); - text-shadow: 0 -1px rgba(0, 0, 0, 0.64078); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); } - messagedialog.csd .dialog-action-area button.destructive-action:hover { - color: white; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #5e0707; - background-image: linear-gradient(to bottom, #da1010, #cc0f0f 60%, #c20f0f); - text-shadow: 0 -1px rgba(0, 0, 0, 0.59278); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.59278); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); } - messagedialog.csd .dialog-action-area button.destructive-action:active { - color: white; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #5e0707; - background-image: linear-gradient(to bottom, #aa0d0d, #bd0e0e); - text-shadow: 0 -1px rgba(0, 0, 0, 0.72078); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.72078); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } - messagedialog.csd .dialog-action-area button.destructive-action:backdrop { - color: #f7cfcf; - border-color: #5e0707; - background-image: linear-gradient(to bottom, #d51010); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled { - color: #5d6767; - border-color: #1f2222; - background-image: linear-gradient(to bottom, #333636); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button.destructive-action:disabled { - color: #949796; - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #333636); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } -messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:disabled, messagedialog.csd .dialog-action-area button:backdrop, messagedialog.csd .dialog-action-area button:backdrop:disabled, messagedialog.csd .dialog-action-area button.suggested-action, messagedialog.csd .dialog-action-area button.suggested-action:hover, messagedialog.csd .dialog-action-area button.suggested-action:active, messagedialog.csd .dialog-action-area button.suggested-action:backdrop, messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled, messagedialog.csd .dialog-action-area button.suggested-action:disabled, messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.destructive-action:hover, messagedialog.csd .dialog-action-area button.destructive-action:active, messagedialog.csd .dialog-action-area button.destructive-action:backdrop, messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled, messagedialog.csd .dialog-action-area button.destructive-action:disabled { border-left-style: solid; border-right-style: none; border-bottom-style: none; } -messagedialog.csd .dialog-action-area button:last-child { - border-bottom-right-radius: 7px; - -gtk-outline-bottom-right-radius: 5px; } -messagedialog.csd .dialog-action-area button:first-child { - border-left-style: none; - border-bottom-left-radius: 7px; - -gtk-outline-bottom-left-radius: 5px; } + messagedialog.csd .dialog-action-area button:first-child { + border-left-style: none; + border-bottom-left-radius: 7px; + -gtk-outline-bottom-left-radius: 5px; } + messagedialog.csd .dialog-action-area button:last-child { + border-bottom-right-radius: 7px; + -gtk-outline-bottom-right-radius: 5px; } filechooser .dialog-action-box { border-top: 1px solid #1c1f1f; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 647800bea6..4123518994 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -197,12 +197,8 @@ entry, spinbutton:not(.vertical) { entry.flat, spinbutton.flat:not(.vertical), entry.flat:focus, spinbutton.flat:focus:not(.vertical) { min-height: 0; padding: 2px; - background-color: #ffffff; - background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%); - color: black; - border-color: #9d9d99; - box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0); - border: none; + background-image: none; + border-color: transparent; border-radius: 0; } entry:focus, spinbutton:focus:not(.vertical) { background-color: #ffffff; @@ -1366,52 +1362,7 @@ spinbutton.vertical button { min-height: 32px; min-width: 32px; padding: 0; } - spinbutton.vertical button.up { - color: #2e3436; - outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #e8e8e7, #dededd 60%, #cfcfcd); - text-shadow: 0 1px rgba(255, 255, 255, 0.76923); - -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); } - spinbutton.vertical button.up:active { - color: #2e3436; - outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #c8c8c5, #dcdcda); - text-shadow: 0 1px rgba(255, 255, 255, 0.76923); - -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } - spinbutton.vertical button.up:hover { - color: #2e3436; - outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #f7f7f7, #e8e8e7 60%, #dededd); - text-shadow: 0 1px rgba(255, 255, 255, 0.76923); - -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 1px white; } - spinbutton.vertical button.up:disabled { - color: #8b8e8f; - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #f1f1f1); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - spinbutton.vertical button.up:backdrop { - color: #8b8e8f; - border-color: #a5a5a1; - background-image: linear-gradient(to bottom, #e8e8e7); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - spinbutton.vertical button.up:backdrop:disabled { - color: #c3c3c0; - border-color: #a5a5a1; - background-image: linear-gradient(to bottom, #f1f1f1); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } -spinbutton.vertical button.up, spinbutton.vertical button.up:active, spinbutton.vertical button.up:hover, spinbutton.vertical button.up:disabled, spinbutton.vertical button.up:backdrop { +spinbutton.vertical button.up { border-radius: 3px 3px 0 0; border-style: solid solid none solid; } spinbutton.vertical button.down { @@ -1577,7 +1528,7 @@ headerbar { background-image: linear-gradient(to bottom, #4a90d9, #3986d5 60%, #2a76c6); text-shadow: 0 -1px rgba(0, 0, 0, 0.54353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.4), 0 1px rgba(146, 188, 232, 0.9); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); } .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow, .selection-mode.titlebar:not(headerbar) button.sidebar-button, .selection-mode.titlebar:not(headerbar) button.titlebutton, headerbar.selection-mode button.flat, @@ -1598,7 +1549,7 @@ headerbar { background-image: linear-gradient(to bottom, #63a0de, #4a90d9 60%, #3986d5); text-shadow: 0 -1px rgba(0, 0, 0, 0.49553); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.49553); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.4), 0 1px rgba(146, 188, 232, 0.9); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); } .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked, headerbar.selection-mode button:active, headerbar.selection-mode button:checked { @@ -1608,7 +1559,7 @@ headerbar { background-image: linear-gradient(to bottom, #276fba, #3583d5); text-shadow: 0 -1px rgba(0, 0, 0, 0.62353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(146, 188, 232, 0.9); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop, .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop, headerbar.selection-mode button:backdrop, @@ -1621,7 +1572,7 @@ headerbar { background-image: linear-gradient(to bottom, #4a90d9); text-shadow: none; -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: none; border-color: #184472; } .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:active, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:active, @@ -1640,7 +1591,7 @@ headerbar { color: #d4e4f4; border-color: #2a76c6; background-image: linear-gradient(to bottom, #2a76c6); - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled, @@ -1654,7 +1605,7 @@ headerbar { background-image: linear-gradient(to bottom, #65a1df); text-shadow: none; -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked, @@ -1672,7 +1623,7 @@ headerbar { color: #8db9e8; border-color: #5094db; background-image: linear-gradient(to bottom, #5094db); - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop, .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:disabled, @@ -1703,14 +1654,14 @@ headerbar { background-image: linear-gradient(to bottom, #65a1df); text-shadow: none; -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0.9); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked, headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked { color: #b9d4f1; border-color: #1c5187; background-image: linear-gradient(to bottom, #4b8dd3, #5094db); - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0.9); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .selection-mode.titlebar:not(headerbar) button.suggested-action, headerbar.selection-mode button.suggested-action { color: #2e3436; @@ -1719,7 +1670,7 @@ headerbar { background-image: linear-gradient(to bottom, #e8e8e7, #dededd 60%, #cfcfcd); text-shadow: 0 1px rgba(255, 255, 255, 0.76923); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.8), 0 1px rgba(146, 188, 232, 0.9); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); border-color: #184472; } .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { @@ -1729,7 +1680,7 @@ headerbar { background-image: linear-gradient(to bottom, #f7f7f7, #e8e8e7 60%, #dededd); text-shadow: 0 1px rgba(255, 255, 255, 0.76923); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 1px white, 0 1px rgba(146, 188, 232, 0.9); + box-shadow: inset 0 1px white; border-color: #184472; } .selection-mode.titlebar:not(headerbar) button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { @@ -1739,7 +1690,7 @@ headerbar { background-image: linear-gradient(to bottom, #c8c8c5, #dcdcda); text-shadow: 0 1px rgba(255, 255, 255, 0.76923); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(146, 188, 232, 0.9); + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); border-color: #184472; } .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, headerbar.selection-mode button.suggested-action:disabled { @@ -1748,7 +1699,7 @@ headerbar { background-image: linear-gradient(to bottom, #f1f1f1); text-shadow: none; -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0.9); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop, headerbar.selection-mode button.suggested-action:backdrop { @@ -1757,7 +1708,7 @@ headerbar { background-image: linear-gradient(to bottom, #e8e8e7); text-shadow: none; -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled, headerbar.selection-mode button.suggested-action:backdrop:disabled { @@ -1766,7 +1717,7 @@ headerbar { background-image: linear-gradient(to bottom, #f1f1f1); text-shadow: none; -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } .selection-mode.titlebar:not(headerbar) .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop, headerbar.selection-mode .selection-menu, @@ -3365,105 +3316,16 @@ row.activatable:selected:backdrop { background-color: #4a90d9; } row:selected button { - color: #2e3436; - outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #e8e8e7, #dededd 60%, #cfcfcd); - text-shadow: 0 1px rgba(255, 255, 255, 0.76923); - -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); border-color: #184472; } - row:selected button.flat, row:selected notebook > header > tabs > arrow, row:selected button.sidebar-button, row:selected headerbar button.titlebutton, headerbar row:selected button.titlebutton, - row:selected .titlebar button.titlebutton, - .titlebar row:selected button.titlebutton { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: #ffffff; } - row:selected button:hover { - color: #2e3436; - outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #f7f7f7, #e8e8e7 60%, #dededd); - text-shadow: 0 1px rgba(255, 255, 255, 0.76923); - -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 1px white; - border-color: #184472; } - row:selected button:active, row:selected button:checked { - color: #2e3436; - outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #c8c8c5, #dcdcda); - text-shadow: 0 1px rgba(255, 255, 255, 0.76923); - -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); - border-color: #184472; } - row:selected button:backdrop, row:selected button.flat:backdrop, row:selected notebook > header > tabs > arrow:backdrop, row:selected button.sidebar-button:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop, - row:selected .titlebar button.titlebutton:backdrop, - .titlebar row:selected button.titlebutton:backdrop { - color: #8b8e8f; - border-color: #a5a5a1; - background-image: linear-gradient(to bottom, #e8e8e7); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - border-color: #184472; } - row:selected button:backdrop:active, row:selected button:backdrop:checked, row:selected button.flat:backdrop:active, row:selected notebook > header > tabs > arrow:backdrop:active, row:selected button.sidebar-button:backdrop:active, row:selected headerbar button.titlebutton:backdrop:active, headerbar row:selected button.titlebutton:backdrop:active, - row:selected .titlebar button.titlebutton:backdrop:active, - .titlebar row:selected button.titlebutton:backdrop:active, row:selected button.flat:backdrop:checked, row:selected notebook > header > tabs > arrow:backdrop:checked, row:selected button.sidebar-button:backdrop:checked, row:selected headerbar button.titlebutton:backdrop:checked, headerbar row:selected button.titlebutton:backdrop:checked, - row:selected .titlebar button.titlebutton:backdrop:checked, - .titlebar row:selected button.titlebutton:backdrop:checked { - color: #8b8e8f; - border-color: #a5a5a1; - background-image: linear-gradient(to bottom, #d1d1cf); - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - border-color: #184472; } - row:selected button:backdrop:disabled, row:selected button.flat:backdrop:disabled, row:selected notebook > header > tabs > arrow:backdrop:disabled, row:selected button.sidebar-button:backdrop:disabled, row:selected headerbar button.titlebutton:backdrop:disabled, headerbar row:selected button.titlebutton:backdrop:disabled, - row:selected .titlebar button.titlebutton:backdrop:disabled, - .titlebar row:selected button.titlebutton:backdrop:disabled { - color: #c3c3c0; - border-color: #a5a5a1; - background-image: linear-gradient(to bottom, #f1f1f1); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - border-color: #184472; } - row:selected button:backdrop:disabled:active, row:selected button:backdrop:disabled:checked, row:selected button.flat:backdrop:disabled:active, row:selected notebook > header > tabs > arrow:backdrop:disabled:active, row:selected button.sidebar-button:backdrop:disabled:active, row:selected headerbar button.titlebutton:backdrop:disabled:active, headerbar row:selected button.titlebutton:backdrop:disabled:active, - row:selected .titlebar button.titlebutton:backdrop:disabled:active, - .titlebar row:selected button.titlebutton:backdrop:disabled:active, row:selected button.flat:backdrop:disabled:checked, row:selected notebook > header > tabs > arrow:backdrop:disabled:checked, row:selected button.sidebar-button:backdrop:disabled:checked, row:selected headerbar button.titlebutton:backdrop:disabled:checked, headerbar row:selected button.titlebutton:backdrop:disabled:checked, - row:selected .titlebar button.titlebutton:backdrop:disabled:checked, - .titlebar row:selected button.titlebutton:backdrop:disabled:checked { - color: #c3c3c0; - border-color: #a5a5a1; - background-image: linear-gradient(to bottom, #e4e4e4); - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - border-color: #184472; } - row:selected button.flat:backdrop, row:selected notebook > header > tabs > arrow:backdrop, row:selected button.sidebar-button:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop, - row:selected .titlebar button.titlebutton:backdrop, - .titlebar row:selected button.titlebutton:backdrop { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: white; } - row:selected button:disabled { - color: #8b8e8f; - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #f1f1f1); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - border-color: #184472; } - row:selected button:disabled:active, row:selected button:disabled:checked { - color: #8b8e8f; - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #e9e9e8, #f1f1f1); - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled), row:selected notebook > header > tabs > arrow:not(:active):not(:checked):not(:hover):not(disabled), row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled), row:selected headerbar button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled), headerbar row:selected button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled), + row:selected .titlebar button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled), + .titlebar row:selected button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled) { + color: #ffffff; + border-color: transparent; } + row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected notebook > header > tabs > arrow:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected headerbar button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled):backdrop, headerbar row:selected button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled):backdrop, + row:selected .titlebar button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled):backdrop, + .titlebar row:selected button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled):backdrop { + color: white; } row { transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } @@ -3547,151 +3409,16 @@ messagedialog.csd.background { messagedialog.csd .dialog-action-area button { padding: 10px 14px; border-radius: 0; - color: #2e3436; - outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #e8e8e7, #dededd 60%, #cfcfcd); - text-shadow: 0 1px rgba(255, 255, 255, 0.76923); - -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); } - messagedialog.csd .dialog-action-area button:hover { - color: #2e3436; - outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #f7f7f7, #e8e8e7 60%, #dededd); - text-shadow: 0 1px rgba(255, 255, 255, 0.76923); - -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 1px white; } - messagedialog.csd .dialog-action-area button:active { - color: #2e3436; - outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #c8c8c5, #dcdcda); - text-shadow: 0 1px rgba(255, 255, 255, 0.76923); - -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } - messagedialog.csd .dialog-action-area button:disabled { - color: #8b8e8f; - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #f1f1f1); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button:backdrop { - color: #8b8e8f; - border-color: #a5a5a1; - background-image: linear-gradient(to bottom, #e8e8e7); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button:backdrop:disabled { - color: #c3c3c0; - border-color: #a5a5a1; - background-image: linear-gradient(to bottom, #f1f1f1); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button.suggested-action { - color: white; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #1c5187; - background-image: linear-gradient(to bottom, #4a90d9, #3986d5 60%, #2a76c6); - text-shadow: 0 -1px rgba(0, 0, 0, 0.54353); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); } - messagedialog.csd .dialog-action-area button.suggested-action:hover { - color: white; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #1c5187; - background-image: linear-gradient(to bottom, #63a0de, #4a90d9 60%, #3986d5); - text-shadow: 0 -1px rgba(0, 0, 0, 0.49553); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.49553); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); } - messagedialog.csd .dialog-action-area button.suggested-action:active { - color: white; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #1c5187; - background-image: linear-gradient(to bottom, #276fba, #3583d5); - text-shadow: 0 -1px rgba(0, 0, 0, 0.62353); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } - messagedialog.csd .dialog-action-area button.suggested-action:backdrop { - color: #dbe9f7; - border-color: #4a90d9; - background-image: linear-gradient(to bottom, #4a90d9); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled { - color: #c3c3c0; - border-color: #a5a5a1; - background-image: linear-gradient(to bottom, #f1f1f1); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button.suggested-action:disabled { - color: #8b8e8f; - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #f1f1f1); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button.destructive-action { - color: white; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #8e0b0b; - background-image: linear-gradient(to bottom, #ef2929, #ee1616 60%, #d51010); - text-shadow: 0 -1px rgba(0, 0, 0, 0.56078); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.56078); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); } - messagedialog.csd .dialog-action-area button.destructive-action:hover { - color: white; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #8e0b0b; - background-image: linear-gradient(to bottom, #f14545, #ef2929 60%, #ee1616); - text-shadow: 0 -1px rgba(0, 0, 0, 0.51278); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.51278); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); } - messagedialog.csd .dialog-action-area button.destructive-action:active { - color: white; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #8e0b0b; - background-image: linear-gradient(to bottom, #c70f0f, #ed1212); - text-shadow: 0 -1px rgba(0, 0, 0, 0.64078); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } - messagedialog.csd .dialog-action-area button.destructive-action:backdrop { - color: #fcd4d4; - border-color: #ef2929; - background-image: linear-gradient(to bottom, #ef2929); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled { - color: #c3c3c0; - border-color: #a5a5a1; - background-image: linear-gradient(to bottom, #f1f1f1); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - messagedialog.csd .dialog-action-area button.destructive-action:disabled { - color: #8b8e8f; - border-color: #9d9d99; - background-image: linear-gradient(to bottom, #f1f1f1); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } -messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:disabled, messagedialog.csd .dialog-action-area button:backdrop, messagedialog.csd .dialog-action-area button:backdrop:disabled, messagedialog.csd .dialog-action-area button.suggested-action, messagedialog.csd .dialog-action-area button.suggested-action:hover, messagedialog.csd .dialog-action-area button.suggested-action:active, messagedialog.csd .dialog-action-area button.suggested-action:backdrop, messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled, messagedialog.csd .dialog-action-area button.suggested-action:disabled, messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.destructive-action:hover, messagedialog.csd .dialog-action-area button.destructive-action:active, messagedialog.csd .dialog-action-area button.destructive-action:backdrop, messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled, messagedialog.csd .dialog-action-area button.destructive-action:disabled { border-left-style: solid; border-right-style: none; border-bottom-style: none; } -messagedialog.csd .dialog-action-area button:last-child { - border-bottom-right-radius: 7px; - -gtk-outline-bottom-right-radius: 5px; } -messagedialog.csd .dialog-action-area button:first-child { - border-left-style: none; - border-bottom-left-radius: 7px; - -gtk-outline-bottom-left-radius: 5px; } + messagedialog.csd .dialog-action-area button:first-child { + border-left-style: none; + border-bottom-left-radius: 7px; + -gtk-outline-bottom-left-radius: 5px; } + messagedialog.csd .dialog-action-area button:last-child { + border-bottom-right-radius: 7px; + -gtk-outline-bottom-right-radius: 5px; } filechooser .dialog-action-box { border-top: 1px solid #9d9d99; } |