TraditionalGreen GTK3: update to GTK3-3.12 from clearlook-phenix upstream

4 files changed, 52 insertions, 181 deletions

diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/applications.css b/desktop-themes/TraditionalGreen/gtk-3.0/applications.css
index 029a5495..00cecdbb 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/applications.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/applications.css
@@ -24,8 +24,38 @@
  * gedit *
  *********/
 
-GeditFloatingSlider .entry.not-found:focus {
-	border-image: url("img/border-error.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+GeditMultiNotebook .notebook {
+	border-width: 0px 0px 1px 1px;
+}
+
+GeditPanel.horizontal .notebook {
+	border-width: 0px 1px 1px 1px;
+}
+
+GeditPanel.vertical .notebook {
+	border-width: 0px 1px 1px 1px;
+}
+
+GeditViewFrame .gedit-search-slider {
+	padding: 4px;
+	border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+}
+
+GeditViewFrame .gedit-search-slider .not-found {
+	background-color: @error_bg_color;
+	color: @error_fg_color;
+}
+
+GeditViewFrame .gedit-search-slider .not-found:selected {
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
+}
+
+.gedit-search-entry-occurrences-tag {
+	color: @theme_text_color;
+	background-color: @theme_bg_color;
+	margin: 2px 0px 2px 2px;
+	padding: 2px;
 }
 
 /*******************
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
index eb2bd72e..ee1dd5e4 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
@@ -602,7 +602,7 @@ GtkComboBox.combobox-entry .button:active,
 	                  @trough_gradient_b 4px);
 }
 
-/* Prelit button background */
+/* Prelight button background */
 .button:hover,
 .spinbutton .button:hover,
 .toolbar .button:hover,
@@ -615,8 +615,8 @@ GtkComboBox.combobox-entry .button:hover,
 GtkColorChooserWidget #add-color-button:hover {
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
-	                  @button_hover_gradient_a 50%,
-	                  @button_hover_gradient_b 50%,
+	                  @button_hover_gradient_a 5%,
+	                  @button_hover_gradient_b 95%,
 	                  @button_hover_gradient_c);
 }
 
