[gtk+] Adwaita: button drawing function rework...
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: button drawing function rework...
- Date: Mon, 28 Jul 2014 10:45:44 +0000 (UTC)
commit c97480caab0c2e7c3dc77dda22009602b96c4744
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Mon Jul 28 12:42:23 2014 +0200
Adwaita: button drawing function rework...
...to take colored buttons into considerations, so buttons on
colored background works better now (infobars and the like).
gtk/resources/theme/Adwaita/_colors.scss | 2 +-
gtk/resources/theme/Adwaita/_common.scss | 21 ++-
gtk/resources/theme/Adwaita/_drawing.scss | 48 +++++--
gtk/resources/theme/Adwaita/gtk-contained-dark.css | 140 ++++++++++++--------
gtk/resources/theme/Adwaita/gtk-contained.css | 86 ++++++++----
5 files changed, 195 insertions(+), 102 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_colors.scss b/gtk/resources/theme/Adwaita/_colors.scss
index a264df5..23435b0 100644
--- a/gtk/resources/theme/Adwaita/_colors.scss
+++ b/gtk/resources/theme/Adwaita/_colors.scss
@@ -33,7 +33,7 @@ $insensitive_borders_color: $borders_color;
$backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
$backdrop_bg_color: $bg_color;
$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
-$backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%),
lighten($backdrop_bg_color,5%));
+$backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%),
lighten($backdrop_bg_color,15%));
$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 4bd165f..0f3bb9b 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -2367,12 +2367,21 @@ GtkInfoBar {
text-shadow: 0 1px darken($selected_bg_color, 10%);
border-color: darken($selected_bg_color, 10%);
.button {
- @include button(normal, $selected_bg_color, $selected_fg_color, noedge);
- &:hover { @include button(hover, $selected_bg_color, $selected_fg_color, noedge); }
- &:active { @include button(active, $selected_bg_color, $selected_fg_color, noedge); }
- &:insensitive { @include button(insensitive, $selected_bg_color, $selected_fg_color, noedge); }
- &:backdrop { @include button(backdrop, $selected_bg_color, $selected_fg_color, noedge); }
- &:backdrop:insensitive { @include button(backdrop-insensitive, $selected_bg_color, $selected_fg_color,
noedge); }
+ @include button(normal, $selected_bg_color, $selected_fg_color, $noedge: true);
+ &:hover { @include button(hover, $selected_bg_color, $selected_fg_color, $noedge: true); }
+ &:active { @include button(active, $selected_bg_color, $selected_fg_color, $noedge: true); }
+ &:insensitive {
+ @include button(insensitive, $selected_bg_color, $selected_fg_color, $noedge: true);
+ }
+ &:backdrop {
+ @include button(backdrop, $selected_bg_color, $selected_fg_color);
+ border-color: _border_color($selected_bg_color);
+ &:insensitive {
+ @include button(backdrop-insensitive, $selected_bg_color,
+ $selected_fg_color, $noedge: True);
+ border-color: _border_color($selected_bg_color);
+ }
+ }
}
}
diff --git a/gtk/resources/theme/Adwaita/_drawing.scss b/gtk/resources/theme/Adwaita/_drawing.scss
index d06bf7e..25106c3 100644
--- a/gtk/resources/theme/Adwaita/_drawing.scss
+++ b/gtk/resources/theme/Adwaita/_drawing.scss
@@ -199,9 +199,11 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
//
// insensitive button
//
- color: $insensitive_fg_color;
- border-color: $insensitive_borders_color;
- background-image: linear-gradient(to bottom, $insensitive_bg_color);
+ $_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);
+ border-color: if($c!=$bg_color, _border_color($c),
+ $insensitive_borders_color);
+ background-image: linear-gradient(to bottom, $_bg);
text-shadow: none;
icon-shadow: none;
$_outsets: if($noedge, none, $widget_edge);
@@ -213,23 +215,33 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
//
// insensitive pushed 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);
+ $_bc: if($c!=$bg_color, _border_color($c), $insensitive_borders_color);
+ border-color: $_bc;
color: $insensitive_fg_color;
border-color: $insensitive_borders_color;
- background-image: linear-gradient(to bottom,
- mix($insensitive_borders_color,
- $insensitive_bg_color, 10%));
+ background-image: linear-gradient(to bottom, mix($_bc, $_bg, 10%), $_bg);
$_outsets: if($noedge, none, $widget_edge);
// 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
}
@else if $t==backdrop {
//
// backdrop button
//
- color: if($c!=$bg_color, $tc, $backdrop_fg_color);
- border-color: if($c!=$bg_color, $c, $backdrop_borders_color);
+ @if $c!=$bg_color {
+ color: $tc;
+ border_color: if($variant=='light',$c,_border_color($c));
+ }
+ @else {
+ color: $backdrop_fg_color;
+ border-color: $backdrop_borders_color;
+ }
+
background-image: linear-gradient(to bottom,
if($c!=bg_color,$c,$backdrop_bg_color));
text-shadow: none;
@@ -240,7 +252,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
@else if $t==backdrop-active {
//
- // backdrop pushed button
+ // backdrop pushed button FIXME no colors here!
//
color: $backdrop_fg_color;
border-color: $backdrop_borders_color;
@@ -253,11 +265,19 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
//
// backdrop insensitive button
//
- color: $backdrop_insensitive_color;
- border-color: $backdrop_borders_color;
- background-image: linear-gradient(to bottom, $insensitive_bg_color);
- box-shadow: inset 0 1px transparentize(white,1),
- 0 1px transparentize(white,1);
+ //box-shadow: inset 0 1px transparentize(white,1),
+ // 0 1px transparentize(white,1);
+
+ $_bg: if($c!=$bg_color, mix($c,$base_color,85%), $insensitive_bg_color);
+ color: if($c!=$bg_color, mix($tc,$_bg,35%), $backdrop_insensitive_color);
+ border-color: if($c!=$bg_color, _border_color($c), $backdrop_borders_color);
+ background-image: linear-gradient(to bottom, $_bg);
+ text-shadow: none;
+ icon-shadow: none;
+ // 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),
+ 0 1px transparentize(white,1));
}
@else if $t==backdrop-insensitive-active {
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 5a33b80..95c9c0e 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -195,7 +195,7 @@
border-style: solid;
border-width: 1px;
background-image: linear-gradient(to bottom, #212121, #292929 90%);
- color: #454c4c;
+ color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #323636);
box-shadow: inset 0 2px 2px -2px rgba(20, 20, 20, 0), inset 0 0 2px 1px rgba(39, 51, 64, 0), 0 1px
rgba(255, 255, 255, 0); }
@@ -321,13 +321,15 @@
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.button:backdrop:insensitive {
border-style: solid;
- color: #454c4c;
+ color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #323636);
+ 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:active {
border-style: solid;
- color: #454c4c;
+ 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); }
@@ -343,7 +345,9 @@
border-style: solid;
color: #939695;
border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, #2f3333);
+ 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.osd {
border-radius: 6px;
@@ -427,16 +431,18 @@
.button.suggested-action:backdrop {
border-style: solid;
color: white;
- border-color: #215d9c;
+ border_color: #0b1e33;
background-image: linear-gradient(to bottom, #215d9c);
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 {
border-style: solid;
- color: #454c4c;
+ color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #323636);
+ 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:insensitive {
border-style: solid;
@@ -475,16 +481,18 @@
.button.destructive-action:backdrop {
border-style: solid;
color: white;
- border-color: #d51010;
+ border_color: #5e0707;
background-image: linear-gradient(to bottom, #d51010);
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 {
border-style: solid;
- color: #454c4c;
+ color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #323636);
+ 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:insensitive {
border-style: solid;
@@ -571,7 +579,9 @@
border-style: solid;
color: #939695;
border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, #2f3333);
+ color: #939695;
+ 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:backdrop {
border-style: solid;
@@ -589,13 +599,15 @@
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.inline-toolbar GtkToolButton > .button:backdrop:insensitive {
border-style: solid;
- color: #454c4c;
+ color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #323636);
+ 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:active {
border-style: solid;
- color: #454c4c;
+ 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); }
@@ -721,7 +733,7 @@ GtkColorButton.button {
background-color: transparent; }
.spinbutton .button:backdrop:insensitive {
background-image: none;
- color: rgba(69, 76, 76, 0.3);
+ color: rgba(93, 103, 103, 0.3);
border-width: 0 0 0 1px; }
.spinbutton .button:backdrop:insensitive:dir(rtl) {
border-width: 0 1px 0 0; }
@@ -812,9 +824,11 @@ GtkColorButton.button {
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.spinbutton.vertical .button:backdrop:insensitive, .spinbutton.vertical:dir(rtl)
.button:backdrop:insensitive {
border-style: solid;
- color: #454c4c;
+ color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #323636);
+ 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.entry, .spinbutton.vertical:dir(rtl).entry {
border-radius: 0;
@@ -848,7 +862,7 @@ GtkComboBox {
text-shadow: none;
icon-shadow: none; }
GtkComboBox:backdrop:insensitive {
- color: #454c4c; }
+ color: #5d6767; }
GtkComboBox .menuitem {
text-shadow: none; }
GtkComboBox .separator {
@@ -977,9 +991,9 @@ GtkComboBox {
.titlebar.selection-mode .button:insensitive, GtkCalendar.selection-mode.header .button:insensitive,
.header-bar.selection-mode .button:insensitive {
border-style: solid;
- color: #939695;
- border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, #323636);
+ color: #a6bbd0;
+ 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); }
@@ -987,7 +1001,7 @@ GtkComboBox {
.header-bar.selection-mode .button:backdrop {
border-style: solid;
color: white;
- border-color: #215d9c;
+ border_color: #0b1e33;
background-image: linear-gradient(to bottom, #215d9c);
text-shadow: none;
icon-shadow: none;
@@ -996,9 +1010,11 @@ GtkComboBox {
.titlebar.selection-mode .button:backdrop:insensitive, GtkCalendar.selection-mode.header
.button:backdrop:insensitive,
.header-bar.selection-mode .button:backdrop:insensitive {
border-style: solid;
- color: #454c4c;
- border-color: #1e2222;
- background-image: linear-gradient(to bottom, #323636);
+ color: #6f90b2;
+ 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), 0 1px rgba(255, 255, 255, 0); }
.titlebar.selection-mode .button.suggested-action, GtkCalendar.selection-mode.header
.button.suggested-action,
.header-bar.selection-mode .button.suggested-action {
@@ -1054,9 +1070,11 @@ GtkComboBox {
.titlebar.selection-mode .button.suggested-action:backdrop:insensitive,
GtkCalendar.selection-mode.header .button.suggested-action:backdrop:insensitive,
.header-bar.selection-mode .button.suggested-action:backdrop:insensitive {
border-style: solid;
- color: #454c4c;
+ color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #323636);
+ text-shadow: none;
+ 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 .selection-menu, GtkCalendar.selection-mode.header .selection-menu,
.titlebar.selection-mode .selection-menu:backdrop, GtkCalendar.selection-mode.header .selection-menu:backdrop,
@@ -1212,7 +1230,7 @@ GtkTreeView.view.progressbar {
.menu .menuitem:insensitive {
color: #939695; }
.menu .menuitem:insensitive:backdrop {
- color: #454c4c; }
+ color: #5d6767; }
.menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
color: #c9cbc9;
background-color: #2c2c2c; }
@@ -1507,11 +1525,11 @@ GtkTreeView.view.progressbar {
font-weight: bold;
color: #939695; }
.notebook tab GtkLabel:backdrop, .notebook tab GtkLabel.prelight-page:backdrop {
- color: #878b8a; }
+ color: #939998; }
.notebook tab .prelight-page GtkLabel, .notebook tab GtkLabel.prelight-page {
color: #c0c2c0; }
.notebook tab .prelight-page GtkLabel:backdrop, .notebook tab GtkLabel.prelight-page:backdrop {
- color: #878b8a; }
+ color: #939998; }
.notebook tab .active-page GtkLabel, .notebook tab GtkLabel.active-page {
color: #eeeeec; }
.notebook tab .active-page GtkLabel:backdrop, .notebook tab GtkLabel.active-page:backdrop {
@@ -1556,7 +1574,7 @@ GtkTreeView.view.progressbar {
.notebook.arrow:backdrop {
color: rgba(201, 203, 201, 0.4); }
.notebook.arrow:backdrop:insensitive {
- color: #454c4c; }
+ color: #5d6767; }
/**************
* Scrollbars *
@@ -1634,7 +1652,7 @@ GtkSwitch {
background-color: #215d9c;
box-shadow: none; }
GtkSwitch.trough:backdrop:insensitive {
- color: #454c4c;
+ color: #5d6767;
border-color: #1e2222;
background-color: #323636; }
.list-row:selected GtkSwitch {
@@ -1683,9 +1701,11 @@ GtkSwitch {
border-color: #215d9c; }
GtkSwitch.slider:backdrop:insensitive, .list-row:selected GtkSwitch.slider:backdrop:insensitive {
border-style: solid;
- color: #454c4c;
+ color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #323636);
+ text-shadow: none;
+ icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
/*************************
@@ -1795,7 +1815,7 @@ GtkSwitch {
color: #939695;
background-image: none; }
.menuitem.check:active:insensitive:backdrop {
- color: #454c4c; }
+ color: #5d6767; }
.menuitem.check:active:backdrop {
color: #c9cbc9; }
.menuitem.check:insensitive {
@@ -1816,7 +1836,7 @@ GtkSwitch {
.view.check:active:insensitive {
color: #939695; }
.view.check:active:insensitive:backdrop {
- color: #454c4c; }
+ color: #5d6767; }
.view.check:active:backdrop {
color: #c9cbc9; }
.view.check:insensitive {
@@ -1949,7 +1969,7 @@ GtkSwitch {
color: #939695;
background-image: none; }
.menuitem.radio:active:insensitive:backdrop {
- color: #454c4c; }
+ color: #5d6767; }
.menuitem.radio:active:backdrop {
color: #c9cbc9; }
.menuitem.radio:insensitive {
@@ -1970,7 +1990,7 @@ GtkSwitch {
.view.radio:active:insensitive {
color: #939695; }
.view.radio:active:insensitive:backdrop {
- color: #454c4c; }
+ color: #5d6767; }
.view.radio:active:backdrop {
color: #c9cbc9; }
.view.radio:insensitive {
@@ -2005,7 +2025,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active,
GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive,
GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent {
color: #939695; }
GtkCheckButton.text-button:insensitive:backdrop, GtkCheckButton.text-button:insensitive:active:backdrop,
GtkCheckButton.text-button:insensitive:inconsistent:backdrop,
GtkRadioButton.text-button:insensitive:backdrop, GtkRadioButton.text-button:insensitive:active:backdrop,
GtkRadioButton.text-button:insensitive:inconsistent:backdrop {
- color: #454c4c; }
+ color: #5d6767; }
/************
* GtkScale *
@@ -2075,9 +2095,11 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
.scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive,
.scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive {
border-style: solid;
- color: #454c4c;
+ color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #323636);
+ 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:active,
.scale.scale-has-marks-above.scale-has-marks-below.slider:active,
@@ -2389,7 +2411,7 @@ GtkProgressBar {
color: rgba(238, 238, 236, 0.4);
box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
GtkProgressBar:backdrop {
- color: #454c4c; }
+ color: #5d6767; }
.progressbar {
border-width: 1px;
@@ -2688,9 +2710,11 @@ GtkCalendar {
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 {
border-style: solid;
- color: #454c4c;
+ color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #323636);
+ 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 {
border-style: solid;
@@ -2720,16 +2744,18 @@ GtkCalendar {
.message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
border-style: solid;
color: white;
- border-color: #215d9c;
+ border_color: #0b1e33;
background-image: linear-gradient(to bottom, #215d9c);
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 {
border-style: solid;
- color: #454c4c;
+ color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #323636);
+ 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:insensitive {
border-style: solid;
@@ -2767,16 +2793,18 @@ GtkCalendar {
.message-dialog.csd .dialog-action-area .button.destructive-action:backdrop {
border-style: solid;
color: white;
- border-color: #d51010;
+ border_color: #5e0707;
background-image: linear-gradient(to bottom, #d51010);
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 {
border-style: solid;
- color: #454c4c;
+ color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #323636);
+ 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:insensitive {
border-style: solid;
@@ -2901,9 +2929,9 @@ GtkInfoBar {
.warning .button:insensitive,
.error .button:insensitive {
border-style: solid;
- color: #939695;
- border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, #323636);
+ color: #a6bbd0;
+ 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); }
@@ -2913,20 +2941,24 @@ GtkInfoBar {
.error .button:backdrop {
border-style: solid;
color: white;
- border-color: #215d9c;
+ border_color: #0b1e33;
background-image: linear-gradient(to bottom, #215d9c);
text-shadow: none;
icon-shadow: none;
- box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
- .info .button:backdrop:insensitive,
- .question .button:backdrop:insensitive,
- .warning .button:backdrop:insensitive,
- .error .button:backdrop:insensitive {
- border-style: solid;
- color: #454c4c;
- border-color: #1e2222;
- background-image: linear-gradient(to bottom, #323636);
- box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+ box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+ border-color: #0b1e33; }
+ .info .button:backdrop:insensitive,
+ .question .button:backdrop:insensitive,
+ .warning .button:backdrop:insensitive,
+ .error .button:backdrop:insensitive {
+ border-style: solid;
+ color: #6f90b2;
+ 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), 0 1px rgba(255, 255, 255, 0);
+ border-color: #0b1e33; }
/************
* Tooltips *
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 0cdeac0..384ca20 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -316,6 +316,8 @@
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #f4f4f4);
+ 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:active {
border-style: solid;
@@ -335,7 +337,9 @@
border-style: solid;
color: #8d9091;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, #ebebeb);
+ 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.osd {
border-radius: 6px;
@@ -419,7 +423,7 @@
.button.suggested-action:backdrop {
border-style: solid;
color: white;
- border-color: #4a90d9;
+ border_color: #4a90d9;
background-image: linear-gradient(to bottom, #4a90d9);
text-shadow: none;
icon-shadow: none;
@@ -429,6 +433,8 @@
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #f4f4f4);
+ 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:insensitive {
border-style: solid;
@@ -467,7 +473,7 @@
.button.destructive-action:backdrop {
border-style: solid;
color: white;
- border-color: #ef2929;
+ border_color: #ef2929;
background-image: linear-gradient(to bottom, #ef2929);
text-shadow: none;
icon-shadow: none;
@@ -477,6 +483,8 @@
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #f4f4f4);
+ 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:insensitive {
border-style: solid;
@@ -563,7 +571,9 @@
border-style: solid;
color: #8d9091;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, #ebebeb);
+ color: #8d9091;
+ 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:backdrop {
border-style: solid;
@@ -584,6 +594,8 @@
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #f4f4f4);
+ 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:active {
border-style: solid;
@@ -807,6 +819,8 @@ GtkColorButton.button {
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #f4f4f4);
+ 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.entry, .spinbutton.vertical:dir(rtl).entry {
border-radius: 0;
@@ -969,9 +983,9 @@ GtkComboBox {
.titlebar.selection-mode .button:insensitive, GtkCalendar.selection-mode.header .button:insensitive,
.header-bar.selection-mode .button:insensitive {
border-style: solid;
- color: #8d9091;
- border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, #f4f4f4);
+ color: #c1d9f1;
+ 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); }
@@ -979,7 +993,7 @@ GtkComboBox {
.header-bar.selection-mode .button:backdrop {
border-style: solid;
color: white;
- border-color: #4a90d9;
+ border_color: #4a90d9;
background-image: linear-gradient(to bottom, #4a90d9);
text-shadow: none;
icon-shadow: none;
@@ -988,9 +1002,11 @@ GtkComboBox {
.titlebar.selection-mode .button:backdrop:insensitive, GtkCalendar.selection-mode.header
.button:backdrop:insensitive,
.header-bar.selection-mode .button:backdrop:insensitive {
border-style: solid;
- color: #c7c7c7;
- border-color: #a8a8a8;
- background-image: linear-gradient(to bottom, #f4f4f4);
+ color: #9ac1e9;
+ 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), 0 1px rgba(255, 255, 255, 0); }
.titlebar.selection-mode .button.suggested-action, GtkCalendar.selection-mode.header
.button.suggested-action,
.header-bar.selection-mode .button.suggested-action {
@@ -1049,6 +1065,8 @@ GtkComboBox {
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #f4f4f4);
+ text-shadow: none;
+ 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 .selection-menu, GtkCalendar.selection-mode.header .selection-menu,
.titlebar.selection-mode .selection-menu:backdrop, GtkCalendar.selection-mode.header .selection-menu:backdrop,
@@ -1680,6 +1698,8 @@ GtkSwitch {
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #f4f4f4);
+ text-shadow: none;
+ icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
/*************************
@@ -2072,6 +2092,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #f4f4f4);
+ 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:active,
.scale.scale-has-marks-above.scale-has-marks-below.slider:active,
@@ -2686,6 +2708,8 @@ GtkCalendar {
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #f4f4f4);
+ 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 {
border-style: solid;
@@ -2715,7 +2739,7 @@ GtkCalendar {
.message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
border-style: solid;
color: white;
- border-color: #4a90d9;
+ border_color: #4a90d9;
background-image: linear-gradient(to bottom, #4a90d9);
text-shadow: none;
icon-shadow: none;
@@ -2725,6 +2749,8 @@ GtkCalendar {
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #f4f4f4);
+ 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:insensitive {
border-style: solid;
@@ -2762,7 +2788,7 @@ GtkCalendar {
.message-dialog.csd .dialog-action-area .button.destructive-action:backdrop {
border-style: solid;
color: white;
- border-color: #ef2929;
+ border_color: #ef2929;
background-image: linear-gradient(to bottom, #ef2929);
text-shadow: none;
icon-shadow: none;
@@ -2772,6 +2798,8 @@ GtkCalendar {
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #f4f4f4);
+ 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:insensitive {
border-style: solid;
@@ -2896,9 +2924,9 @@ GtkInfoBar {
.warning .button:insensitive,
.error .button:insensitive {
border-style: solid;
- color: #8d9091;
- border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, #f4f4f4);
+ color: #c1d9f1;
+ 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); }
@@ -2908,20 +2936,24 @@ GtkInfoBar {
.error .button:backdrop {
border-style: solid;
color: white;
- border-color: #4a90d9;
+ border_color: #4a90d9;
background-image: linear-gradient(to bottom, #4a90d9);
text-shadow: none;
icon-shadow: none;
- box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
- .info .button:backdrop:insensitive,
- .question .button:backdrop:insensitive,
- .warning .button:backdrop:insensitive,
- .error .button:backdrop:insensitive {
- border-style: solid;
- color: #c7c7c7;
- border-color: #a8a8a8;
- background-image: linear-gradient(to bottom, #f4f4f4);
- box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+ box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+ border-color: #1c5187; }
+ .info .button:backdrop:insensitive,
+ .question .button:backdrop:insensitive,
+ .warning .button:backdrop:insensitive,
+ .error .button:backdrop:insensitive {
+ border-style: solid;
+ color: #9ac1e9;
+ 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), 0 1px rgba(255, 255, 255, 0);
+ border-color: #1c5187; }
/************
* Tooltips *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
