[gnome-themes-standard] Try to fix linked items



commit 01d2d408ad960efc0ebe2b3bc86c9946c0fe59fb
Author: William Jon McCann <william jon mccann gmail com>
Date:   Tue May 6 11:23:33 2014 -0400

    Try to fix linked items

 themes/Adwaita/gtk-3.0/gnome-applications.css |   78 -------------------------
 themes/Adwaita/gtk-3.0/gtk-widgets.css        |   71 +++++++++++++----------
 2 files changed, 40 insertions(+), 109 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gnome-applications.css b/themes/Adwaita/gtk-3.0/gnome-applications.css
index 39e8db9..547a56e 100644
--- a/themes/Adwaita/gtk-3.0/gnome-applications.css
+++ b/themes/Adwaita/gtk-3.0/gnome-applications.css
@@ -532,10 +532,6 @@ BaobabRingschart.subfolder-tip {
 EphyToolbar .entry:first-child,
 EphyToolbar .entry:focus:first-child,
 EphyToolbar .entry:backdrop:first-child {
-    border-image-width: 3px 0 4px 3px;
-    border-right-width: 0;
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0;
     padding-left: 4px;
     padding-right: 4px;
 }
@@ -543,89 +539,15 @@ EphyToolbar .entry:backdrop:first-child {
 EphyToolbar .entry:last-child,
 EphyToolbar .entry:focus:last-child,
 EphyToolbar .entry:backdrop:last-child {
-    border-image-width: 3px 3px 4px 0;
-    border-left-width: 0;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
     padding-left: 4px;
     padding-right: 4px;
 }
 
-EphyToolbar .entry:focus {
-    box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-                inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-                inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-EphyToolbar .entry:focus:last-child {
-    box-shadow: inset 0 2px alpha(@theme_selected_bg_color, 0.1),
-                inset 0 1px alpha(@theme_selected_bg_color, 0.1),
-                inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
 EphyToolbar .location-entry .button {
     color: @internal_element_color;
     -GtkButton-child-displacement-y: 0;
-    border-image-source: -gtk-scaled(url("borders/generic-border.png"),url("borders/generic-border 2 png"));
-    border-image-slice: 3 3 4 3;
-    border-image-repeat: stretch;
-    border-width: 1px 1px 2px 1px;
-    border-radius: 3px;
     padding-left: 4px;
     padding-right: 4px;
-    box-shadow: inset 1px 0 @inset_dark_color,
-                inset 0 1px @entry_inset,
-                inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-EphyToolbar .location-entry .button:backdrop,
-EphyToolbar .location-entry .button:backdrop:first-child,
-EphyToolbar .location-entry .button:backdrop:hover,
-EphyToolbar .location-entry .button:backdrop:hover:first-child {
-    border-image-source: -gtk-scaled 
(url("borders/generic-border-backdrop.png"),url("borders/generic-border-backdrop 2 png"));
-    box-shadow: none;
-    background-image: none;
-    background-color: @theme_unfocused_base_color;
-}
-
-EphyToolbar .location-entry .button:last-child {
-    border-image-width: 3px 3px 4px 0;
-    border-left-width: 0;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
-}
-
-EphyToolbar .location-entry .button:first-child {
-    border-image-width: 3px 0 4px 3px;
-    border-right-width: 0;
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0;
-    /* flip the box-shadow division*/
-    box-shadow: inset -1px 0 @inset_dark_color,
-                inset 0 1px @entry_inset,
-                inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-EphyToolbar .location-entry .button,
-EphyToolbar .location-entry .button:hover {
-    icon-shadow: none;
-    background-image: -gtk-gradient(linear,
-                                    left top, left bottom,
-                                    from(@entry_background_a),
-                                    to(@entry_background_b));
-}
-
-EphyToolbar .location-entry .button:active,
-EphyToolbar .location-entry .button:active:hover {
-    background-image: -gtk-gradient(linear,
-                                    left top, left bottom,
-                                    from(shade(@entry_background_a, 0.9)),
-                                    to(@entry_background_b));
-}
-
-EphyToolbar .location-entry .button:hover,
-EphyToolbar .location-entry .button:active {
-    color: @theme_text_color;
 }
 
 EphyNotebook.notebook {
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 4aa9353..b2261e4 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -1195,6 +1195,7 @@ GtkComboBox.combobox-entry .button {
 }
 
 /* generic button borders */
+.button,
 .button:active,
 .button:insensitive,
 .button.default:insensitive,
@@ -1333,35 +1334,51 @@ GtkSwitch.trough:backdrop,
 }
 
 /* linked entries/buttons */
+.linked {
+    border: 20px;
+    background-color: red;
+    background-image: none;
+}
 
-/* Set up shadows and hilights for button visual separation */
 .linked .entry {
-    box-shadow: inset -1px 0 @inset_dark_color;
+    border-radius: 3.5px 0 0 3.5px;
+    border-image: none;
+    border-width: 0px 0px 1px;
+    border-style: solid;
+    border-color: alpha(white, 0.5);
+    padding: 20px;
 }
 
-.linked .entry:focus {
-    box-shadow: inset 1px 0 @inset_dark_color,
-                inset -1px 0 @inset_dark_color,
-                inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-                inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-                inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
+.linked .entry:first-child {
+    box-shadow: inset 0 2px 2px alpha(@borders, 0.3),
+                inset .5px .5px shade(@borders, 0.8),
+                inset .5px -.5px shade(@borders, 0.8),
+                inset -1px 0 @inset_dark_color;
+}
 
+.linked .entry:focus,
+.linked .entry:focus:only-child {
+    box-shadow: inset .5px .5px 2px alpha(@theme_selected_bg_color, 0.3),
+                inset -.5px .5px 2px alpha(@theme_selected_bg_color, 0.3),
+                inset .5px -.5px 2px alpha(@theme_selected_bg_color, 0.3),
+                inset -.5px -.5px 2px alpha(@theme_selected_bg_color, 0.3),
+                inset .5px .5px alpha(@theme_selected_bg_color, 0.9),
+                inset -.5px .5px alpha(@theme_selected_bg_color, 0.9),
+                inset .5px -.5px alpha(@theme_selected_bg_color, 0.9),
+                inset -.5px -.5px alpha(@theme_selected_bg_color, 0.9);
 }
 
 .linked .entry:focus:first-child {
-    box-shadow: inset -1px 0 @inset_dark_color,
-                inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-                inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-                inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
+    box-shadow: inset .5px .5px 2px alpha(@theme_selected_bg_color, 0.8),
+                inset .5px -.5px 2px alpha(@theme_selected_bg_color, 0.8),
+                inset .5px .5px @theme_selected_bg_color,
+                inset .5px -.5px @theme_selected_bg_color;
 }
 
 .linked .entry:focus:last-child {
-    box-shadow: inset 1px 0 @inset_dark_color,
-                inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-                inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-                inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
+    box-shadow: inset -1px 2px alpha(@theme_selected_bg_color, 0.1),
+                inset -1px 1px alpha(@theme_selected_bg_color, 0.1),
+                inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
 /* Set up shadows and hilights for button visual separation */
@@ -1451,7 +1468,10 @@ GtkSwitch.trough:backdrop,
 .inline-toolbar.toolbar GtkToolButton:only-child > .button,
 .inline-toolbar.toolbar GtkToolButton:only-child > .button:backdrop,
 .inline-toolbar.toolbar GtkToolButton:only-child > .button:backdrop:insensitive {
-    box-shadow: none; 
+    box-shadow: inset .5px .5px @borders,
+                inset -.5px .5px @borders,
+                inset .5px -.5px @borders,
+                inset -.5px -.5px @borders;
 }
 
 /* remove inset from first-child and only-child active buttons */
@@ -1469,7 +1489,6 @@ GtkSwitch.trough:backdrop,
 }
 
 /* Middle button */
-.linked .entry,
 .linked .button,
 .linked .button:active,
 .linked .button:active:hover,
@@ -1481,7 +1500,6 @@ GtkSwitch.trough:backdrop,
 }
 
 /* Leftmost button */
-.linked .entry:first-child,
 .linked .button:first-child,
 .linked .button:active:first-child,
 .linked .button:active:hover:first-child,
@@ -1494,7 +1512,6 @@ GtkSwitch.trough:backdrop,
 }
 
 /* Rightmost button */
-.linked .entry:last-child,
 .linked .button:last-child,
 .linked .button:active:last-child,
 .linked .button:active:hover:last-child,
@@ -1507,7 +1524,6 @@ GtkSwitch.trough:backdrop,
 }
 
 /* Linked single button */
-.linked .entry:only-child,
 .linked .button:only-child,
 .linked .button:active:only-child,
 .linked .button:active:hover:only-child,
@@ -1515,11 +1531,10 @@ GtkSwitch.trough:backdrop,
     border-right-width: 1px;
     border-left-width: 1px;
     border-image-width: 3px 3px 4px 3px;
-    border-radius: 3px;
+    border-radius: 3.5px;
 }
 
 /* Middle button (vertical) */
-.linked.vertical .entry,
 .linked.vertical .button,
 .linked.vertical .button:active,
 .linked.vertical .button:active:hover,
@@ -1531,7 +1546,6 @@ GtkSwitch.trough:backdrop,
 }
 
 /* Top button (vertical) */
-.linked.vertical .entry:first-child,
 .linked.vertical .button:first-child,
 .linked.vertical .button:active:first-child,
 .linked.vertical .button:active:hover:first-child,
@@ -1542,7 +1556,6 @@ GtkSwitch.trough:backdrop,
 }
 
 /* Bottom button (vertical) */
-.linked.vertical .entry:last-child,
 .linked.vertical .button:last-child,
 .linked.vertical .button:active:last-child,
 .linked.vertical .button:active:hover:last-child,
@@ -1553,7 +1566,6 @@ GtkSwitch.trough:backdrop,
 }
 
 /* Linked single button (vertical) */
