GTK+-3.20 TG theme: enable outlines and some focus fixes

6 files changed, 283 insertions, 88 deletions

diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css
index 39005e00..08664706 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css
@@ -646,6 +646,7 @@ entry:focus,
 combobox entry:focus,
 button.flat:focus:checked,
 button:focus:active,
+button:focus,
 button.default:active,
 /* focused button borders */
 button.flat:focus,
@@ -664,12 +665,19 @@ toolbar.primary-toolbar button.raised:focus,
 toolbar.primary-toolbar button.raised.default,
 toolbar.primary-toolbar .raised button:focus,
 toolbar.primary-toolbar .raised button.default,
-toolbar.primary-toolbar combobox button:focus {
+toolbar.primary-toolbar combobox button:focus,
+toolbar.inline-toolbar.horizontal button.text-button:focus,
+combobox button.combo:focus,
+combobox .linked button.combo:focus {
     border-image: url("img/border-focused.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;
+    border-color: @button_default_border_color;
+    box-shadow: inset  0px  1px @button_default_box_shadow_color,
+                inset  1px  0px @button_default_box_shadow_color,
+                inset -1px  0px @button_default_box_shadow_color,
+                inset  0px -1px @button_default_box_shadow_color;
 }
 
 /* focused primary toolbar button borders */
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
index 52f4feb7..6bd8d502 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
@@ -10,8 +10,8 @@
     -WnckTasklist-fade-overlay-rect: 0;
     outline-color: @focus_border_color;
     outline-style: dashed;
-    outline-offset: -2px;
-    outline-width: 0px; /* disable ugly focus-line */
+    outline-offset: -3px;
+    outline-width: 1px;
     -gtk-outline-radius: 2px;
     -gtk-icon-style: regular; /* disable symbolic icons */
 }
@@ -871,6 +871,7 @@ scrolledwindow viewport.frame {
 button {
     min-height: 16px;
     min-width: 16px;
+    outline-style: none;
 }
 
 button,
@@ -1172,6 +1173,15 @@ button separator {
     border-width: 1px 1px 1px 0px;
 }
 
+.dialog-action-area.linked button.default,
+.dialog-action-area.linked button:focus {
+    border-color: @button_default_border_color;
+    box-shadow: inset  0px  1px @button_default_box_shadow_color,
+                inset  1px  0px @button_default_box_shadow_color,
+                inset -1px  0px @button_default_box_shadow_color,
+                inset  0px -1px @button_default_box_shadow_color;
+}
+
 /* Leftmost button */
 .dialog-action-area.linked button:first-child,
 .dialog-action-area.linked button:hover:first-child,
@@ -1186,6 +1196,15 @@ button separator {
     border-width: 1px 1px 1px 1px;
 }
 
+.dialog-action-area.linked button.default:first-child,
+.dialog-action-area.linked button:focus:first-child {
+    border-color: @button_default_border_color;
+    box-shadow: inset  0px  1px @button_default_box_shadow_color,
+                inset  1px  0px @button_default_box_shadow_color,
+                inset -1px  0px @button_default_box_shadow_color,
+                inset  0px -1px @button_default_box_shadow_color;
+}
+
 /* Rightmost button */
 .dialog-action-area.linked button:last-child,
 .dialog-action-area.linked button:hover:last-child,
@@ -1200,6 +1219,25 @@ button separator {
     border-width: 1px 1px 1px 0px;
 }
 
+.dialog-action-area.linked button.default:last-child,
+.dialog-action-area.linked button:focus:last-child {
+    border-color: @button_default_border_color;
+    box-shadow: inset  0px  1px @button_default_box_shadow_color,
+                inset  1px  0px @button_default_box_shadow_color,
+                inset -1px  0px @button_default_box_shadow_color,
+                inset  0px -1px @button_default_box_shadow_color;
+}
+
+/* single button */
+.dialog-action-area.linked button.default:only-child,
+.dialog-action-area.linked button:focus:only-child {
+    border-color: @button_default_border_color;
+    box-shadow: inset  0px  1px @button_default_box_shadow_color,
+                inset  1px  0px @button_default_box_shadow_color,
+                inset -1px  0px @button_default_box_shadow_color,
+                inset  0px -1px @button_default_box_shadow_color;
+}
+
 /*****************
  * GtkSpinButton *
  *****************/
@@ -1214,6 +1252,10 @@ spinbutton:focus {
     border-color: @spinbutton_border_color;
 }
 
+spinbutton:focus {
+    border-color: shade (@theme_selected_bg_color, 1.0);
+}
+
 spinbutton.horizontal > entry,
 spinbutton.horizontal > entry:focus {
     padding: 0px 10px 0px 3px;
@@ -1236,6 +1278,11 @@ spinbutton > button:focus:active {
     border-image: none;
 }
 
+spinbutton > button.default,
+spinbutton > button:focus {
+    box-shadow: none;
+}
+
 spinbutton > button:disabled {
     color: @internal_element_insensitive_color;
     border-color: @insensitive_border_color;
@@ -1404,6 +1451,7 @@ toolbar .raised button:hover,
 toolbar combobox button.combo:hover,
 toolbar.primary-toolbar button:hover,
 toolbar.primary-toolbar combobox button.combo:hover,
+toolbar.primary-toolbar combobox button.combo:focus:hover,
 colorchooser #add-color-button:hover {
     background-color: transparent;
     background-image: linear-gradient(to bottom,
@@ -1436,7 +1484,9 @@ toolbar combobox button.combo:checked:disabled {
 }
 
 /* Focused primary toolbar button background */
-toolbar.primary-toolbar button:focus {
+toolbar button:focus,
+toolbar.primary-toolbar button:focus,
+toolbar.primary-toolbar combobox button.combo:focus {
     background-image: linear-gradient(to bottom,
                       @pt_button_focus_gradient_a,
                       @pt_button_focus_gradient_b 50%,
@@ -1445,6 +1495,7 @@ toolbar.primary-toolbar button:focus {
 }
 
 /* Focused + prelit primary toolbar button background */
+toolbar button:focus:hover,
 toolbar.primary-toolbar button:focus:hover {
     background-image: linear-gradient(to bottom,
                       @pt_button_focus_hover_gradient_a,
@@ -1787,6 +1838,39 @@ notebook header.left tab:checked {
                       @notebook_active_tab_gradient_b);
 }
 
+/* outlines */
+notebook header tab:checked {
+    outline-color: @button_default_border_color;
+}
+
+notebook header.top tab:checked {
+    -gtk-outline-top-left-radius: 4px;
+    -gtk-outline-top-right-radius: 4px;
+    -gtk-outline-bottom-left-radius: 0px;
+    -gtk-outline-bottom-right-radius: 0px;
+}
+
+notebook header.bottom tab:checked {
+    -gtk-outline-top-left-radius: 0px;
+    -gtk-outline-top-right-radius: 0px;
+    -gtk-outline-bottom-left-radius: 4px;
+    -gtk-outline-bottom-right-radius: 4px;
+}
+
+notebook header.left tab:checked {
+    -gtk-outline-top-left-radius: 4px;
+    -gtk-outline-top-right-radius: 0px;
+    -gtk-outline-bottom-left-radius: 0px;
+    -gtk-outline-bottom-right-radius: 4px;
+}
+
+notebook header.right tab:checked {
+    -gtk-outline-top-left-radius: 0px;
+    -gtk-outline-top-right-radius: 4px;
+    -gtk-outline-bottom-left-radius: 4px;
+    -gtk-outline-bottom-right-radius: 0px;
+}
+
 /* close button styling */
 paned.horizontal notebook button.flat,
 notebook button.flat.small-button {
@@ -2622,6 +2706,12 @@ checkbutton:selected:focus {
     background-color: transparent;
 }
 
+checkbutton.text-button,
+radiobutton.text-button {
+	padding: 1px 2px 4px;
+	outline-offset: 0;
+}
+
 /************
  * Toolbars *
  ************/
@@ -3265,6 +3355,7 @@ switch slider {
     border-style: solid;
     border-color: @switch_slider_border_color;
     padding: 4px;
+    outline-color: @curent_color;
 }
 
 switch slider:disabled {
@@ -3290,6 +3381,13 @@ iconview.view.cell:selected:focus {
     border-radius: 4px;
 }
 
+iconview.cell:selected:focus {
+    border-radius: 3px;
+    border-color: alpha(@theme_text_color, 0.6);
+    border-width: 1px;
+    border-style: dashed;
+}
+
 list,
 view,
 .view, 
@@ -3354,6 +3452,7 @@ label selection:backdrop:disabled {
 treeview {
     -GtkTreeView-vertical-separator: 0;
     -GtkTreeView-expander-size: 13;
+    outline-color: alpha(currentColor, 0.6);
 }
 
 treeview.dnd {
@@ -3363,6 +3462,10 @@ treeview.dnd {
     border-style: solid;
 }
 
+treeview.view:selected:focus {
+	outline-color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.30);
+}
+
 /* column-headers */
 treeview header button {
     color: @internal_element_color;
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk.css
index a469a96b..5b9028be 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk.css
@@ -65,6 +65,9 @@
 @define-color button_gradient_c shade(@core_color_b, 1.04);
 @define-color button_gradient_d shade(@core_color_b, 0.98);
 
+@define-color button_default_border_color #b4bba3;
+@define-color button_default_box_shadow_color #779933;
+
 /* hover */
 
 @define-color button_hover_gradient_a @theme_base_color;
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/img/border-focused-ptb.svg b/desktop-themes/TraditionalGreen/gtk-3.0/img/border-focused-ptb.svg
index dfee1e5b..a208f1d3 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/img/border-focused-ptb.svg
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/img/border-focused-ptb.svg
@@ -7,62 +7,59 @@
    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:xlink="http://www.w3.org/1999/xlink"
    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="button-default-border-dark.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="border-focused-ptb.svg">
   <defs
      id="defs33224">
     <linearGradient
-       id="linearGradient7928">
+       id="linearGradient3837">
       <stop
-         style="stop-color:#505050;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         id="stop7930" />
+         id="stop3839" />
       <stop
-         id="stop3762"
-         offset="0.75114173"
-         style="stop-color:#aaaaaa;stop-opacity:1;" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         id="stop7932" />
+         id="stop3841" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7928"
-       id="linearGradient7934"
-       x1="5.0061774"
-       y1="8.9020138"
-       x2="14.827382"
-       y2="1.0544924"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998621,0,0,0.99998621,-15.999891,1.0988204e-4)" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#8e8e8e"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.172911"
-     inkscape:cx="7.2404508"
-     inkscape:cy="9.7450004"
+     inkscape:zoom="31.510446"
+     inkscape:cx="7.8104682"
+     inkscape:cy="7.9551192"
      inkscape:current-layer="layer1"
-     showgrid="true"
+     showgrid="false"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="849"
-     inkscape:window-height="744"
-     inkscape:window-x="242"
-     inkscape:window-y="148"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1201"
+     inkscape:window-height="786"
+     inkscape:window-x="278"
+     inkscape:window-y="152"
+     inkscape:window-maximized="0"
+     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>
@@ -80,14 +77,22 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <rect
-       ry="3"
-       rx="3"
-       y="0.500103"
-       x="-15.499897"
-       height="14.999794"
-       width="14.999794"
+       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:url(#linearGradient7934);stroke-width:1.00020635000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       transform="matrix(0,-1,1,0,0,0)" />
+       style="color:#000000;fill:none;stroke:#9cb786;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:#cccccc;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.25" />
   </g>
 </svg>
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/img/border-focused.svg b/desktop-themes/TraditionalGreen/gtk-3.0/img/border-focused.svg
index 76adc2c9..5c91b0c5 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/img/border-focused.svg
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/img/border-focused.svg
@@ -9,42 +9,66 @@
    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="svg12251"
+   sodipodi:docname="border-focused.svg"
+   inkscape:version="0.91 r13725"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="entry-border-focused-dark.svg">
+   id="svg33222"
+   height="16px"
+   width="16px">
   <defs
-     id="defs12253" />
+     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="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="2.9655938"
-     inkscape:cy="8"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1216"
-     inkscape:window-height="739"
-     inkscape:window-x="5"
+     showborder="false"
+     inkscape:showpageshadow="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     inkscape:window-maximized="0"
      inkscape:window-y="26"
-     inkscape:window-maximized="0" />
+     inkscape:window-x="368"
+     inkscape:window-height="722"
+     inkscape:window-width="899"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:cy="9.4241139"
+     inkscape:cx="-3.2430094"
+     inkscape:zoom="16"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#8e8e8e"
+     id="base">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2992"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata12256">
+     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></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -52,23 +76,29 @@
      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
-       style="fill:#ffffff;fill-opacity:0;stroke:#6c6c6c;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new"
-       id="rect5836"
-       width="15.000001"
-       height="15"
-       x="0.49999997"
-       y="-15.5"
-       rx="2.2980974"
-       ry="2.2980971"
-       transform="scale(1,-1)" />
+       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:#b4bba3;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <rect
-       transform="matrix(0,1,-1,0,0,0)"
-       style="opacity:1;fill:#6c6c6c;fill-opacity:0.27450982;stroke:none;display:inline;enable-background:new"
-       id="rect6042"
-       width="1"
+       ry="1.5"
+       rx="1.5"
+       y="1.5"
+       x="1.5"
        height="12"
-       x="1"
-       y="-14" />
+       width="13.000001"
+       id="rect17861-6"
+       style="color:#000000;fill:none;stroke:#779933;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.8" />
   </g>
 </svg>
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
index 00a345e1..23f3f715 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
@@ -33,7 +33,13 @@
 
 /* ComboBox views */
 .caja-navigation-window toolbar.primary-toolbar combobox button.combo {
-    padding: 4px 4px;
+    padding: 5px;
+    border-image: none;
+}
+
+.caja-navigation-window toolbar.primary-toolbar combobox button.combo:hover {
+    padding: 5px;
+    box-shadow: none;
 }
 
 .caja-canvas-item {
@@ -123,6 +129,27 @@ PanelSeparator {
     text-shadow: none;
 }
 
+/* outlines */
+window.background, /* selector where outlines are writen on GtkTrayIcon */
+.mate-panel-menu-bar menubar,
+.mate-panel-menu-bar PanelApplet,
+.mate-panel-menu-bar button,
+#PanelApplet > #clock-applet-button.flat.toggle,
+#PanelApplet > #showdesktop-button,
+#PanelApplet > wnck-tasklist > button,
+PanelApplet.wnck-applet .wnck-pager {
+    outline-offset: -2px;
+    outline-style: solid;
+    outline-color: shade (@theme_selected_bg_color, 0.8);
+    outline-width: 2px;
+}
+
+.mate-panel-menu-bar button {
+    -gtk-outline-radius: 3px;
+    box-shadow: none;
+    border-image: none;
+}
+
 /* main menu */
 /* set normal menubar button */
 .mate-panel-menu-bar menubar {
@@ -184,6 +211,12 @@ PanelSeparator {
                       @button_hover_gradient_c);
 }
 
+/* use only outlines if focused */
+.mate-panel-menu-bar #PanelApplet button:focus {
+    box-shadow: none;
+    border-image: none;
+}
+
 #PanelApplet > #clock-applet-button.flat.toggle {
    background-color: transparent;
    background-image: none;
@@ -216,6 +249,11 @@ PanelSeparator {
     border-image: none;
 }
 
+/* use only outlines if focused */
+#PanelApplet > #clock-applet-button.flat.toggle:focus {
+    box-shadow: none;
+    border-image: none;
+}
 
 #clock-applet-button.flat.toggle > box.horizontal > label {
     font: normal;
@@ -261,7 +299,7 @@ na-tray-applet {
     background-color: transparent;
     padding: 0;
     text-shadow: none;
-    -NaTrayApplet-icon-padding: 3;
+    -NaTrayApplet-icon-padding: 1px; /*any more and outlines get cut off*/
     -NaTrayApplet-icon-size: 16;
 }
 
@@ -501,3 +539,11 @@ GvcMixerDialog notebook.frame box scrolledwindow.frame {
     padding: 0;
 }
 
+/***********************
+ * mate-control-center *
+ ***********************/
+
+#MyControlCenter button.flat {
+    outline-style: dashed;
+}
+