diff --git a/gtk/resources/theme/Adwaita/_drawing.scss b/gtk/resources/theme/Adwaita/_drawing.scss index 87c809374f..f7fa72aef5 100644 --- a/gtk/resources/theme/Adwaita/_drawing.scss +++ b/gtk/resources/theme/Adwaita/_drawing.scss @@ -199,7 +199,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on // insensitive button // $_bg: if($c!=$bg_color, mix($c,$base_color,85%), $insensitive_bg_color); - color: if($c!=$bg_color, mix($tc,$_bg,60%), $insensitive_fg_color); + color: if($c!=$bg_color, mix($tc,$_bg,50%), $insensitive_fg_color); border-color: if($c!=$bg_color, _border_color($c), $insensitive_borders_color); background-image: linear-gradient(to bottom, $_bg); @@ -209,6 +209,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on // white with 0 alpha to avoid an ugly transition, since no color means // black with 0 alpha @include _shadows(inset 0 1px transparentize(white,1), $_outsets); + > GtkLabel { color: inherit; } } @else if $t==insensitive-active { // @@ -225,7 +226,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on // white with 0 alpha to avoid an ugly transition, since no color means // black with 0 alpha @include _shadows(inset 0 1px transparentize(white,1), $_outsets); - //FIXME make it clearer + > GtkLabel { color: inherit; } } @else if $t==backdrop { @@ -277,6 +278,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on // black with 0 alpha @include _shadows(inset 0 1px transparentize(white,1), 0 1px transparentize(white,1)); + > GtkLabel { color: inherit; } } @else if $t==backdrop-insensitive-active { @@ -289,6 +291,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on mix($backdrop_borders_color,$insensitive_bg_color, 8%)); box-shadow: inset 0 1px transparentize(white,1), 0 1px transparentize(white,1); + > GtkLabel { color: inherit; } } @else if $t==osd { diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index a473bc9127..5bda289e04 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -306,11 +306,15 @@ 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 > GtkLabel { + color: inherit; } .button:backdrop:insensitive:active, .button:backdrop:insensitive:checked { color: #5d6767; border-color: #1e2222; background-image: linear-gradient(to bottom, #303434); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .button:backdrop:insensitive:active > GtkLabel, .button:backdrop:insensitive:checked > GtkLabel { + color: inherit; } .button:insensitive { color: #939695; border-color: #1c1f1f; @@ -318,6 +322,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.1); } + .button:insensitive > GtkLabel { + color: inherit; } .button:insensitive:active, .button:insensitive.flat:active, .button:insensitive:checked, .button:insensitive.flat:checked { color: #939695; border-color: #1c1f1f; @@ -325,6 +331,8 @@ GtkTextView { 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 > GtkLabel, .button:insensitive.flat:active > GtkLabel, .button:insensitive:checked > GtkLabel, .button:insensitive.flat:checked > GtkLabel { + color: inherit; } .button.osd { color: #eeeeec; border-radius: 6px; @@ -462,6 +470,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 > GtkLabel { + color: inherit; } .button.suggested-action:insensitive { color: #939695; border-color: #1c1f1f; @@ -469,6 +479,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.1); } + .button.suggested-action:insensitive > GtkLabel { + color: inherit; } .osd .button.suggested-action { background-color: transparent; background-clip: padding-box; @@ -540,6 +552,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 > GtkLabel { + color: inherit; } .button.destructive-action:insensitive { color: #939695; border-color: #1c1f1f; @@ -547,6 +561,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.1); } + .button.destructive-action:insensitive > GtkLabel { + color: inherit; } .osd .button.destructive-action { background-color: transparent; background-clip: padding-box; @@ -657,6 +673,8 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + .inline-toolbar GtkToolButton > .button:insensitive > GtkLabel { + color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active { color: #939695; border-color: #1c1f1f; @@ -664,6 +682,8 @@ GtkTextView { border-color: #1c1f1f; background-image: linear-gradient(to bottom, #2f3333, #323636); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel { + color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:checked { color: #939695; border-color: #1c1f1f; @@ -671,6 +691,8 @@ GtkTextView { border-color: #1c1f1f; background-image: linear-gradient(to bottom, #2f3333, #323636); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { + color: inherit; } .inline-toolbar GtkToolButton > .button:backdrop { color: #c9cbc9; border-color: #1e2222; @@ -695,16 +717,22 @@ GtkTextView { 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:insensitive > GtkLabel { + color: inherit; } .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active { color: #5d6767; border-color: #1e2222; background-image: linear-gradient(to bottom, #303434); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > GtkLabel { + color: inherit; } .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked { color: #5d6767; border-color: #1e2222; background-image: linear-gradient(to bottom, #303434); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > GtkLabel { + color: inherit; } .inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton:backdrop > .button.flat, @@ -876,6 +904,8 @@ GtkColorButton.button { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + .spinbutton.vertical .button:first-child:insensitive > GtkLabel, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive > GtkLabel { + color: inherit; } .spinbutton.vertical .button:first-child:backdrop, .spinbutton.vertical:dir(rtl) .button:first-child:backdrop { color: #c9cbc9; border-color: #1e2222; @@ -911,6 +941,8 @@ GtkColorButton.button { 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 > GtkLabel, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive > GtkLabel { + color: inherit; } .spinbutton.vertical .button:last-child:backdrop, .spinbutton.vertical:dir(rtl) .button:last-child:backdrop { color: #c9cbc9; border-color: #1e2222; @@ -925,6 +957,8 @@ GtkColorButton.button { 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 > GtkLabel, .spinbutton.vertical:dir(rtl) .button:backdrop:insensitive > GtkLabel { + color: inherit; } .spinbutton.vertical.entry, .spinbutton.vertical:dir(rtl).entry { border-radius: 0; padding-left: 3px; @@ -1079,12 +1113,15 @@ GtkComboBox { box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .titlebar.selection-mode .button:insensitive, GtkCalendar.selection-mode.header .button:insensitive, .header-bar.selection-mode .button:insensitive { - color: #a6bbd0; + color: #90aac4; border-color: #0b1e33; background-image: linear-gradient(to bottom, #22558a); text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + .titlebar.selection-mode .button:insensitive > GtkLabel, GtkCalendar.selection-mode.header .button:insensitive > GtkLabel, + .header-bar.selection-mode .button:insensitive > GtkLabel { + color: inherit; } .titlebar.selection-mode .button:backdrop, GtkCalendar.selection-mode.header .button:backdrop, .header-bar.selection-mode .button:backdrop { color: #ffffff; @@ -1102,6 +1139,9 @@ GtkComboBox { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .titlebar.selection-mode .button:backdrop:insensitive > GtkLabel, GtkCalendar.selection-mode.header .button:backdrop:insensitive > GtkLabel, + .header-bar.selection-mode .button:backdrop:insensitive > GtkLabel { + color: inherit; } .titlebar.selection-mode .button.suggested-action, GtkCalendar.selection-mode.header .button.suggested-action, .header-bar.selection-mode .button.suggested-action { color: #eeeeec; @@ -1138,6 +1178,9 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } + .titlebar.selection-mode .button.suggested-action:insensitive > GtkLabel, GtkCalendar.selection-mode.header .button.suggested-action:insensitive > GtkLabel, + .header-bar.selection-mode .button.suggested-action:insensitive > GtkLabel { + color: inherit; } .titlebar.selection-mode .button.suggested-action:backdrop, GtkCalendar.selection-mode.header .button.suggested-action:backdrop, .header-bar.selection-mode .button.suggested-action:backdrop { color: #c9cbc9; @@ -1156,6 +1199,9 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } + .titlebar.selection-mode .button.suggested-action:backdrop:insensitive > GtkLabel, GtkCalendar.selection-mode.header .button.suggested-action:backdrop:insensitive > GtkLabel, + .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > GtkLabel { + color: inherit; } .titlebar.selection-mode .selection-menu, GtkCalendar.selection-mode.header .selection-menu, .titlebar.selection-mode .selection-menu:backdrop, GtkCalendar.selection-mode.header .selection-menu:backdrop, .header-bar.selection-mode .selection-menu, .header-bar.selection-mode .selection-menu:backdrop { @@ -1780,6 +1826,8 @@ GtkSwitch { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + GtkSwitch.slider:insensitive > GtkLabel, .list-row:selected GtkSwitch.slider:insensitive > GtkLabel { + color: inherit; } GtkSwitch.slider:backdrop, .list-row:selected GtkSwitch.slider:backdrop { color: #c9cbc9; border-color: #1e2222; @@ -1796,6 +1844,8 @@ GtkSwitch { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + GtkSwitch.slider:backdrop:insensitive > GtkLabel, .list-row:selected GtkSwitch.slider:backdrop:insensitive > GtkLabel { + color: inherit; } /************************* * Check and Radio items * @@ -2166,6 +2216,10 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .scale.slider:backdrop:insensitive > GtkLabel, + .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive > GtkLabel, + .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive > GtkLabel { + color: inherit; } .scale.slider:active, .scale.scale-has-marks-above.scale-has-marks-below.slider:active, .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:active { @@ -2846,6 +2900,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 > GtkLabel { + color: inherit; } .message-dialog.csd .dialog-action-area .button:backdrop { color: #c9cbc9; border-color: #1e2222; @@ -2860,6 +2916,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > GtkLabel { + color: inherit; } .message-dialog.csd .dialog-action-area .button.suggested-action { color: white; background-image: linear-gradient(to bottom, #256ab1, #215d9c 40%, #1c5187); @@ -2895,6 +2953,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > GtkLabel { + color: inherit; } .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive { color: #939695; border-color: #1c1f1f; @@ -2902,6 +2962,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } + .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > GtkLabel { + color: inherit; } .message-dialog.csd .dialog-action-area .button.destructive-action { color: white; background-image: linear-gradient(to bottom, #ed1212, #d51010 40%, #bd0e0e); @@ -2937,6 +2999,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > GtkLabel { + color: inherit; } .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive { color: #939695; border-color: #1c1f1f; @@ -2944,6 +3008,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } + .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > GtkLabel { + 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-right-style: none; border-bottom-style: none; } @@ -3051,12 +3117,17 @@ GtkInfoBar { .question .button:insensitive, .warning .button:insensitive, .error .button:insensitive { - color: #a6bbd0; + color: #90aac4; border-color: #0b1e33; background-image: linear-gradient(to bottom, #22558a); text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + .info .button:insensitive > GtkLabel, + .question .button:insensitive > GtkLabel, + .warning .button:insensitive > GtkLabel, + .error .button:insensitive > GtkLabel { + color: inherit; } .info .button:backdrop, .question .button:backdrop, .warning .button:backdrop, @@ -3079,6 +3150,11 @@ GtkInfoBar { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); border-color: #0b1e33; } + .info .button:backdrop:insensitive > GtkLabel, + .question .button:backdrop:insensitive > GtkLabel, + .warning .button:backdrop:insensitive > GtkLabel, + .error .button:backdrop:insensitive > GtkLabel { + color: inherit; } /************ * Tooltips * @@ -3259,5 +3335,3 @@ GtkCalendar.header .button.titlebutton { @define-color wm_button_active_color_b shade(#393f3f, 0.89); @define-color wm_button_active_color_c shade(#393f3f, 0.9); @define-color content_view_bg #292929; - -/*# sourceMappingURL=gtk-contained-dark.css.map */ diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index f7a5b1c743..223bd64f42 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -298,11 +298,15 @@ 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 > GtkLabel { + color: inherit; } .button:backdrop:insensitive:active, .button:backdrop:insensitive:checked { color: #c7c7c7; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #ededed); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .button:backdrop:insensitive:active > GtkLabel, .button:backdrop:insensitive:checked > GtkLabel { + color: inherit; } .button:insensitive { color: #8d9091; border-color: #a1a1a1; @@ -310,6 +314,8 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } + .button:insensitive > GtkLabel { + color: inherit; } .button:insensitive:active, .button:insensitive.flat:active, .button:insensitive:checked, .button:insensitive.flat:checked { color: #8d9091; border-color: #a1a1a1; @@ -317,6 +323,8 @@ GtkTextView { 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 > GtkLabel, .button:insensitive.flat:active > GtkLabel, .button:insensitive:checked > GtkLabel, .button:insensitive.flat:checked > GtkLabel { + color: inherit; } .button.osd { color: #eeeeec; border-radius: 6px; @@ -454,6 +462,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 > GtkLabel { + color: inherit; } .button.suggested-action:insensitive { color: #8d9091; border-color: #a1a1a1; @@ -461,6 +471,8 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } + .button.suggested-action:insensitive > GtkLabel { + color: inherit; } .osd .button.suggested-action { background-color: transparent; background-clip: padding-box; @@ -532,6 +544,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 > GtkLabel { + color: inherit; } .button.destructive-action:insensitive { color: #8d9091; border-color: #a1a1a1; @@ -539,6 +553,8 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } + .button.destructive-action:insensitive > GtkLabel { + color: inherit; } .osd .button.destructive-action { background-color: transparent; background-clip: padding-box; @@ -649,6 +665,8 @@ GtkTextView { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + .inline-toolbar GtkToolButton > .button:insensitive > GtkLabel { + color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active { color: #8d9091; border-color: #a1a1a1; @@ -656,6 +674,8 @@ GtkTextView { border-color: #a1a1a1; background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel { + color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:checked { color: #8d9091; border-color: #a1a1a1; @@ -663,6 +683,8 @@ GtkTextView { border-color: #a1a1a1; background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { + color: inherit; } .inline-toolbar GtkToolButton > .button:backdrop { color: #54595a; border-color: #a8a8a8; @@ -687,16 +709,22 @@ GtkTextView { 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:insensitive > GtkLabel { + color: inherit; } .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active { color: #c7c7c7; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #ededed); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > GtkLabel { + color: inherit; } .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked { color: #c7c7c7; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #ededed); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > GtkLabel { + color: inherit; } .inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton:backdrop > .button.flat, @@ -868,6 +896,8 @@ GtkColorButton.button { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + .spinbutton.vertical .button:first-child:insensitive > GtkLabel, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive > GtkLabel { + color: inherit; } .spinbutton.vertical .button:first-child:backdrop, .spinbutton.vertical:dir(rtl) .button:first-child:backdrop { color: #54595a; border-color: #a8a8a8; @@ -903,6 +933,8 @@ GtkColorButton.button { 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 > GtkLabel, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive > GtkLabel { + color: inherit; } .spinbutton.vertical .button:last-child:backdrop, .spinbutton.vertical:dir(rtl) .button:last-child:backdrop { color: #54595a; border-color: #a8a8a8; @@ -917,6 +949,8 @@ GtkColorButton.button { 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 > GtkLabel, .spinbutton.vertical:dir(rtl) .button:backdrop:insensitive > GtkLabel { + color: inherit; } .spinbutton.vertical.entry, .spinbutton.vertical:dir(rtl).entry { border-radius: 0; padding-left: 3px; @@ -1071,12 +1105,15 @@ GtkComboBox { box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .titlebar.selection-mode .button:insensitive, GtkCalendar.selection-mode.header .button:insensitive, .header-bar.selection-mode .button:insensitive { - color: #c1d9f1; + color: #b2cfee; border-color: #1c5187; background-image: linear-gradient(to bottom, #65a0de); text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + .titlebar.selection-mode .button:insensitive > GtkLabel, GtkCalendar.selection-mode.header .button:insensitive > GtkLabel, + .header-bar.selection-mode .button:insensitive > GtkLabel { + color: inherit; } .titlebar.selection-mode .button:backdrop, GtkCalendar.selection-mode.header .button:backdrop, .header-bar.selection-mode .button:backdrop { color: #ffffff; @@ -1094,6 +1131,9 @@ GtkComboBox { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .titlebar.selection-mode .button:backdrop:insensitive > GtkLabel, GtkCalendar.selection-mode.header .button:backdrop:insensitive > GtkLabel, + .header-bar.selection-mode .button:backdrop:insensitive > GtkLabel { + color: inherit; } .titlebar.selection-mode .button.suggested-action, GtkCalendar.selection-mode.header .button.suggested-action, .header-bar.selection-mode .button.suggested-action { color: #2e3436; @@ -1130,6 +1170,9 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } + .titlebar.selection-mode .button.suggested-action:insensitive > GtkLabel, GtkCalendar.selection-mode.header .button.suggested-action:insensitive > GtkLabel, + .header-bar.selection-mode .button.suggested-action:insensitive > GtkLabel { + color: inherit; } .titlebar.selection-mode .button.suggested-action:backdrop, GtkCalendar.selection-mode.header .button.suggested-action:backdrop, .header-bar.selection-mode .button.suggested-action:backdrop { color: #54595a; @@ -1148,6 +1191,9 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); border-color: #184472; } + .titlebar.selection-mode .button.suggested-action:backdrop:insensitive > GtkLabel, GtkCalendar.selection-mode.header .button.suggested-action:backdrop:insensitive > GtkLabel, + .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > GtkLabel { + color: inherit; } .titlebar.selection-mode .selection-menu, GtkCalendar.selection-mode.header .selection-menu, .titlebar.selection-mode .selection-menu:backdrop, GtkCalendar.selection-mode.header .selection-menu:backdrop, .header-bar.selection-mode .selection-menu, .header-bar.selection-mode .selection-menu:backdrop { @@ -1775,6 +1821,8 @@ GtkSwitch { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + GtkSwitch.slider:insensitive > GtkLabel, .list-row:selected GtkSwitch.slider:insensitive > GtkLabel { + color: inherit; } GtkSwitch.slider:backdrop, .list-row:selected GtkSwitch.slider:backdrop { color: #54595a; border-color: #a8a8a8; @@ -1791,6 +1839,8 @@ GtkSwitch { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + GtkSwitch.slider:backdrop:insensitive > GtkLabel, .list-row:selected GtkSwitch.slider:backdrop:insensitive > GtkLabel { + color: inherit; } /************************* * Check and Radio items * @@ -2161,6 +2211,10 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .scale.slider:backdrop:insensitive > GtkLabel, + .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive > GtkLabel, + .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive > GtkLabel { + color: inherit; } .scale.slider:active, .scale.scale-has-marks-above.scale-has-marks-below.slider:active, .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:active { @@ -2842,6 +2896,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 > GtkLabel { + color: inherit; } .message-dialog.csd .dialog-action-area .button:backdrop { color: #54595a; border-color: #a8a8a8; @@ -2856,6 +2912,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > GtkLabel { + color: inherit; } .message-dialog.csd .dialog-action-area .button.suggested-action { color: white; background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9 40%, #3583d5); @@ -2891,6 +2949,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > GtkLabel { + color: inherit; } .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive { color: #8d9091; border-color: #a1a1a1; @@ -2898,6 +2958,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } + .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > GtkLabel { + color: inherit; } .message-dialog.csd .dialog-action-area .button.destructive-action { color: white; background-image: linear-gradient(to bottom, #f14141, #ef2929 40%, #ed1212); @@ -2933,6 +2995,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } + .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > GtkLabel { + color: inherit; } .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive { color: #8d9091; border-color: #a1a1a1; @@ -2940,6 +3004,8 @@ GtkCalendar { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } + .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > GtkLabel { + 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-right-style: none; border-bottom-style: none; } @@ -3047,12 +3113,17 @@ GtkInfoBar { .question .button:insensitive, .warning .button:insensitive, .error .button:insensitive { - color: #c1d9f1; + color: #b2cfee; border-color: #1c5187; background-image: linear-gradient(to bottom, #65a0de); text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + .info .button:insensitive > GtkLabel, + .question .button:insensitive > GtkLabel, + .warning .button:insensitive > GtkLabel, + .error .button:insensitive > GtkLabel { + color: inherit; } .info .button:backdrop, .question .button:backdrop, .warning .button:backdrop, @@ -3075,6 +3146,11 @@ GtkInfoBar { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); border-color: #1c5187; } + .info .button:backdrop:insensitive > GtkLabel, + .question .button:backdrop:insensitive > GtkLabel, + .warning .button:backdrop:insensitive > GtkLabel, + .error .button:backdrop:insensitive > GtkLabel { + color: inherit; } /************ * Tooltips * @@ -3255,5 +3331,3 @@ GtkCalendar.header .button.titlebutton { @define-color wm_button_active_color_b shade(#ededed, 0.89); @define-color wm_button_active_color_c shade(#ededed, 0.9); @define-color content_view_bg #ffffff; - -/*# sourceMappingURL=gtk-contained.css.map */