From 03d4e270c294c2224cf05048caba99e744289bf1 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Fri, 16 Jan 2015 18:32:16 +0100 Subject: Adwaita: scrollbar style refactoring... ...making overlay indicator slider visible on any backgroung in the process. --- gtk/theme/Adwaita/_common.scss | 101 ++++++------ gtk/theme/Adwaita/gtk-contained-dark.css | 268 ++++++++++++++++++++----------- gtk/theme/Adwaita/gtk-contained.css | 268 ++++++++++++++++++++----------- 3 files changed, 410 insertions(+), 227 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 0d7513a583..71e01ca7b8 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1884,10 +1884,48 @@ column-header.button.dnd { // for treeview-like derive widgets -GtkRange-stepper-spacing: 0; -GtkRange-trough-under-steppers: 1; + $_slider_margin: 3px; + $_slider_fine_tune_margin: 4px; + .button { border: none; } + &.overlay-indicator { + &:not(.dragging):not(.hovering) { // Overlay scrolling indicator + opacity: 0.3; + + -GtkRange-slider-width: 5px; + + .slider { + margin: 0; + background-color: $fg_color; + border: 1px solid if($variant==light, white, black); + background-clip: padding-box; + } + + .trough { + border-style: none; + background-color: transparent; + } + + // w/o the following margin tweaks the slider shrinks when hovering/dragging + &.vertical .slider { + margin-top: $_slider_margin - 1px; + margin-bottom: $_slider_margin - 1px; + } + + &.horizontal .slider { + margin-left: $_slider_margin - 1px; + margin-right: $_slider_margin - 1px; + } + + } + + &.dragging, + &.hovering { opacity: 0.7; } + } + // trough coloring .trough { background-color: $scrollbar_bg_color; @@ -1901,10 +1939,7 @@ column-header.button.dnd { // for treeview-like derive widgets // slider coloring .slider { - border-color: transparent; - border-style: solid; background-color: mix($fg_color, $bg_color, 40%); - background-clip: padding-box; // needed since we use the borders as margins &:hover { background-color: mix($fg_color, $bg_color, 60%); } @@ -1917,56 +1952,32 @@ column-header.button.dnd { // for treeview-like derive widgets } } - &.overlay-indicator { // Overlay scrolling indicator - -GtkRange-slider-width: 8px; - - .slider { - background-color: transparentize($fg_color, 0.7); - border-width: 2px; - border-radius: 100px; - } - .trough { - border-color: transparent; - background-color: transparent; - } - - &.dragging, - &.hovering { - -GtkRange-slider-width: 13; - - .slider { border-width: 1px; } - - .trough { - border-color: transparentize($borders_color, 0.3); - background-color: transparentize($scrollbar_bg_color, 0.3); - } - - &.fine-tune { - - .slider { border-width: 3px; } - - .trough { background-color: if($variant=='light', darken($scrollbar_bg_color, 3%), lighten($scrollbar_bg_color, 3%)); } - } - } - } - - // borders and margins + // sizing .slider { - border-width: 3px; border-radius: 100px; + margin: $_slider_margin; } - &.fine-tune .slider { border-width: 4px; } + &.fine-tune .slider { margin: $_slider_fine_tune_margin; } &.vertical { .slider { - margin-left: 1px; + margin-left: 1px + $_slider_margin; + + &:dir(rtl) { + margin-left: $_slider_margin; + margin-right: 1px + $_slider_margin; + } + } + + &.fine-tune .slider { + margin-left: 1px + $_slider_fine_tune_margin; &:dir(rtl) { - margin-left: 0; - margin-right: 1px; + margin-left: $_slider_fine_tune_margin; + margin-right: 1px + $_slider_fine_tune_margin; } } @@ -1982,9 +1993,9 @@ column-header.button.dnd { // for treeview-like derive widgets &.horizontal { - .slider { - margin-top: 1px; - } + .slider { margin-top: 1px + $_slider_margin; } + + &.fine-tune .slider { margin-top: 1px + $_slider_fine_tune_margin; } .trough { border-top-style: solid; } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index d6b7febb0b..34c169a270 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -482,7 +482,8 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } - .button:backdrop:insensitive > .label, .button.flat:backdrop:insensitive > .label, .header-bar .titlebutton.button:backdrop:insensitive > .label, + .button:backdrop:insensitive > .label, .header-bar .button.titlebutton:backdrop:insensitive > .label, + .titlebar .button.titlebutton:backdrop:insensitive > .label, .button.flat:backdrop:insensitive > .label, .header-bar .titlebutton.button:backdrop:insensitive > .label, .titlebar .titlebutton.button:backdrop:insensitive > .label { color: inherit; } .button:backdrop:insensitive:active, .button:backdrop:insensitive:checked, .button.flat:backdrop:insensitive:active, .header-bar .titlebutton.button:backdrop:insensitive:active, @@ -492,7 +493,9 @@ GtkTextView { border-color: #1e2222; background-image: linear-gradient(to bottom, #262929); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } - .button:backdrop:insensitive:active > .label, .button:backdrop:insensitive:checked > .label, .button.flat:backdrop:insensitive:active > .label, .header-bar .titlebutton.button:backdrop:insensitive:active > .label, + .button:backdrop:insensitive:active > .label, .header-bar .button.titlebutton:backdrop:insensitive:active > .label, + .titlebar .button.titlebutton:backdrop:insensitive:active > .label, .button:backdrop:insensitive:checked > .label, .header-bar .button.titlebutton:backdrop:insensitive:checked > .label, + .titlebar .button.titlebutton:backdrop:insensitive:checked > .label, .button.flat:backdrop:insensitive:active > .label, .header-bar .titlebutton.button:backdrop:insensitive:active > .label, .titlebar .titlebutton.button:backdrop:insensitive:active > .label, .button.flat:backdrop:insensitive:checked > .label, .header-bar .titlebutton.button:backdrop:insensitive:checked > .label, .titlebar .titlebutton.button:backdrop:insensitive:checked > .label { color: inherit; } @@ -514,14 +517,17 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } - .button:insensitive > .label { + .button:insensitive > .label, .header-bar .button.titlebutton:insensitive > .label, + .titlebar .button.titlebutton:insensitive > .label { color: inherit; } .button:insensitive:active, .button:insensitive:checked { color: #939695; border-color: #1c1f1f; background-image: linear-gradient(to bottom, #2f3333, #323636); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } - .button:insensitive:active > .label, .button:insensitive:checked > .label { + .button:insensitive:active > .label, .header-bar .button.titlebutton:insensitive:active > .label, + .titlebar .button.titlebutton:insensitive:active > .label, .button:insensitive:checked > .label, .header-bar .button.titlebutton:insensitive:checked > .label, + .titlebar .button.titlebutton:insensitive:checked > .label { color: inherit; } .button.osd, .header-bar .osd.button.titlebutton, .titlebar .osd.button.titlebutton { @@ -763,7 +769,8 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } - .button.suggested-action:backdrop:insensitive > .label, .button.suggested-action.flat:backdrop:insensitive > .label, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive > .label, + .button.suggested-action:backdrop:insensitive > .label, .header-bar .suggested-action.button.titlebutton:backdrop:insensitive > .label, + .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > .label, .button.suggested-action.flat:backdrop:insensitive > .label, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive > .label, .titlebar .suggested-action.titlebutton.button:backdrop:insensitive > .label { color: inherit; } .button.suggested-action:backdrop:insensitive:active, .button.suggested-action:backdrop:insensitive:checked, .button.suggested-action.flat:backdrop:insensitive:active, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active, @@ -773,7 +780,9 @@ GtkTextView { border-color: #0b1e33; background-image: linear-gradient(to bottom, #1d4876); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } - .button.suggested-action:backdrop:insensitive:active > .label, .button.suggested-action:backdrop:insensitive:checked > .label, .button.suggested-action.flat:backdrop:insensitive:active > .label, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active > .label, + .button.suggested-action:backdrop:insensitive:active > .label, .header-bar .suggested-action.button.titlebutton:backdrop:insensitive:active > .label, + .titlebar .suggested-action.button.titlebutton:backdrop:insensitive:active > .label, .button.suggested-action:backdrop:insensitive:checked > .label, .header-bar .suggested-action.button.titlebutton:backdrop:insensitive:checked > .label, + .titlebar .suggested-action.button.titlebutton:backdrop:insensitive:checked > .label, .button.suggested-action.flat:backdrop:insensitive:active > .label, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active > .label, .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active > .label, .button.suggested-action.flat:backdrop:insensitive:checked > .label, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:checked > .label, .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:checked > .label { color: inherit; } @@ -795,14 +804,17 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } - .button.suggested-action:insensitive > .label { + .button.suggested-action:insensitive > .label, .header-bar .suggested-action.button.titlebutton:insensitive > .label, + .titlebar .suggested-action.button.titlebutton:insensitive > .label { color: inherit; } .button.suggested-action:insensitive:active, .button.suggested-action:insensitive:checked { color: #a4b5c8; border-color: #0b1e33; background-image: linear-gradient(to bottom, #1b436f, #1d4876); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } - .button.suggested-action:insensitive:active > .label, .button.suggested-action:insensitive:checked > .label { + .button.suggested-action:insensitive:active > .label, .header-bar .suggested-action.button.titlebutton:insensitive:active > .label, + .titlebar .suggested-action.button.titlebutton:insensitive:active > .label, .button.suggested-action:insensitive:checked > .label, .header-bar .suggested-action.button.titlebutton:insensitive:checked > .label, + .titlebar .suggested-action.button.titlebutton:insensitive:checked > .label { color: inherit; } .osd .button.suggested-action { color: #eeeeec; @@ -904,7 +916,8 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } - .button.destructive-action:backdrop:insensitive > .label, .button.destructive-action.flat:backdrop:insensitive > .label, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive > .label, + .button.destructive-action:backdrop:insensitive > .label, .header-bar .destructive-action.button.titlebutton:backdrop:insensitive > .label, + .titlebar .destructive-action.button.titlebutton:backdrop:insensitive > .label, .button.destructive-action.flat:backdrop:insensitive > .label, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive > .label, .titlebar .destructive-action.titlebutton.button:backdrop:insensitive > .label { color: inherit; } .button.destructive-action:backdrop:insensitive:active, .button.destructive-action:backdrop:insensitive:checked, .button.destructive-action.flat:backdrop:insensitive:active, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active, @@ -914,7 +927,9 @@ GtkTextView { border-color: #5e0707; background-image: linear-gradient(to bottom, #a41111); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } - .button.destructive-action:backdrop:insensitive:active > .label, .button.destructive-action:backdrop:insensitive:checked > .label, .button.destructive-action.flat:backdrop:insensitive:active > .label, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active > .label, + .button.destructive-action:backdrop:insensitive:active > .label, .header-bar .destructive-action.button.titlebutton:backdrop:insensitive:active > .label, + .titlebar .destructive-action.button.titlebutton:backdrop:insensitive:active > .label, .button.destructive-action:backdrop:insensitive:checked > .label, .header-bar .destructive-action.button.titlebutton:backdrop:insensitive:checked > .label, + .titlebar .destructive-action.button.titlebutton:backdrop:insensitive:checked > .label, .button.destructive-action.flat:backdrop:insensitive:active > .label, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active > .label, .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active > .label, .button.destructive-action.flat:backdrop:insensitive:checked > .label, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:checked > .label, .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:checked > .label { color: inherit; } @@ -936,14 +951,17 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } - .button.destructive-action:insensitive > .label { + .button.destructive-action:insensitive > .label, .header-bar .destructive-action.button.titlebutton:insensitive > .label, + .titlebar .destructive-action.button.titlebutton:insensitive > .label { color: inherit; } .button.destructive-action:insensitive:active, .button.destructive-action:insensitive:checked { color: #da9f9f; border-color: #5e0707; background-image: linear-gradient(to bottom, #9d1010, #a41111); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } - .button.destructive-action:insensitive:active > .label, .button.destructive-action:insensitive:checked > .label { + .button.destructive-action:insensitive:active > .label, .header-bar .destructive-action.button.titlebutton:insensitive:active > .label, + .titlebar .destructive-action.button.titlebutton:insensitive:active > .label, .button.destructive-action:insensitive:checked > .label, .header-bar .destructive-action.button.titlebutton:insensitive:checked > .label, + .titlebar .destructive-action.button.titlebutton:insensitive:checked > .label { color: inherit; } .osd .button.destructive-action { color: #eeeeec; @@ -1016,7 +1034,8 @@ GtkTextView { padding-right: 6px; padding-top: 3px; padding-bottom: 3px; } - .stack-switcher > .button.text-button { + .stack-switcher > .button.text-button, .header-bar .stack-switcher > .text-button.button.titlebutton, + .titlebar .stack-switcher > .text-button.button.titlebutton { padding: 5px 10px 6px; } .stack-switcher > .button.image-button, .header-bar .stack-switcher > .titlebutton.button, .titlebar .stack-switcher > .titlebutton.button { @@ -1055,7 +1074,8 @@ GtkTextView { text-shadow: 0 -1px rgba(0, 0, 0, 0.81176); icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); } - .inline-toolbar GtkToolButton > .button:hover { + .inline-toolbar GtkToolButton > .button:hover, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:hover, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1c1f1f; @@ -1063,7 +1083,9 @@ GtkTextView { text-shadow: 0 -1px rgba(0, 0, 0, 0.77976); icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976); box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); } - .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { + .inline-toolbar GtkToolButton > .button:active, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:active, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:active, .inline-toolbar GtkToolButton > .button:checked, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:checked, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1c1f1f; @@ -1071,7 +1093,8 @@ GtkTextView { text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); } - .inline-toolbar GtkToolButton > .button:insensitive { + .inline-toolbar GtkToolButton > .button:insensitive, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:insensitive, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive { color: #939695; border-color: #1c1f1f; background-image: linear-gradient(to bottom, #323636); @@ -1080,26 +1103,32 @@ GtkTextView { box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } .inline-toolbar GtkToolButton > .button:insensitive > .label { color: inherit; } - .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { + .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:insensitive:active, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:insensitive:checked, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:checked { color: #939695; border-color: #1c1f1f; background-image: linear-gradient(to bottom, #2f3333, #323636); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } .inline-toolbar GtkToolButton > .button:insensitive:active > .label, .inline-toolbar GtkToolButton > .button:insensitive:checked > .label { color: inherit; } - .inline-toolbar GtkToolButton > .button:backdrop { + .inline-toolbar GtkToolButton > .button:backdrop, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:backdrop, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop { color: #939695; border-color: #1e2222; background-image: linear-gradient(to bottom, #393f3f); text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } - .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar GtkToolButton > .button:backdrop:checked { + .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:backdrop:active, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:active, .inline-toolbar GtkToolButton > .button:backdrop:checked, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:backdrop:checked, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:checked { color: #939695; border-color: #1e2222; background-image: linear-gradient(to bottom, #2f3434); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } - .inline-toolbar GtkToolButton > .button:backdrop:insensitive { + .inline-toolbar GtkToolButton > .button:backdrop:insensitive, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:backdrop:insensitive, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive { color: #5d6767; border-color: #1e2222; background-image: linear-gradient(to bottom, #323636); @@ -1108,7 +1137,9 @@ GtkTextView { box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } .inline-toolbar GtkToolButton > .button:backdrop:insensitive > .label { color: inherit; } - .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked { + .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:backdrop:insensitive:active, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive:active, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:backdrop:insensitive:checked, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive:checked { color: #5d6767; border-color: #1e2222; background-image: linear-gradient(to bottom, #262929); @@ -1147,12 +1178,14 @@ GtkComboBox.combobox-entry .titlebar .button.titlebutton, .inline-toolbar .header-bar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, .inline-toolbar .titlebar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, - .titlebar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .osd .button:dir(rtl):backdrop, .osd .button.suggested-action:dir(rtl), .osd .button.destructive-action:dir(rtl), .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) { + .titlebar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .osd .button:dir(rtl):backdrop, .osd .button.suggested-action:dir(rtl), .osd .button.destructive-action:dir(rtl), .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), .header-bar .linked > .button.titlebutton:dir(rtl), + .titlebar .linked > .button.titlebutton:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) { border-radius: 0; border-right-style: none; border-left-style: solid; } -.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action:first-child, .inline-toolbar .button:first-child, .linked > .button:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > .button.titlebutton, +.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action:first-child, .inline-toolbar .button:first-child, .linked > .button:first-child, .header-bar .linked > .button.titlebutton:first-child, +.titlebar .linked > .button.titlebutton:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > .button.titlebutton, .inline-toolbar .titlebar GtkToolButton:first-child > .button.titlebutton, .titlebar .inline-toolbar GtkToolButton:first-child > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .button.flat, @@ -1165,7 +1198,8 @@ GtkComboBox.combobox-entry .titlebar .button.titlebutton, .titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > .button { border-radius: 3px 0 0 3px; border-left-style: solid; } -.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action:last-child, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton, +.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action:last-child, .inline-toolbar .button:last-child, .linked > .button:last-child, .header-bar .linked > .button.titlebutton:last-child, +.titlebar .linked > .button.titlebutton:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton, .inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton, .titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .button.flat, @@ -1177,7 +1211,8 @@ GtkComboBox.combobox-entry .titlebar .button.titlebutton, .inline-toolbar .titlebar GtkToolButton:backdrop:last-child > .button.titlebutton, .titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button { border-radius: 0 3px 3px 0; } - .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .osd .button:last-child:dir(rtl):backdrop, .osd .button.suggested-action:last-child:dir(rtl), .osd .button.destructive-action:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl), + .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .osd .button:last-child:dir(rtl):backdrop, .osd .button.suggested-action:last-child:dir(rtl), .osd .button.destructive-action:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .header-bar .linked > .button.titlebutton:last-child:dir(rtl), + .titlebar .linked > .button.titlebutton:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar .header-bar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, @@ -1192,7 +1227,8 @@ GtkComboBox.combobox-entry .titlebar .button.titlebutton, .inline-toolbar .titlebar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, .titlebar .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) { border-right-style: solid; } -.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action:only-child, .inline-toolbar .button:only-child, .linked > .button:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > .button.titlebutton, +.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action:only-child, .inline-toolbar .button:only-child, .linked > .button:only-child, .header-bar .linked > .button.titlebutton:only-child, +.titlebar .linked > .button.titlebutton:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > .button.titlebutton, .inline-toolbar .titlebar GtkToolButton:only-child > .button.titlebutton, .titlebar .inline-toolbar GtkToolButton:only-child > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .button.flat, @@ -1206,20 +1242,24 @@ GtkComboBox.combobox-entry .titlebar .button.titlebutton, border-radius: 3px; border-style: solid; } -.linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .entry:insensitive:backdrop, .linked.vertical > .entry:backdrop, .linked.vertical > .button, .linked.vertical > .button:hover, .linked.vertical > .button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > GtkComboBoxText > .button, +.linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .entry:insensitive:backdrop, .linked.vertical > .entry:backdrop, .linked.vertical > .button, .header-bar .linked.vertical > .button.titlebutton, +.titlebar .linked.vertical > .button.titlebutton, .linked.vertical > .button:hover, .linked.vertical > .button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > GtkComboBoxText > .button, .linked.vertical > GtkComboBox > .button { border-left-style: solid; border-top-style: none; border-radius: 0; } -.linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, +.linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .header-bar .linked.vertical > .button.titlebutton:first-child, +.titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, .linked.vertical > GtkComboBox:first-child > .button { border-style: solid; border-radius: 3px 3px 0 0; } -.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, +.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .header-bar .linked.vertical > .button.titlebutton:last-child, +.titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, .linked.vertical > GtkComboBox:last-child > .button { border-radius: 0 0 3px 3px; } -.linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, +.linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .header-bar .linked.vertical > .button.titlebutton:only-child, +.titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, .linked.vertical > GtkComboBox:only-child > .button { border-radius: 3px; border-style: solid; } @@ -1430,7 +1470,9 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton, text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .spinbutton.vertical .button:first-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive > .label { + .spinbutton.vertical .button:first-child:insensitive > .label, .spinbutton.vertical .header-bar .button.titlebutton:first-child:insensitive > .label, + .spinbutton.vertical .titlebar .button.titlebutton:first-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .header-bar .button.titlebutton:first-child:insensitive > .label, + .spinbutton.vertical:dir(rtl) .titlebar .button.titlebutton:first-child:insensitive > .label { color: inherit; } .spinbutton.vertical .button:first-child:backdrop, .spinbutton.vertical:dir(rtl) .button:first-child:backdrop { color: #939695; @@ -1470,7 +1512,9 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton, text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } - .spinbutton.vertical .button:last-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive > .label { + .spinbutton.vertical .button:last-child:insensitive > .label, .spinbutton.vertical .header-bar .button.titlebutton:last-child:insensitive > .label, + .spinbutton.vertical .titlebar .button.titlebutton:last-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .header-bar .button.titlebutton:last-child:insensitive > .label, + .spinbutton.vertical:dir(rtl) .titlebar .button.titlebutton:last-child:insensitive > .label { color: inherit; } .spinbutton.vertical .button:last-child:backdrop, .spinbutton.vertical:dir(rtl) .button:last-child:backdrop { color: #939695; @@ -1486,7 +1530,9 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton, text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } - .spinbutton.vertical .button:backdrop:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:backdrop:insensitive > .label { + .spinbutton.vertical .button:backdrop:insensitive > .label, .spinbutton.vertical .header-bar .button.titlebutton:backdrop:insensitive > .label, + .spinbutton.vertical .titlebar .button.titlebutton:backdrop:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:backdrop:insensitive > .label, .spinbutton.vertical:dir(rtl) .header-bar .button.titlebutton:backdrop:insensitive > .label, + .spinbutton.vertical:dir(rtl) .titlebar .button.titlebutton:backdrop:insensitive > .label { color: inherit; } .spinbutton.vertical.entry, .spinbutton.vertical:dir(rtl).entry { border-radius: 0; @@ -1693,11 +1739,13 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0); border-color: #0f2b48; } - .titlebar.selection-mode .button:backdrop:insensitive > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive > .label, + .titlebar.selection-mode .button:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar .button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar .titlebutton.button:backdrop:insensitive > .label, .titlebar.selection-mode .titlebutton.button:backdrop:insensitive > .label, .header-bar.selection-mode .button:backdrop:insensitive > .label, + .header-bar.selection-mode .titlebar .button.titlebutton:backdrop:insensitive > .label, .header-bar.selection-mode .button.flat:backdrop:insensitive > .label, - .header-bar.selection-mode .titlebutton.button:backdrop:insensitive > .label { + .header-bar.selection-mode .titlebutton.button:backdrop:insensitive > .label, + .header-bar.selection-mode .titlebar .titlebutton.button:backdrop:insensitive > .label { color: inherit; } .titlebar.selection-mode .button:backdrop:insensitive:active, .titlebar.selection-mode .button:backdrop:insensitive:checked, .titlebar.selection-mode .button.flat:backdrop:insensitive:active, .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active, .titlebar.selection-mode .button.flat:backdrop:insensitive:checked, @@ -1713,15 +1761,19 @@ GtkComboBox { background-image: linear-gradient(to bottom, #1d4876); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0); border-color: #0f2b48; } - .titlebar.selection-mode .button:backdrop:insensitive:active > .label, .titlebar.selection-mode .button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive:active > .label, - .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive:checked > .label, + .titlebar.selection-mode .button:backdrop:insensitive:active > .label, .titlebar.selection-mode .header-bar .button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode .button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar .button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode .header-bar .titlebutton.button:backdrop:insensitive:active > .label, + .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar .titlebutton.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label, .header-bar.selection-mode .button:backdrop:insensitive:active > .label, + .header-bar.selection-mode .titlebar .button.titlebutton:backdrop:insensitive:active > .label, .header-bar.selection-mode .button:backdrop:insensitive:checked > .label, + .header-bar.selection-mode .titlebar .button.titlebutton:backdrop:insensitive:checked > .label, .header-bar.selection-mode .button.flat:backdrop:insensitive:active > .label, .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label, + .header-bar.selection-mode .titlebar .titlebutton.button:backdrop:insensitive:active > .label, .header-bar.selection-mode .button.flat:backdrop:insensitive:checked > .label, - .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label { + .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label, + .header-bar.selection-mode .titlebar .titlebutton.button:backdrop:insensitive:checked > .label { color: inherit; } .titlebar.selection-mode .button.flat:backdrop, .titlebar.selection-mode .titlebutton.button:backdrop, .titlebar.selection-mode .button.flat:insensitive, @@ -1747,8 +1799,9 @@ GtkComboBox { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0.55); } - .titlebar.selection-mode .button:insensitive > .label, - .header-bar.selection-mode .button:insensitive > .label { + .titlebar.selection-mode .button:insensitive > .label, .titlebar.selection-mode .header-bar .button.titlebutton:insensitive > .label, + .header-bar.selection-mode .button:insensitive > .label, + .header-bar.selection-mode .titlebar .button.titlebutton:insensitive > .label { color: inherit; } .titlebar.selection-mode .button:insensitive:active, .titlebar.selection-mode .button:insensitive:checked, .header-bar.selection-mode .button:insensitive:active, @@ -1757,9 +1810,11 @@ GtkComboBox { border-color: #0b1e33; background-image: linear-gradient(to bottom, #1b436f, #1d4876); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0.55); } - .titlebar.selection-mode .button:insensitive:active > .label, .titlebar.selection-mode .button:insensitive:checked > .label, + .titlebar.selection-mode .button:insensitive:active > .label, .titlebar.selection-mode .header-bar .button.titlebutton:insensitive:active > .label, .titlebar.selection-mode .button:insensitive:checked > .label, .titlebar.selection-mode .header-bar .button.titlebutton:insensitive:checked > .label, .header-bar.selection-mode .button:insensitive:active > .label, - .header-bar.selection-mode .button:insensitive:checked > .label { + .header-bar.selection-mode .titlebar .button.titlebutton:insensitive:active > .label, + .header-bar.selection-mode .button:insensitive:checked > .label, + .header-bar.selection-mode .titlebar .button.titlebutton:insensitive:checked > .label { color: inherit; } .titlebar.selection-mode .button.suggested-action, .header-bar.selection-mode .button.suggested-action { @@ -1800,8 +1855,9 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0.55); border-color: #0f2b48; } - .titlebar.selection-mode .button.suggested-action:insensitive > .label, - .header-bar.selection-mode .button.suggested-action:insensitive > .label { + .titlebar.selection-mode .button.suggested-action:insensitive > .label, .titlebar.selection-mode .header-bar .suggested-action.button.titlebutton:insensitive > .label, + .header-bar.selection-mode .button.suggested-action:insensitive > .label, + .header-bar.selection-mode .titlebar .suggested-action.button.titlebutton:insensitive > .label { color: inherit; } .titlebar.selection-mode .button.suggested-action:backdrop, .header-bar.selection-mode .button.suggested-action:backdrop { @@ -1821,8 +1877,9 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0); border-color: #0f2b48; } - .titlebar.selection-mode .button.suggested-action:backdrop:insensitive > .label, - .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > .label { + .titlebar.selection-mode .button.suggested-action:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar .suggested-action.button.titlebutton:backdrop:insensitive > .label, + .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > .label, + .header-bar.selection-mode .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > .label { color: inherit; } .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop, .header-bar.selection-mode .selection-menu, @@ -2387,6 +2444,25 @@ column-header .titlebar .button.titlebutton, .scrollbar .titlebar .button.titlebutton, .titlebar .scrollbar .button.titlebutton { border: none; } + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) { + opacity: 0.3; + -GtkRange-slider-width: 5px; } + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { + margin: 0; + background-color: #eeeeec; + border: 1px solid black; + background-clip: padding-box; } + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .trough { + border-style: none; + background-color: transparent; } + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical .slider { + margin-top: 2px; + margin-bottom: 2px; } + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal .slider { + margin-left: 2px; + margin-right: 2px; } + .scrollbar.overlay-indicator.dragging, .scrollbar.overlay-indicator.hovering { + opacity: 0.7; } .scrollbar .trough { background-color: #282c2c; border: 1px none #1c1f1f; } @@ -2394,10 +2470,7 @@ column-header .titlebar .button.titlebutton, background-color: #323737; border-color: #1e2222; } .scrollbar .slider { - border-color: transparent; - border-style: solid; - background-color: #818584; - background-clip: padding-box; } + background-color: #818584; } .scrollbar .slider:hover { background-color: #a5a8a6; } .scrollbar .slider:prelight:active { @@ -2406,43 +2479,30 @@ column-header .titlebar .button.titlebutton, background-color: #5d6161; } .scrollbar .slider:insensitive { background-color: transparent; } - .scrollbar.overlay-indicator { - -GtkRange-slider-width: 8px; } - .scrollbar.overlay-indicator .slider { - background-color: rgba(238, 238, 236, 0.3); - border-width: 2px; - border-radius: 100px; } - .scrollbar.overlay-indicator .trough { - border-color: transparent; - background-color: transparent; } - .scrollbar.overlay-indicator.dragging, .scrollbar.overlay-indicator.hovering { - -GtkRange-slider-width: 13; } - .scrollbar.overlay-indicator.dragging .slider, .scrollbar.overlay-indicator.hovering .slider { - border-width: 1px; } - .scrollbar.overlay-indicator.dragging .trough, .scrollbar.overlay-indicator.hovering .trough { - border-color: rgba(28, 31, 31, 0.7); - background-color: rgba(40, 44, 44, 0.7); } - .scrollbar.overlay-indicator.dragging.fine-tune .slider, .scrollbar.overlay-indicator.hovering.fine-tune .slider { - border-width: 3px; } - .scrollbar.overlay-indicator.dragging.fine-tune .trough, .scrollbar.overlay-indicator.hovering.fine-tune .trough { - background-color: #2f3434; } .scrollbar .slider { - border-width: 3px; - border-radius: 100px; } + border-radius: 100px; + margin: 3px; } .scrollbar.fine-tune .slider { - border-width: 4px; } + margin: 4px; } .scrollbar.vertical .slider { - margin-left: 1px; } + margin-left: 4px; } .scrollbar.vertical .slider:dir(rtl) { - margin-left: 0; - margin-right: 1px; } + margin-left: 3px; + margin-right: 4px; } + .scrollbar.vertical.fine-tune .slider { + margin-left: 5px; } + .scrollbar.vertical.fine-tune .slider:dir(rtl) { + margin-left: 4px; + margin-right: 5px; } .scrollbar.vertical .trough { border-left-style: solid; } .scrollbar.vertical .trough:dir(rtl) { border-left-style: none; border-right-style: solid; } .scrollbar.horizontal .slider { - margin-top: 1px; } + margin-top: 4px; } + .scrollbar.horizontal.fine-tune .slider { + margin-top: 5px; } .scrollbar.horizontal .trough { border-top-style: solid; } @@ -3558,7 +3618,8 @@ GtkPlacesSidebar.sidebar .view .separator:backdrop { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .list-row:selected .button:backdrop:insensitive > .label, .list-row:selected .button.flat:backdrop:insensitive > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive > .label, + .list-row:selected .button:backdrop:insensitive > .label, .list-row:selected .header-bar .button.titlebutton:backdrop:insensitive > .label, + .list-row:selected .titlebar .button.titlebutton:backdrop:insensitive > .label, .list-row:selected .button.flat:backdrop:insensitive > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive > .label, .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive > .label, .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive > .label { color: inherit; } @@ -3571,7 +3632,9 @@ GtkPlacesSidebar.sidebar .view .separator:backdrop { border-color: #1e2222; background-image: linear-gradient(to bottom, #262929); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .list-row:selected .button:backdrop:insensitive:active > .label, .list-row:selected .button:backdrop:insensitive:checked > .label, .list-row:selected .button.flat:backdrop:insensitive:active > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label, + .list-row:selected .button:backdrop:insensitive:active > .label, .list-row:selected .header-bar .button.titlebutton:backdrop:insensitive:active > .label, + .list-row:selected .titlebar .button.titlebutton:backdrop:insensitive:active > .label, .list-row:selected .button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar .button.titlebutton:backdrop:insensitive:checked > .label, + .list-row:selected .titlebar .button.titlebutton:backdrop:insensitive:checked > .label, .list-row:selected .button.flat:backdrop:insensitive:active > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label, .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:active > .label, .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label, .list-row:selected .button.flat:backdrop:insensitive:checked > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .label, .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked > .label, @@ -3594,14 +3657,17 @@ GtkPlacesSidebar.sidebar .view .separator:backdrop { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .list-row:selected .button:insensitive > .label { + .list-row:selected .button:insensitive > .label, .list-row:selected .header-bar .button.titlebutton:insensitive > .label, + .list-row:selected .titlebar .button.titlebutton:insensitive > .label { color: inherit; } .list-row:selected .button:insensitive:active, .list-row:selected .button:insensitive:checked { color: #939695; border-color: #1c1f1f; background-image: linear-gradient(to bottom, #2f3333, #323636); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .list-row:selected .button:insensitive:active > .label, .list-row:selected .button:insensitive:checked > .label { + .list-row:selected .button:insensitive:active > .label, .list-row:selected .header-bar .button.titlebutton:insensitive:active > .label, + .list-row:selected .titlebar .button.titlebutton:insensitive:active > .label, .list-row:selected .button:insensitive:checked > .label, .list-row:selected .header-bar .button.titlebutton:insensitive:checked > .label, + .list-row:selected .titlebar .button.titlebutton:insensitive:checked > .label { color: inherit; } .list-row, list-row.button, .header-bar list-row.button.titlebutton, @@ -3775,7 +3841,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .message-dialog.csd .dialog-action-area .button:insensitive > .label { + .message-dialog.csd .dialog-action-area .button:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .button.titlebutton:insensitive > .label, + .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:insensitive > .label { color: inherit; } .message-dialog.csd .dialog-action-area .button:backdrop { color: #939695; @@ -3791,7 +3858,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > .label { + .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .button.titlebutton:backdrop:insensitive > .label, + .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:backdrop:insensitive > .label { color: inherit; } .message-dialog.csd .dialog-action-area .button.suggested-action { color: white; @@ -3831,7 +3899,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > .label { + .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .suggested-action.button.titlebutton:backdrop:insensitive > .label, + .message-dialog.csd .dialog-action-area .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > .label { color: inherit; } .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive { color: #939695; @@ -3840,7 +3909,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > .label { + .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .suggested-action.button.titlebutton:insensitive > .label, + .message-dialog.csd .dialog-action-area .titlebar .suggested-action.button.titlebutton:insensitive > .label { color: inherit; } .message-dialog.csd .dialog-action-area .button.destructive-action { color: white; @@ -3880,7 +3950,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > .label { + .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .destructive-action.button.titlebutton:backdrop:insensitive > .label, + .message-dialog.csd .dialog-action-area .titlebar .destructive-action.button.titlebutton:backdrop:insensitive > .label { color: inherit; } .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive { color: #939695; @@ -3889,7 +3960,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > .label { + .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .destructive-action.button.titlebutton:insensitive > .label, + .message-dialog.csd .dialog-action-area .titlebar .destructive-action.button.titlebutton:insensitive > .label { color: inherit; } .message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:hover, .message-dialog.csd .dialog-action-area .button:active, .message-dialog.csd .dialog-action-area .button:insensitive, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd .dialog-action-area .button:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action, .message-dialog.csd .dialog-action-area .button.suggested-action:hover, .message-dialog.csd .dialog-action-area .button.suggested-action:active, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action, .message-dialog.csd .dialog-action-area .button.destructive-action:hover, .message-dialog.csd .dialog-action-area .button.destructive-action:active, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive { border-left-style: solid; @@ -4043,10 +4115,17 @@ GtkInfoBar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .info .button:insensitive > .label, + .info .button:insensitive > .label, .info .header-bar .button.titlebutton:insensitive > .label, + .info .titlebar .button.titlebutton:insensitive > .label, .question .button:insensitive > .label, + .question .header-bar .button.titlebutton:insensitive > .label, + .question .titlebar .button.titlebutton:insensitive > .label, .warning .button:insensitive > .label, - .error .button:insensitive > .label { + .warning .header-bar .button.titlebutton:insensitive > .label, + .warning .titlebar .button.titlebutton:insensitive > .label, + .error .button:insensitive > .label, + .error .header-bar .button.titlebutton:insensitive > .label, + .error .titlebar .button.titlebutton:insensitive > .label { color: inherit; } .info .button:backdrop, .question .button:backdrop, @@ -4070,10 +4149,17 @@ GtkInfoBar { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #0b1e33; } - .info .button:backdrop:insensitive > .label, + .info .button:backdrop:insensitive > .label, .info .header-bar .button.titlebutton:backdrop:insensitive > .label, + .info .titlebar .button.titlebutton:backdrop:insensitive > .label, .question .button:backdrop:insensitive > .label, + .question .header-bar .button.titlebutton:backdrop:insensitive > .label, + .question .titlebar .button.titlebutton:backdrop:insensitive > .label, .warning .button:backdrop:insensitive > .label, - .error .button:backdrop:insensitive > .label { + .warning .header-bar .button.titlebutton:backdrop:insensitive > .label, + .warning .titlebar .button.titlebutton:backdrop:insensitive > .label, + .error .button:backdrop:insensitive > .label, + .error .header-bar .button.titlebutton:backdrop:insensitive > .label, + .error .titlebar .button.titlebutton:backdrop:insensitive > .label { color: inherit; } /************ diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 8056131749..edf18329d6 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -482,7 +482,8 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .button:backdrop:insensitive > .label, .button.flat:backdrop:insensitive > .label, .header-bar .titlebutton.button:backdrop:insensitive > .label, + .button:backdrop:insensitive > .label, .header-bar .button.titlebutton:backdrop:insensitive > .label, + .titlebar .button.titlebutton:backdrop:insensitive > .label, .button.flat:backdrop:insensitive > .label, .header-bar .titlebutton.button:backdrop:insensitive > .label, .titlebar .titlebutton.button:backdrop:insensitive > .label { color: inherit; } .button:backdrop:insensitive:active, .button:backdrop:insensitive:checked, .button.flat:backdrop:insensitive:active, .header-bar .titlebutton.button:backdrop:insensitive:active, @@ -492,7 +493,9 @@ GtkTextView { border-color: #a8a8a8; background-image: linear-gradient(to bottom, #e7e7e7); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .button:backdrop:insensitive:active > .label, .button:backdrop:insensitive:checked > .label, .button.flat:backdrop:insensitive:active > .label, .header-bar .titlebutton.button:backdrop:insensitive:active > .label, + .button:backdrop:insensitive:active > .label, .header-bar .button.titlebutton:backdrop:insensitive:active > .label, + .titlebar .button.titlebutton:backdrop:insensitive:active > .label, .button:backdrop:insensitive:checked > .label, .header-bar .button.titlebutton:backdrop:insensitive:checked > .label, + .titlebar .button.titlebutton:backdrop:insensitive:checked > .label, .button.flat:backdrop:insensitive:active > .label, .header-bar .titlebutton.button:backdrop:insensitive:active > .label, .titlebar .titlebutton.button:backdrop:insensitive:active > .label, .button.flat:backdrop:insensitive:checked > .label, .header-bar .titlebutton.button:backdrop:insensitive:checked > .label, .titlebar .titlebutton.button:backdrop:insensitive:checked > .label { color: inherit; } @@ -514,14 +517,17 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } - .button:insensitive > .label { + .button:insensitive > .label, .header-bar .button.titlebutton:insensitive > .label, + .titlebar .button.titlebutton:insensitive > .label { color: inherit; } .button:insensitive:active, .button:insensitive:checked { color: #8d9091; border-color: #a1a1a1; background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } - .button:insensitive:active > .label, .button:insensitive:checked > .label { + .button:insensitive:active > .label, .header-bar .button.titlebutton:insensitive:active > .label, + .titlebar .button.titlebutton:insensitive:active > .label, .button:insensitive:checked > .label, .header-bar .button.titlebutton:insensitive:checked > .label, + .titlebar .button.titlebutton:insensitive:checked > .label { color: inherit; } .button.osd, .header-bar .osd.button.titlebutton, .titlebar .osd.button.titlebutton { @@ -763,7 +769,8 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .button.suggested-action:backdrop:insensitive > .label, .button.suggested-action.flat:backdrop:insensitive > .label, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive > .label, + .button.suggested-action:backdrop:insensitive > .label, .header-bar .suggested-action.button.titlebutton:backdrop:insensitive > .label, + .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > .label, .button.suggested-action.flat:backdrop:insensitive > .label, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive > .label, .titlebar .suggested-action.titlebutton.button:backdrop:insensitive > .label { color: inherit; } .button.suggested-action:backdrop:insensitive:active, .button.suggested-action:backdrop:insensitive:checked, .button.suggested-action.flat:backdrop:insensitive:active, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active, @@ -773,7 +780,9 @@ GtkTextView { border-color: #5093da; background-image: linear-gradient(to bottom, #5093da); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .button.suggested-action:backdrop:insensitive:active > .label, .button.suggested-action:backdrop:insensitive:checked > .label, .button.suggested-action.flat:backdrop:insensitive:active > .label, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active > .label, + .button.suggested-action:backdrop:insensitive:active > .label, .header-bar .suggested-action.button.titlebutton:backdrop:insensitive:active > .label, + .titlebar .suggested-action.button.titlebutton:backdrop:insensitive:active > .label, .button.suggested-action:backdrop:insensitive:checked > .label, .header-bar .suggested-action.button.titlebutton:backdrop:insensitive:checked > .label, + .titlebar .suggested-action.button.titlebutton:backdrop:insensitive:checked > .label, .button.suggested-action.flat:backdrop:insensitive:active > .label, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active > .label, .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active > .label, .button.suggested-action.flat:backdrop:insensitive:checked > .label, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:checked > .label, .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:checked > .label { color: inherit; } @@ -795,14 +804,17 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } - .button.suggested-action:insensitive > .label { + .button.suggested-action:insensitive > .label, .header-bar .suggested-action.button.titlebutton:insensitive > .label, + .titlebar .suggested-action.button.titlebutton:insensitive > .label { color: inherit; } .button.suggested-action:insensitive:active, .button.suggested-action:insensitive:checked { color: #b9d3f0; border-color: #1c5187; background-image: linear-gradient(to bottom, #4a8cd1, #5093da); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } - .button.suggested-action:insensitive:active > .label, .button.suggested-action:insensitive:checked > .label { + .button.suggested-action:insensitive:active > .label, .header-bar .suggested-action.button.titlebutton:insensitive:active > .label, + .titlebar .suggested-action.button.titlebutton:insensitive:active > .label, .button.suggested-action:insensitive:checked > .label, .header-bar .suggested-action.button.titlebutton:insensitive:checked > .label, + .titlebar .suggested-action.button.titlebutton:insensitive:checked > .label { color: inherit; } .osd .button.suggested-action { color: #eeeeec; @@ -904,7 +916,8 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .button.destructive-action:backdrop:insensitive > .label, .button.destructive-action.flat:backdrop:insensitive > .label, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive > .label, + .button.destructive-action:backdrop:insensitive > .label, .header-bar .destructive-action.button.titlebutton:backdrop:insensitive > .label, + .titlebar .destructive-action.button.titlebutton:backdrop:insensitive > .label, .button.destructive-action.flat:backdrop:insensitive > .label, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive > .label, .titlebar .destructive-action.titlebutton.button:backdrop:insensitive > .label { color: inherit; } .button.destructive-action:backdrop:insensitive:active, .button.destructive-action:backdrop:insensitive:checked, .button.destructive-action.flat:backdrop:insensitive:active, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active, @@ -914,7 +927,9 @@ GtkTextView { border-color: #ef3131; background-image: linear-gradient(to bottom, #ef3131); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .button.destructive-action:backdrop:insensitive:active > .label, .button.destructive-action:backdrop:insensitive:checked > .label, .button.destructive-action.flat:backdrop:insensitive:active > .label, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active > .label, + .button.destructive-action:backdrop:insensitive:active > .label, .header-bar .destructive-action.button.titlebutton:backdrop:insensitive:active > .label, + .titlebar .destructive-action.button.titlebutton:backdrop:insensitive:active > .label, .button.destructive-action:backdrop:insensitive:checked > .label, .header-bar .destructive-action.button.titlebutton:backdrop:insensitive:checked > .label, + .titlebar .destructive-action.button.titlebutton:backdrop:insensitive:checked > .label, .button.destructive-action.flat:backdrop:insensitive:active > .label, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active > .label, .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active > .label, .button.destructive-action.flat:backdrop:insensitive:checked > .label, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:checked > .label, .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:checked > .label { color: inherit; } @@ -936,14 +951,17 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } - .button.destructive-action:insensitive > .label { + .button.destructive-action:insensitive > .label, .header-bar .destructive-action.button.titlebutton:insensitive > .label, + .titlebar .destructive-action.button.titlebutton:insensitive > .label { color: inherit; } .button.destructive-action:insensitive:active, .button.destructive-action:insensitive:checked { color: #f8acac; border-color: #8e0b0b; background-image: linear-gradient(to bottom, #e52d2d, #ef3131); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } - .button.destructive-action:insensitive:active > .label, .button.destructive-action:insensitive:checked > .label { + .button.destructive-action:insensitive:active > .label, .header-bar .destructive-action.button.titlebutton:insensitive:active > .label, + .titlebar .destructive-action.button.titlebutton:insensitive:active > .label, .button.destructive-action:insensitive:checked > .label, .header-bar .destructive-action.button.titlebutton:insensitive:checked > .label, + .titlebar .destructive-action.button.titlebutton:insensitive:checked > .label { color: inherit; } .osd .button.destructive-action { color: #eeeeec; @@ -1016,7 +1034,8 @@ GtkTextView { padding-right: 6px; padding-top: 3px; padding-bottom: 3px; } - .stack-switcher > .button.text-button { + .stack-switcher > .button.text-button, .header-bar .stack-switcher > .text-button.button.titlebutton, + .titlebar .stack-switcher > .text-button.button.titlebutton { padding: 5px 10px 6px; } .stack-switcher > .button.image-button, .header-bar .stack-switcher > .titlebutton.button, .titlebar .stack-switcher > .titlebutton.button { @@ -1055,7 +1074,8 @@ GtkTextView { text-shadow: 0 1px rgba(255, 255, 255, 0.76923); icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); box-shadow: inset 0 1px white, 0 1px white; } - .inline-toolbar GtkToolButton > .button:hover { + .inline-toolbar GtkToolButton > .button:hover, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:hover, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #a1a1a1; @@ -1063,7 +1083,9 @@ GtkTextView { text-shadow: 0 1px rgba(255, 255, 255, 0.76923); icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); box-shadow: inset 0 1px white, 0 1px white; } - .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { + .inline-toolbar GtkToolButton > .button:active, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:active, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:active, .inline-toolbar GtkToolButton > .button:checked, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:checked, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:checked { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #a1a1a1; @@ -1071,7 +1093,8 @@ GtkTextView { text-shadow: 0 1px rgba(255, 255, 255, 0.76923); icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; } - .inline-toolbar GtkToolButton > .button:insensitive { + .inline-toolbar GtkToolButton > .button:insensitive, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:insensitive, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive { color: #8d9091; border-color: #a1a1a1; background-image: linear-gradient(to bottom, #f4f4f4); @@ -1080,26 +1103,32 @@ GtkTextView { box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } .inline-toolbar GtkToolButton > .button:insensitive > .label { color: inherit; } - .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { + .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:insensitive:active, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:insensitive:checked, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:checked { color: #8d9091; border-color: #a1a1a1; background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } .inline-toolbar GtkToolButton > .button:insensitive:active > .label, .inline-toolbar GtkToolButton > .button:insensitive:checked > .label { color: inherit; } - .inline-toolbar GtkToolButton > .button:backdrop { + .inline-toolbar GtkToolButton > .button:backdrop, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:backdrop, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop { color: #8d9091; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #ededed); text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar GtkToolButton > .button:backdrop:checked { + .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:backdrop:active, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:active, .inline-toolbar GtkToolButton > .button:backdrop:checked, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:backdrop:checked, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:checked { color: #8d9091; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #d4d4d4); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .inline-toolbar GtkToolButton > .button:backdrop:insensitive { + .inline-toolbar GtkToolButton > .button:backdrop:insensitive, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:backdrop:insensitive, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive { color: #c7c7c7; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #f4f4f4); @@ -1108,7 +1137,9 @@ GtkTextView { box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } .inline-toolbar GtkToolButton > .button:backdrop:insensitive > .label { color: inherit; } - .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked { + .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:backdrop:insensitive:active, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive:active, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:backdrop:insensitive:checked, + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive:checked { color: #c7c7c7; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #e7e7e7); @@ -1147,12 +1178,14 @@ GtkComboBox.combobox-entry .titlebar .button.titlebutton, .inline-toolbar .header-bar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, .inline-toolbar .titlebar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, - .titlebar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .osd .button:dir(rtl):backdrop, .osd .button.suggested-action:dir(rtl), .osd .button.destructive-action:dir(rtl), .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) { + .titlebar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .osd .button:dir(rtl):backdrop, .osd .button.suggested-action:dir(rtl), .osd .button.destructive-action:dir(rtl), .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), .header-bar .linked > .button.titlebutton:dir(rtl), + .titlebar .linked > .button.titlebutton:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) { border-radius: 0; border-right-style: none; border-left-style: solid; } -.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action:first-child, .inline-toolbar .button:first-child, .linked > .button:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > .button.titlebutton, +.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action:first-child, .inline-toolbar .button:first-child, .linked > .button:first-child, .header-bar .linked > .button.titlebutton:first-child, +.titlebar .linked > .button.titlebutton:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > .button.titlebutton, .inline-toolbar .titlebar GtkToolButton:first-child > .button.titlebutton, .titlebar .inline-toolbar GtkToolButton:first-child > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .button.flat, @@ -1165,7 +1198,8 @@ GtkComboBox.combobox-entry .titlebar .button.titlebutton, .titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > .button { border-radius: 3px 0 0 3px; border-left-style: solid; } -.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action:last-child, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton, +.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action:last-child, .inline-toolbar .button:last-child, .linked > .button:last-child, .header-bar .linked > .button.titlebutton:last-child, +.titlebar .linked > .button.titlebutton:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton, .inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton, .titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .button.flat, @@ -1177,7 +1211,8 @@ GtkComboBox.combobox-entry .titlebar .button.titlebutton, .inline-toolbar .titlebar GtkToolButton:backdrop:last-child > .button.titlebutton, .titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button { border-radius: 0 3px 3px 0; } - .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .osd .button:last-child:dir(rtl):backdrop, .osd .button.suggested-action:last-child:dir(rtl), .osd .button.destructive-action:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl), + .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .osd .button:last-child:dir(rtl):backdrop, .osd .button.suggested-action:last-child:dir(rtl), .osd .button.destructive-action:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .header-bar .linked > .button.titlebutton:last-child:dir(rtl), + .titlebar .linked > .button.titlebutton:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar .header-bar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, @@ -1192,7 +1227,8 @@ GtkComboBox.combobox-entry .titlebar .button.titlebutton, .inline-toolbar .titlebar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, .titlebar .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) { border-right-style: solid; } -.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action:only-child, .inline-toolbar .button:only-child, .linked > .button:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > .button.titlebutton, +.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action:only-child, .inline-toolbar .button:only-child, .linked > .button:only-child, .header-bar .linked > .button.titlebutton:only-child, +.titlebar .linked > .button.titlebutton:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > .button.titlebutton, .inline-toolbar .titlebar GtkToolButton:only-child > .button.titlebutton, .titlebar .inline-toolbar GtkToolButton:only-child > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .button.flat, @@ -1206,20 +1242,24 @@ GtkComboBox.combobox-entry .titlebar .button.titlebutton, border-radius: 3px; border-style: solid; } -.linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .entry:insensitive:backdrop, .linked.vertical > .entry:backdrop, .linked.vertical > .button, .linked.vertical > .button:hover, .linked.vertical > .button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > GtkComboBoxText > .button, +.linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .entry:insensitive:backdrop, .linked.vertical > .entry:backdrop, .linked.vertical > .button, .header-bar .linked.vertical > .button.titlebutton, +.titlebar .linked.vertical > .button.titlebutton, .linked.vertical > .button:hover, .linked.vertical > .button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > GtkComboBoxText > .button, .linked.vertical > GtkComboBox > .button { border-left-style: solid; border-top-style: none; border-radius: 0; } -.linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, +.linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .header-bar .linked.vertical > .button.titlebutton:first-child, +.titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, .linked.vertical > GtkComboBox:first-child > .button { border-style: solid; border-radius: 3px 3px 0 0; } -.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, +.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .header-bar .linked.vertical > .button.titlebutton:last-child, +.titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, .linked.vertical > GtkComboBox:last-child > .button { border-radius: 0 0 3px 3px; } -.linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, +.linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .header-bar .linked.vertical > .button.titlebutton:only-child, +.titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, .linked.vertical > GtkComboBox:only-child > .button { border-radius: 3px; border-style: solid; } @@ -1430,7 +1470,9 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton, text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .spinbutton.vertical .button:first-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive > .label { + .spinbutton.vertical .button:first-child:insensitive > .label, .spinbutton.vertical .header-bar .button.titlebutton:first-child:insensitive > .label, + .spinbutton.vertical .titlebar .button.titlebutton:first-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .header-bar .button.titlebutton:first-child:insensitive > .label, + .spinbutton.vertical:dir(rtl) .titlebar .button.titlebutton:first-child:insensitive > .label { color: inherit; } .spinbutton.vertical .button:first-child:backdrop, .spinbutton.vertical:dir(rtl) .button:first-child:backdrop { color: #8d9091; @@ -1470,7 +1512,9 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton, text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } - .spinbutton.vertical .button:last-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive > .label { + .spinbutton.vertical .button:last-child:insensitive > .label, .spinbutton.vertical .header-bar .button.titlebutton:last-child:insensitive > .label, + .spinbutton.vertical .titlebar .button.titlebutton:last-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .header-bar .button.titlebutton:last-child:insensitive > .label, + .spinbutton.vertical:dir(rtl) .titlebar .button.titlebutton:last-child:insensitive > .label { color: inherit; } .spinbutton.vertical .button:last-child:backdrop, .spinbutton.vertical:dir(rtl) .button:last-child:backdrop { color: #8d9091; @@ -1486,7 +1530,9 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton, text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .spinbutton.vertical .button:backdrop:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:backdrop:insensitive > .label { + .spinbutton.vertical .button:backdrop:insensitive > .label, .spinbutton.vertical .header-bar .button.titlebutton:backdrop:insensitive > .label, + .spinbutton.vertical .titlebar .button.titlebutton:backdrop:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:backdrop:insensitive > .label, .spinbutton.vertical:dir(rtl) .header-bar .button.titlebutton:backdrop:insensitive > .label, + .spinbutton.vertical:dir(rtl) .titlebar .button.titlebutton:backdrop:insensitive > .label { color: inherit; } .spinbutton.vertical.entry, .spinbutton.vertical:dir(rtl).entry { border-radius: 0; @@ -1693,11 +1739,13 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0); border-color: #184472; } - .titlebar.selection-mode .button:backdrop:insensitive > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive > .label, + .titlebar.selection-mode .button:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar .button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar .titlebutton.button:backdrop:insensitive > .label, .titlebar.selection-mode .titlebutton.button:backdrop:insensitive > .label, .header-bar.selection-mode .button:backdrop:insensitive > .label, + .header-bar.selection-mode .titlebar .button.titlebutton:backdrop:insensitive > .label, .header-bar.selection-mode .button.flat:backdrop:insensitive > .label, - .header-bar.selection-mode .titlebutton.button:backdrop:insensitive > .label { + .header-bar.selection-mode .titlebutton.button:backdrop:insensitive > .label, + .header-bar.selection-mode .titlebar .titlebutton.button:backdrop:insensitive > .label { color: inherit; } .titlebar.selection-mode .button:backdrop:insensitive:active, .titlebar.selection-mode .button:backdrop:insensitive:checked, .titlebar.selection-mode .button.flat:backdrop:insensitive:active, .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active, .titlebar.selection-mode .button.flat:backdrop:insensitive:checked, @@ -1713,15 +1761,19 @@ GtkComboBox { background-image: linear-gradient(to bottom, #5093da); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0); border-color: #184472; } - .titlebar.selection-mode .button:backdrop:insensitive:active > .label, .titlebar.selection-mode .button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive:active > .label, - .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive:checked > .label, + .titlebar.selection-mode .button:backdrop:insensitive:active > .label, .titlebar.selection-mode .header-bar .button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode .button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar .button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode .header-bar .titlebutton.button:backdrop:insensitive:active > .label, + .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar .titlebutton.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label, .header-bar.selection-mode .button:backdrop:insensitive:active > .label, + .header-bar.selection-mode .titlebar .button.titlebutton:backdrop:insensitive:active > .label, .header-bar.selection-mode .button:backdrop:insensitive:checked > .label, + .header-bar.selection-mode .titlebar .button.titlebutton:backdrop:insensitive:checked > .label, .header-bar.selection-mode .button.flat:backdrop:insensitive:active > .label, .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label, + .header-bar.selection-mode .titlebar .titlebutton.button:backdrop:insensitive:active > .label, .header-bar.selection-mode .button.flat:backdrop:insensitive:checked > .label, - .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label { + .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label, + .header-bar.selection-mode .titlebar .titlebutton.button:backdrop:insensitive:checked > .label { color: inherit; } .titlebar.selection-mode .button.flat:backdrop, .titlebar.selection-mode .titlebutton.button:backdrop, .titlebar.selection-mode .button.flat:insensitive, @@ -1747,8 +1799,9 @@ GtkComboBox { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec; } - .titlebar.selection-mode .button:insensitive > .label, - .header-bar.selection-mode .button:insensitive > .label { + .titlebar.selection-mode .button:insensitive > .label, .titlebar.selection-mode .header-bar .button.titlebutton:insensitive > .label, + .header-bar.selection-mode .button:insensitive > .label, + .header-bar.selection-mode .titlebar .button.titlebutton:insensitive > .label { color: inherit; } .titlebar.selection-mode .button:insensitive:active, .titlebar.selection-mode .button:insensitive:checked, .header-bar.selection-mode .button:insensitive:active, @@ -1757,9 +1810,11 @@ GtkComboBox { border-color: #1c5187; background-image: linear-gradient(to bottom, #4a8cd1, #5093da); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec; } - .titlebar.selection-mode .button:insensitive:active > .label, .titlebar.selection-mode .button:insensitive:checked > .label, + .titlebar.selection-mode .button:insensitive:active > .label, .titlebar.selection-mode .header-bar .button.titlebutton:insensitive:active > .label, .titlebar.selection-mode .button:insensitive:checked > .label, .titlebar.selection-mode .header-bar .button.titlebutton:insensitive:checked > .label, .header-bar.selection-mode .button:insensitive:active > .label, - .header-bar.selection-mode .button:insensitive:checked > .label { + .header-bar.selection-mode .titlebar .button.titlebutton:insensitive:active > .label, + .header-bar.selection-mode .button:insensitive:checked > .label, + .header-bar.selection-mode .titlebar .button.titlebutton:insensitive:checked > .label { color: inherit; } .titlebar.selection-mode .button.suggested-action, .header-bar.selection-mode .button.suggested-action { @@ -1800,8 +1855,9 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec; border-color: #184472; } - .titlebar.selection-mode .button.suggested-action:insensitive > .label, - .header-bar.selection-mode .button.suggested-action:insensitive > .label { + .titlebar.selection-mode .button.suggested-action:insensitive > .label, .titlebar.selection-mode .header-bar .suggested-action.button.titlebutton:insensitive > .label, + .header-bar.selection-mode .button.suggested-action:insensitive > .label, + .header-bar.selection-mode .titlebar .suggested-action.button.titlebutton:insensitive > .label { color: inherit; } .titlebar.selection-mode .button.suggested-action:backdrop, .header-bar.selection-mode .button.suggested-action:backdrop { @@ -1821,8 +1877,9 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0); border-color: #184472; } - .titlebar.selection-mode .button.suggested-action:backdrop:insensitive > .label, - .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > .label { + .titlebar.selection-mode .button.suggested-action:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar .suggested-action.button.titlebutton:backdrop:insensitive > .label, + .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > .label, + .header-bar.selection-mode .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > .label { color: inherit; } .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop, .header-bar.selection-mode .selection-menu, @@ -2393,6 +2450,25 @@ column-header .titlebar .button.titlebutton, .scrollbar .titlebar .button.titlebutton, .titlebar .scrollbar .button.titlebutton { border: none; } + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) { + opacity: 0.3; + -GtkRange-slider-width: 5px; } + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { + margin: 0; + background-color: #2e3436; + border: 1px solid white; + background-clip: padding-box; } + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .trough { + border-style: none; + background-color: transparent; } + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical .slider { + margin-top: 2px; + margin-bottom: 2px; } + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal .slider { + margin-left: 2px; + margin-right: 2px; } + .scrollbar.overlay-indicator.dragging, .scrollbar.overlay-indicator.hovering { + opacity: 0.7; } .scrollbar .trough { background-color: #dbdbdb; border: 1px none #a1a1a1; } @@ -2400,10 +2476,7 @@ column-header .titlebar .button.titlebutton, background-color: #e5e5e5; border-color: #a8a8a8; } .scrollbar .slider { - border-color: transparent; - border-style: solid; - background-color: #a0a3a3; - background-clip: padding-box; } + background-color: #a0a3a3; } .scrollbar .slider:hover { background-color: #7a7e7f; } .scrollbar .slider:prelight:active { @@ -2412,43 +2485,30 @@ column-header .titlebar .button.titlebutton, background-color: #c6c7c8; } .scrollbar .slider:insensitive { background-color: transparent; } - .scrollbar.overlay-indicator { - -GtkRange-slider-width: 8px; } - .scrollbar.overlay-indicator .slider { - background-color: rgba(46, 52, 54, 0.3); - border-width: 2px; - border-radius: 100px; } - .scrollbar.overlay-indicator .trough { - border-color: transparent; - background-color: transparent; } - .scrollbar.overlay-indicator.dragging, .scrollbar.overlay-indicator.hovering { - -GtkRange-slider-width: 13; } - .scrollbar.overlay-indicator.dragging .slider, .scrollbar.overlay-indicator.hovering .slider { - border-width: 1px; } - .scrollbar.overlay-indicator.dragging .trough, .scrollbar.overlay-indicator.hovering .trough { - border-color: rgba(161, 161, 161, 0.7); - background-color: rgba(219, 219, 219, 0.7); } - .scrollbar.overlay-indicator.dragging.fine-tune .slider, .scrollbar.overlay-indicator.hovering.fine-tune .slider { - border-width: 3px; } - .scrollbar.overlay-indicator.dragging.fine-tune .trough, .scrollbar.overlay-indicator.hovering.fine-tune .trough { - background-color: lightgray; } .scrollbar .slider { - border-width: 3px; - border-radius: 100px; } + border-radius: 100px; + margin: 3px; } .scrollbar.fine-tune .slider { - border-width: 4px; } + margin: 4px; } .scrollbar.vertical .slider { - margin-left: 1px; } + margin-left: 4px; } .scrollbar.vertical .slider:dir(rtl) { - margin-left: 0; - margin-right: 1px; } + margin-left: 3px; + margin-right: 4px; } + .scrollbar.vertical.fine-tune .slider { + margin-left: 5px; } + .scrollbar.vertical.fine-tune .slider:dir(rtl) { + margin-left: 4px; + margin-right: 5px; } .scrollbar.vertical .trough { border-left-style: solid; } .scrollbar.vertical .trough:dir(rtl) { border-left-style: none; border-right-style: solid; } .scrollbar.horizontal .slider { - margin-top: 1px; } + margin-top: 4px; } + .scrollbar.horizontal.fine-tune .slider { + margin-top: 5px; } .scrollbar.horizontal .trough { border-top-style: solid; } @@ -3726,7 +3786,8 @@ GtkPlacesSidebar.sidebar .view .separator:backdrop { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } - .list-row:selected .button:backdrop:insensitive > .label, .list-row:selected .button.flat:backdrop:insensitive > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive > .label, + .list-row:selected .button:backdrop:insensitive > .label, .list-row:selected .header-bar .button.titlebutton:backdrop:insensitive > .label, + .list-row:selected .titlebar .button.titlebutton:backdrop:insensitive > .label, .list-row:selected .button.flat:backdrop:insensitive > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive > .label, .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive > .label, .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive > .label { color: inherit; } @@ -3740,7 +3801,9 @@ GtkPlacesSidebar.sidebar .view .separator:backdrop { background-image: linear-gradient(to bottom, #e7e7e7); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } - .list-row:selected .button:backdrop:insensitive:active > .label, .list-row:selected .button:backdrop:insensitive:checked > .label, .list-row:selected .button.flat:backdrop:insensitive:active > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label, + .list-row:selected .button:backdrop:insensitive:active > .label, .list-row:selected .header-bar .button.titlebutton:backdrop:insensitive:active > .label, + .list-row:selected .titlebar .button.titlebutton:backdrop:insensitive:active > .label, .list-row:selected .button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar .button.titlebutton:backdrop:insensitive:checked > .label, + .list-row:selected .titlebar .button.titlebutton:backdrop:insensitive:checked > .label, .list-row:selected .button.flat:backdrop:insensitive:active > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label, .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:active > .label, .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label, .list-row:selected .button.flat:backdrop:insensitive:checked > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .label, .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked > .label, @@ -3764,14 +3827,17 @@ GtkPlacesSidebar.sidebar .view .separator:backdrop { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } - .list-row:selected .button:insensitive > .label { + .list-row:selected .button:insensitive > .label, .list-row:selected .header-bar .button.titlebutton:insensitive > .label, + .list-row:selected .titlebar .button.titlebutton:insensitive > .label { color: inherit; } .list-row:selected .button:insensitive:active, .list-row:selected .button:insensitive:checked { color: #8d9091; border-color: #a1a1a1; background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .list-row:selected .button:insensitive:active > .label, .list-row:selected .button:insensitive:checked > .label { + .list-row:selected .button:insensitive:active > .label, .list-row:selected .header-bar .button.titlebutton:insensitive:active > .label, + .list-row:selected .titlebar .button.titlebutton:insensitive:active > .label, .list-row:selected .button:insensitive:checked > .label, .list-row:selected .header-bar .button.titlebutton:insensitive:checked > .label, + .list-row:selected .titlebar .button.titlebutton:insensitive:checked > .label { color: inherit; } .list-row, list-row.button, .header-bar list-row.button.titlebutton, @@ -3945,7 +4011,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .message-dialog.csd .dialog-action-area .button:insensitive > .label { + .message-dialog.csd .dialog-action-area .button:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .button.titlebutton:insensitive > .label, + .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:insensitive > .label { color: inherit; } .message-dialog.csd .dialog-action-area .button:backdrop { color: #8d9091; @@ -3961,7 +4028,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > .label { + .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .button.titlebutton:backdrop:insensitive > .label, + .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:backdrop:insensitive > .label { color: inherit; } .message-dialog.csd .dialog-action-area .button.suggested-action { color: white; @@ -4001,7 +4069,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > .label { + .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .suggested-action.button.titlebutton:backdrop:insensitive > .label, + .message-dialog.csd .dialog-action-area .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > .label { color: inherit; } .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive { color: #8d9091; @@ -4010,7 +4079,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > .label { + .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .suggested-action.button.titlebutton:insensitive > .label, + .message-dialog.csd .dialog-action-area .titlebar .suggested-action.button.titlebutton:insensitive > .label { color: inherit; } .message-dialog.csd .dialog-action-area .button.destructive-action { color: white; @@ -4050,7 +4120,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > .label { + .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .destructive-action.button.titlebutton:backdrop:insensitive > .label, + .message-dialog.csd .dialog-action-area .titlebar .destructive-action.button.titlebutton:backdrop:insensitive > .label { color: inherit; } .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive { color: #8d9091; @@ -4059,7 +4130,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > .label { + .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .destructive-action.button.titlebutton:insensitive > .label, + .message-dialog.csd .dialog-action-area .titlebar .destructive-action.button.titlebutton:insensitive > .label { color: inherit; } .message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:hover, .message-dialog.csd .dialog-action-area .button:active, .message-dialog.csd .dialog-action-area .button:insensitive, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd .dialog-action-area .button:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action, .message-dialog.csd .dialog-action-area .button.suggested-action:hover, .message-dialog.csd .dialog-action-area .button.suggested-action:active, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action, .message-dialog.csd .dialog-action-area .button.destructive-action:hover, .message-dialog.csd .dialog-action-area .button.destructive-action:active, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive { border-left-style: solid; @@ -4213,10 +4285,17 @@ GtkInfoBar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .info .button:insensitive > .label, + .info .button:insensitive > .label, .info .header-bar .button.titlebutton:insensitive > .label, + .info .titlebar .button.titlebutton:insensitive > .label, .question .button:insensitive > .label, + .question .header-bar .button.titlebutton:insensitive > .label, + .question .titlebar .button.titlebutton:insensitive > .label, .warning .button:insensitive > .label, - .error .button:insensitive > .label { + .warning .header-bar .button.titlebutton:insensitive > .label, + .warning .titlebar .button.titlebutton:insensitive > .label, + .error .button:insensitive > .label, + .error .header-bar .button.titlebutton:insensitive > .label, + .error .titlebar .button.titlebutton:insensitive > .label { color: inherit; } .info .button:backdrop, .question .button:backdrop, @@ -4240,10 +4319,17 @@ GtkInfoBar { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #1c5187; } - .info .button:backdrop:insensitive > .label, + .info .button:backdrop:insensitive > .label, .info .header-bar .button.titlebutton:backdrop:insensitive > .label, + .info .titlebar .button.titlebutton:backdrop:insensitive > .label, .question .button:backdrop:insensitive > .label, + .question .header-bar .button.titlebutton:backdrop:insensitive > .label, + .question .titlebar .button.titlebutton:backdrop:insensitive > .label, .warning .button:backdrop:insensitive > .label, - .error .button:backdrop:insensitive > .label { + .warning .header-bar .button.titlebutton:backdrop:insensitive > .label, + .warning .titlebar .button.titlebutton:backdrop:insensitive > .label, + .error .button:backdrop:insensitive > .label, + .error .header-bar .button.titlebutton:backdrop:insensitive > .label, + .error .titlebar .button.titlebutton:backdrop:insensitive > .label { color: inherit; } /************ -- cgit v1.2.1