[gnome-themes-standard] Widget theme: started working on removing blue border on focused buttons, since we have the dotted l

From: Lapo Calamandrei <lapo src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-themes-standard] Widget theme: started working on removing blue border on focused buttons, since we have the dotted l
Date: Thu, 2 Aug 2012 14:54:16 +0000 (UTC)
commit 3d37f8d03da7c887ad4be9c1e9ef1efee35e8527
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Thu Aug 2 16:53:56 2012 +0200

    Widget theme: started working on removing blue border on focused buttons, since we have the dotted line which works better, this is quite a huge change and it needs a lot of testing, so please do. Note that we can axe a lot of selectors from the css this way, big win.

 themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css |    5 +-
 .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css   |   16 +---
 themes/Adwaita/gtk-3.0/gtk-widgets-borders.css     |   19 +---
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |  118 ++++++++++----------
 4 files changed, 65 insertions(+), 93 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index 3a17169..bc222dd 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -2,10 +2,7 @@
 .button,
 .toolbar .button.raised,
 .toolbar .raised .button,
-.toolbar .button.raised:focus,
-.toolbar .raised .button:focus,
-.toolbar GtkComboBox .button,
-.toolbar GtkComboBox .button:focus {
+.toolbar GtkComboBox .button {
     background-image: linear-gradient(to bottom, 
                                       @button_gradient_color_a, 
                                       @button_gradient_color_b 40%,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
index 6bc24d9..091ec3a 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
@@ -27,7 +27,6 @@ GtkSwitch.trough {
 /* focused element borders */
 .entry:focus,
 GtkComboBox.combobox-entry .entry:focus,
-.button:focus:active,
 .button.default:active,
 GtkSwitch.trough:active { 
     border-image: url("borders/generic-border-focused-dark.svg") 3 3 4 3 / 3px 3px 4px 3px stretch;
@@ -47,7 +46,6 @@ GtkSwitch.trough:active {
 }
 
 /* focused button borders */
-.button:focus,
 .button.default { 
     border-image: url("borders/button-border-focused-dark.svg") 3 3 4 3 / 3px 3px 4px 3px stretch;
     border-radius: 3px;
@@ -100,16 +98,10 @@ GtkSwitch.trough:active {
 
 /* primary toolbar - focused element borders */
 .primary-toolbar .entry:focus,
-.primary-toolbar .button:active:focus,
 .primary-toolbar GtkComboBox.combobox-entry .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .button:focus,
-.primary-toolbar .button.raised:focus:active,
-.primary-toolbar .raised .button:focus:active,
 .primary-toolbar .button.raised.default:active,
 .primary-toolbar .raised .button.default:active,
-.inline-toolbar.toolbar .button:focus:active,
-.inline-toolbar.toolbar .button.default:active,
-.primary-toolbar GtkComboBox .button:active:focus { 
+.inline-toolbar.toolbar .button.default:active { 
     border-image: url("borders/primary-toolbar-generic-border-focused-dark.svg") 4 / 4px stretch;
     border-radius: 3px;
     border-width: 2px;
@@ -130,13 +122,9 @@ GtkSwitch.trough:active {
 }
 
 /* primary toolbar - focused button borders */
-.primary-toolbar .button.raised:focus,
 .primary-toolbar .button.raised.default,
-.primary-toolbar .raised .button:focus,
 .primary-toolbar .raised .button.default,
-.inline-toolbar.toolbar .button:focus,
-.inline-toolbar.toolbar .button.default,
-.primary-toolbar GtkComboBox .button:focus { 
+.inline-toolbar.toolbar .button.default { 
     border-image: url("borders/primary-toolbar-button-border-focused-dark.svg") 4 / 4px stretch;
     border-radius: 3px;
     border-width: 2px;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index 2d0226f..be537d8 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -27,7 +27,6 @@ GtkSwitch.trough {
 /* focused element borders */
 .entry:focus,
 GtkComboBox.combobox-entry .entry:focus,
-.button:focus:active,
 .button.default:active,
 GtkSwitch.trough:active { 
     border-image: url("borders/generic-border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px stretch;
@@ -47,7 +46,6 @@ GtkSwitch.trough:active {
 }
 
 /* focused button borders */
-.button:focus,
 .button.default { 
     border-image: url("borders/button-border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px stretch;
     border-radius: 3px;
@@ -66,8 +64,7 @@ GtkSwitch.trough:active {
 }
 
 /* tooltip focused elements borders */
-.tooltip .entry:focus,
-.tooltip .button:focus {
+.tooltip .entry:focus {
     border-image: url("borders/tooltip-generic-border-focused.svg") 3 / 3px stretch;
     border-width: 1px;
     border-style: solid;
@@ -100,16 +97,10 @@ GtkSwitch.trough:active {
 
 /* primary toolbar - focused element borders */
 .primary-toolbar .entry:focus,
-.primary-toolbar .button:active:focus,
 .primary-toolbar GtkComboBox.combobox-entry .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .button:focus,
-.primary-toolbar .button.raised:focus:active,
-.primary-toolbar .raised .button:focus:active,
 .primary-toolbar .button.raised.default:active,
 .primary-toolbar .raised .button.default:active,
-.inline-toolbar.toolbar .button:focus:active,
-.inline-toolbar.toolbar .button.default:active,
-.primary-toolbar GtkComboBox .button:active:focus { 
+.inline-toolbar.toolbar .button.default:active { 
     border-image: url("borders/primary-toolbar-generic-border-focused.svg") 4 / 4px stretch;
     border-radius: 3px;
     border-width: 2px;
@@ -130,13 +121,9 @@ GtkSwitch.trough:active {
 }
 
 /* primary toolbar - focused button borders */
-.primary-toolbar .button.raised:focus,
 .primary-toolbar .button.raised.default,
-.primary-toolbar .raised .button:focus,
 .primary-toolbar .raised .button.default,
-.inline-toolbar.toolbar .button:focus,
-.inline-toolbar.toolbar .button.default,
-.primary-toolbar GtkComboBox .button:focus { 
+.inline-toolbar.toolbar .button.default { 
     border-image: url("borders/primary-toolbar-button-border-focused.svg") 4 / 4px stretch;
     border-radius: 3px;
     border-width: 2px;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index b7c6538..2a6ccef 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -1044,8 +1044,8 @@ GtkComboBox.combobox-entry .button {
 .linked .button:first-child,
 .linked .button:active:first-child,
 .linked .button:active:hover:first-child,
-.linked .button:focus:first-child,
-.linked .button:focus:active:first-child,
+/*.linked .button:focus:first-child,
+.linked .button:focus:active:first-child,*/
 .linked .button:insensitive:first-child {
     border-right-width: 0;
     border-image-width: 3px 0 4px 3px;
@@ -1058,8 +1058,8 @@ GtkComboBox.combobox-entry .button {
 .linked .button:last-child,
 .linked .button:active:last-child,
 .linked .button:active:hover:last-child,
-.linked .button:focus:last-child,
-.linked .button:focus:active:last-child,
+/*.linked .button:focus:last-child,
+.linked .button:focus:active:last-child,*/
 .linked .button:insensitive:last-child {
     border-left-width: 0;
     border-image-width: 3px 3px 4px 0;
@@ -1072,8 +1072,8 @@ GtkComboBox.combobox-entry .button {
 .linked .button:only-child,
 .linked .button:active:only-child,
 .linked .button:active:hover:only-child,
-.linked .button:focus:only-child,
-.linked .button:focus:active:only-child,
+/*.linked .button:focus:only-child,
+.linked .button:focus:active:only-child,*/
 .linked .button:insensitive:only-child {
     border-right-width: 1px;
     border-left-width: 1px;
@@ -1086,8 +1086,8 @@ GtkComboBox.combobox-entry .button {
 .linked.vertical .button,
 .linked.vertical .button:active,
 .linked.vertical .button:active:hover,
-.linked.vertical .button:focus,
-.linked.vertical .button:focus:active,
+/*.linked.vertical .button:focus,
+.linked.vertical .button:focus:active,*/
 .linked.vertical .button:insensitive {
     border-top-width: 0;
     border-bottom-width: 0;
@@ -1100,8 +1100,8 @@ GtkComboBox.combobox-entry .button {
 .linked.vertical .button:first-child,
 .linked.vertical .button:active:first-child,
 .linked.vertical .button:active:hover:first-child,
-.linked.vertical .button:focus:first-child,
-.linked.vertical .button:focus:active:first-child,
+/*.linked.vertical .button:focus:first-child,
+.linked.vertical .button:focus:active:first-child,*/
 .linked.vertical .button:insensitive:first-child {
     border-bottom-width: 0;
     border-image-width: 3px 3px 0 3px;
@@ -1113,8 +1113,8 @@ GtkComboBox.combobox-entry .button {
 .linked.vertical .button:last-child,
 .linked.vertical .button:active:last-child,
 .linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:focus:last-child,
-.linked.vertical .button:focus:active:last-child,
+/*.linked.vertical .button:focus:last-child,
+.linked.vertical .button:focus:active:last-child,*/
 .linked.vertical .button:insensitive:last-child {
     border-top-width: 0;
     border-image-width: 0 3px 4px 3px;
@@ -1126,8 +1126,8 @@ GtkComboBox.combobox-entry .button {
 .linked.vertical .button:only-child,
 .linked.vertical .button:active:only-child,
 .linked.vertical .button:active:hover:only-child,
-.linked.vertical .button:focus:only-child,
-.linked.vertical .button:focus:active:only-child,
+/*.linked.vertical .button:focus:only-child,
+.linked.vertical .button:focus:active:only-child,*/
 .linked.vertical .button:insensitive:only-child {
     border-top-width: 1px;
     border-bottom-width: 1px;
@@ -1178,27 +1178,27 @@ GtkComboBox.combobox-entry .button {
 /* Middle button */
 .primary-toolbar .button.raised.linked,
 .primary-toolbar .button.raised.linked:active,
-.primary-toolbar .button.raised.linked:focus,
-.primary-toolbar .button.raised.linked:focus:active,
+/*.primary-toolbar .button.raised.linked:focus,
+.primary-toolbar .button.raised.linked:focus:active,*/
 .primary-toolbar .button.raised.linked:insensitive,
 .primary-toolbar .button.raised.linked:backdrop,
 .primary-toolbar .raised.linked .button,
 .primary-toolbar .raised.linked .button:active,
-.primary-toolbar .raised.linked .button:focus,
-.primary-toolbar .raised.linked .button:focus:active,
+/*.primary-toolbar .raised.linked .button:focus,
+.primary-toolbar .raised.linked .button:focus:active,*/
 .primary-toolbar .raised.linked .button:insensitive,
 .primary-toolbar .raised.linked .button:backdrop,
 .inline-toolbar.toolbar .button,
 .inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar .button:focus,
-.inline-toolbar.toolbar .button:focus:active,
+/*.inline-toolbar.toolbar .button:focus,
+.inline-toolbar.toolbar .button:focus:active,*/
 .inline-toolbar.toolbar .button:insensitive,
 .inline-toolbar.toolbar .button:backdrop,
 .inline-toolbar.toolbar .button:backdrop:insensitive,
 .inline-toolbar.toolbar GtkToolButton .button,
 .inline-toolbar.toolbar GtkToolButton .button:active,
-.inline-toolbar.toolbar GtkToolButton .button:focus,
-.inline-toolbar.toolbar GtkToolButton .button:focus:active,
+/*.inline-toolbar.toolbar GtkToolButton .button:focus,
+.inline-toolbar.toolbar GtkToolButton .button:focus:active,*/
 .inline-toolbar.toolbar GtkToolButton .button:insensitive,
 .inline-toolbar.toolbar GtkToolButton .button:backdrop,
 .inline-toolbar.toolbar GtkToolButton .button:backdrop:insensitive {
@@ -1211,27 +1211,27 @@ GtkComboBox.combobox-entry .button {
 /* Leftmost button */
 .primary-toolbar .button.raised.linked:first-child,
 .primary-toolbar .button.raised.linked:active:first-child,
-.primary-toolbar .button.raised.linked:focus:first-child,
-.primary-toolbar .button.raised.linked:focus:active:first-child,
+/*.primary-toolbar .button.raised.linked:focus:first-child,
+.primary-toolbar .button.raised.linked:focus:active:first-child,*/
 .primary-toolbar .button.raised.linked:insensitive:first-child,
 .primary-toolbar .button.raised.linked:backdrop:first-child,
 .primary-toolbar .raised.linked .button:first-child,
 .primary-toolbar .raised.linked .button:active:first-child,
-.primary-toolbar .raised.linked .button:focus:first-child,
-.primary-toolbar .raised.linked .button:focus:active:first-child,
+/*.primary-toolbar .raised.linked .button:focus:first-child,
+.primary-toolbar .raised.linked .button:focus:active:first-child,*/
 .primary-toolbar .raised.linked .button:insensitive:first-child,
 .primary-toolbar .raised.linked .button:backdrop:first-child,
 .inline-toolbar.toolbar .button:first-child,
 .inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar .button:focus:first-child,
-.inline-toolbar.toolbar .button:focus:active:first-child,
+/*.inline-toolbar.toolbar .button:focus:first-child,
+.inline-toolbar.toolbar .button:focus:active:first-child,*/
 .inline-toolbar.toolbar .button:insensitive:first-child,
 .inline-toolbar.toolbar .button:backdrop:first-child,
 .inline-toolbar.toolbar .button:backdrop:insensitive:first-child,
 .inline-toolbar.toolbar GtkToolButton:first-child .button,
 .inline-toolbar.toolbar GtkToolButton:first-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:focus,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:focus:active,
+/*.inline-toolbar.toolbar GtkToolButton:first-child .button:focus,
+.inline-toolbar.toolbar GtkToolButton:first-child .button:focus:active,*/
 .inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive,
 .inline-toolbar.toolbar GtkToolButton:first-child .button:backdrop,
 .inline-toolbar.toolbar GtkToolButton:first-child .button:backdrop:insensitive {
@@ -1245,27 +1245,27 @@ GtkComboBox.combobox-entry .button {
 /* Rightmost button */
 .primary-toolbar .button.raised.linked:last-child,
 .primary-toolbar .button.raised.linked:active:last-child,
-.primary-toolbar .button.raised.linked:focus:last-child,
-.primary-toolbar .button.raised.linked:focus:active:last-child,
+/*.primary-toolbar .button.raised.linked:focus:last-child,
+.primary-toolbar .button.raised.linked:focus:active:last-child,*/
 .primary-toolbar .button.raised.linked:insensitive:last-child,
 .primary-toolbar .button.raised.linked:backdrop:last-child,
 .primary-toolbar .raised.linked .button:last-child,
 .primary-toolbar .raised.linked .button:active:last-child,
-.primary-toolbar .raised.linked .button:focus:last-child,
-.primary-toolbar .raised.linked .button:focus:active:last-child,
+/*.primary-toolbar .raised.linked .button:focus:last-child,
+.primary-toolbar .raised.linked .button:focus:active:last-child,*/
 .primary-toolbar .raised.linked .button:insensitive:last-child,
 .primary-toolbar .raised.linked .button:backdrop:last-child,
 .inline-toolbar.toolbar .button:last-child,
 .inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:focus:last-child,
-.inline-toolbar.toolbar .button:focus:active:last-child,
+/*.inline-toolbar.toolbar .button:focus:last-child,
+.inline-toolbar.toolbar .button:focus:active:last-child,*/
 .inline-toolbar.toolbar .button:insensitive:last-child,
 .inline-toolbar.toolbar .button:backdrop:last-child,
 .inline-toolbar.toolbar .button:backdrop:insensitive:last-child,
 .inline-toolbar.toolbar GtkToolButton:last-child .button,
 .inline-toolbar.toolbar GtkToolButton:last-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:focus,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:focus:active,
+/*.inline-toolbar.toolbar GtkToolButton:last-child .button:focus,
+.inline-toolbar.toolbar GtkToolButton:last-child .button:focus:active,*/
 .inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive,
 .inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop,
 .inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop:insensitive {
@@ -1279,15 +1279,15 @@ GtkComboBox.combobox-entry .button {
 /* Single button */
 .inline-toolbar.toolbar .button:only-child,
 .inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar .button:focus:only-child,
-.inline-toolbar.toolbar .button:focus:active:only-child,
+/*.inline-toolbar.toolbar .button:focus:only-child,
+.inline-toolbar.toolbar .button:focus:active:only-child,*/
 .inline-toolbar.toolbar .button:insensitive:only-child,
 .inline-toolbar.toolbar .button:backdrop:only-child,
 .inline-toolbar.toolbar .button:backdrop:insensitive:only-child,
 .inline-toolbar.toolbar GtkToolButton:only-child .button,
 .inline-toolbar.toolbar GtkToolButton:only-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:focus,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:focus:active,
+/*.inline-toolbar.toolbar GtkToolButton:only-child .button:focus,
+.inline-toolbar.toolbar GtkToolButton:only-child .button:focus:active,*/
 .inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive,
 .inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop,
 .inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive {
@@ -2156,9 +2156,9 @@ GtkOverlay.osd {
 }
 
 .osd .button,
-.osd .button:active,
+.osd .button:active /*,
 .osd .button:focus,
-.osd .button:focus:active {
+.osd .button:focus:active*/ {
     border-width: 1px;
     border-style: solid;
     border-image: none;
@@ -2282,8 +2282,8 @@ GtkOverlay.osd {
     background-color: @osd_bg_backdrop;
 }
 
-.osd.toolbar .button,
-.osd.toolbar .button:focus {
+.osd.toolbar .button /*,
+.osd.toolbar .button:focus*/ {
     padding: 4px;
     border-width: 1px 0;
     border-radius: 0;
@@ -2717,29 +2717,29 @@ GtkInfoBar .entry:focus,
 GtkInfoBar .button,
 GtkInfoBar .button:insensitive,
 GtkInfoBar .button:active,
-GtkInfoBar .button:focus,
-GtkInfoBar .button:active:focus,
+/*GtkInfoBar .button:focus,
+GtkInfoBar .button:active:focus,*/
 .info .entry,
 .info .entry:focus,
 .info .button,
 .info .button:insensitive,
 .info .button:active,
-.info .button:focus,
-.info .button:active:focus,
+/*.info .button:focus,
+.info .button:active:focus,*/
 .warning .entry,
 .warning .entry:focus,
 .warning .button,
 .warning .button:insensitive,
 .warning .button:active,
-.warning .button:focus,
-.warning .button:active:focus,
+/*.warning .button:focus,
+.warning .button:active:focus,*/
 .error .entry,
 .error .entry:focus,
 .error .button,
 .error .button:insensitive,
-.error .button:active,
+.error .button:active /*,
 .error .button:focus,
-.error .button:active:focus {
+.error .button:active:focus*/ {
     border-image: none;
 
     border-color: shade(@borders, 0.9);
@@ -2751,9 +2751,9 @@ GtkInfoBar .button:active:focus,
 .question .entry:focus,
 .question .button,
 .question .button:insensitive,
-.question .button:active,
+.question .button:active /*,
 .question .button:focus,
-.question .button:active:focus {
+.question .button:active:focus*/ {
     border-image: none;
 
     border-color: darker(@question_bg_color);
@@ -2965,9 +2965,9 @@ GsmFailWhaleDialog {
 }
 
 GsmFailWhaleDialog .button,
-GsmFailWhaleDialog .button:focus,
-GsmFailWhaleDialog .button:active,
-GsmFailWhaleDialog .button:active:focus {
+/*GsmFailWhaleDialog .button:focus,*/
+GsmFailWhaleDialog .button:active /*,
+GsmFailWhaleDialog .button:active:focus*/ {
     border-image: none;
     border-color: @borders;
     border-width: 1px;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]