-.linked.vertical .entry:only-child,
 .linked.vertical .button:only-child,
 .linked.vertical .button:active:only-child,
 .linked.vertical .button:active:hover:only-child,
@@ -1644,7 +1656,6 @@ GtkSwitch.trough:backdrop,
 .primary-toolbar .button.raised.linked:active,
 .primary-toolbar .button.raised.linked:insensitive,
 .primary-toolbar .button.raised.linked:backdrop,
-.primary-toolbar .linked .entry,
 .primary-toolbar .linked .button,
 .primary-toolbar .linked .button:active,
 .primary-toolbar .linked .button:insensitive,
@@ -1672,7 +1683,6 @@ GtkSwitch.trough:backdrop,
 .primary-toolbar .button.raised.linked:active:first-child,
 .primary-toolbar .button.raised.linked:insensitive:first-child,
 .primary-toolbar .button.raised.linked:backdrop:first-child,
-.primary-toolbar .linked .entry:first-child,
 .primary-toolbar .linked .button:first-child,
 .primary-toolbar .linked .button:active:first-child,
 .primary-toolbar .linked .button:insensitive:first-child,
@@ -1701,7 +1711,6 @@ GtkSwitch.trough:backdrop,
 .primary-toolbar .button.raised.linked:active:last-child,
 .primary-toolbar .button.raised.linked:insensitive:last-child,
 .primary-toolbar .button.raised.linked:backdrop:last-child,
-.primary-toolbar .linked .entry:last-child,
 .primary-toolbar .linked .button:last-child,
 .primary-toolbar .linked .button:active:last-child,
 .primary-toolbar .linked .button:insensitive:last-child,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]