@@ -1068,6 +1068,7 @@ GtkTreeMenu .menuitem {
 }
 
 .menu {
+	font: normal;
 	background-color: @menu_bg_color;
 	color: @menu_fg_color;
 	padding: 1px;
@@ -1105,7 +1106,7 @@ GtkTreeMenu .menuitem {
 /* this controls the general appearance of the menubar */
 .menubar {
 	border-style: none;
-	padding: 0px;
+	padding: 1px;
 	-GtkWidget-window-dragging: true;
 	-GtkMenuBar-internal-padding: 1;
 	background-image: -gtk-gradient (linear,
@@ -1769,98 +1770,43 @@ GtkInfoBar:last-child,
  * Titlebar *
  ************/
 
-/* this is the default titlebar that is added by GTK
- * when client-side decorations are in use and the application
- * did not set a custom titlebar.
- */
-.titlebar.default-decoration {
-    border: none;
-    box-shadow: none;
-}
-
 .titlebar {
 	background-image: linear-gradient(to bottom,
-	                  shade (@theme_selected_bg_color, 1.20),
-	                  @theme_selected_bg_color);
+	                  @theme_base_color,
+	                  @theme_bg_color);
 	background-color: transparent;
 	border-radius: 7px 7px 0px 0px;
 	border-bottom: 1px solid;
 	border-color: shade(@border_color, 1.30);
-    color: @theme_selected_fg_color;
-    font: Bold 10;
-    text-shadow: 1px 1px 1px 1px @theme_base_color;
 }
 
- /* Colour when unfocused? */
-.titlebar:backdrop {
-    text-shadow: none;
-    background-image: none;
-    background-color: @theme_bg_color;
-}
-
-.titlebar .titlebutton {
+.titlebar > * {
 	background: none;
-	border-image: none;
-	padding: 5px 5px 6px 5px;
-}
-
-.titlebar .titlebutton:hover {
-	background-image: linear-gradient(to bottom,
-	                  shade (@theme_selected_bg_color, 1.30),
-	                  shade (@theme_selected_bg_color, 1.05));
-	border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-	border-radius: 3px;
-	border-width: 1px 1px 2px 1px;
-	border-style: solid;
-	border-color: transparent;
-	padding: 5px 5px 6px 5px;
 }
 
-.titlebar .titlebutton:active {
-	background-image: linear-gradient(to bottom,
-	                  shade (@theme_selected_bg_color, 1.05),
-	                  shade (@theme_selected_bg_color, 1.25));
-	border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-    color: @theme_fg_color;
-    icon-shadow: none;
-}
-
-.titlebar .right .titlebutton:first-child {
-    border-left: 1px solid @menu_separator;
-}
-
-.titlebar .right .titlebutton:last-child {
-
+.tiled .titlebar {
+	border-radius: 0;
 }
 
-.titlebar .left .titlebutton:last-child {
-    border-right: 1px solid @menu_separator;
+.maximized .titlebar {
+	border-radius: 0;
 }
 
-.titlebar .left .titlebutton:first-child {
-
+.titlebar .title {
+	font: Bold;
 }
 
-.titlebar .titlebutton:backdrop {
-    background: none;
-    color: @theme_text_color;
-    border-image: none;
-    icon-shadow: none;
+.titlebar .titlebutton {
+	background: none;
+	border-image: none;
+	padding: 5px 5px 6px 5px;
 }
 
 .window-frame {
-	border-width: 1px;
+	border-width: 0px;
 	border-radius: 7px 7px 0 0;
 	border-style: solid;
-    background-color: @theme_bg_color;
-/* dummy to avoid resizing mate-appearence-properties if theme changed */
-    box-shadow: 0px 0px 0px 0px;
-	margin: 10px;
-}
-
-.window-frame:backdrop {
-/* dummy to avoid resizing mate-appearence-properties if theme changed */
-    box-shadow: 0 0 0 2px @insensitive_text_shadow_color, 0 2px 5px 1px @insensitive_text_shadow_color;
+	margin: 0px;
 }
 
 /************
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/img/Makefile.am b/desktop-themes/TraditionalGreen/gtk-3.0/img/Makefile.am
index f3414644..5c09a356 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/img/Makefile.am
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/img/Makefile.am
@@ -3,7 +3,6 @@ THEME_NAME=TraditionalGreen
 themedir = $(datadir)/themes/$(THEME_NAME)/gtk-3.0/img
 
 theme_DATA = \
-	border-error.svg \
 	border-focused-ptb.svg \
 	border-focused.svg \
 	border-focused-switch.svg \
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/img/border-error.svg b/desktop-themes/TraditionalGreen/gtk-3.0/img/border-error.svg
deleted file mode 100755
index 6532d220..00000000
--- a/desktop-themes/TraditionalGreen/gtk-3.0/img/border-error.svg
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg33222"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="border-error.svg">
-  <defs
-     id="defs33224">
-    <linearGradient
-       id="linearGradient3837">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3839" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3841" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#8e8e8e"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.768656"
-     inkscape:cx="7.9987245"
-     inkscape:cy="7.9987245"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="951"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     inkscape:showpageshadow="false"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2992"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata33227">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.6"
-       d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4"
-       id="rect17861-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssssc" />
-    <rect
-       ry="2.5"
-       rx="2.5000005"
-       y="0.5"
-       x="0.5"
-       height="13.999999"
-       width="15"
-       id="rect17861"
-       style="color:#000000;fill:none;stroke:#9b3636;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       ry="1.5"
-       rx="1.5"
-       y="1.5"
-       x="1.5"
-       height="12"
-       width="13.000001"
-       id="rect17861-6"
-       style="color:#000000;fill:none;stroke:#9b3636;stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.25000000000000000" />
-  </g>
-</svg>