Merge branch 'master' into dark_variant

12 files changed, 27 insertions, 56 deletions

diff --git a/common/gnome-shell/3.16/_common.scss b/common/gnome-shell/3.16/_common.scss
index 5f9d48c..08a711c 100644
--- a/common/gnome-shell/3.16/_common.scss
+++ b/common/gnome-shell/3.16/_common.scss
@@ -25,8 +25,7 @@ $panel-corner-radius: 0px;
 // Globals
 //
 $font-size: 9;
-//$font-family: Cantarell, Sans-Serif;
-$font-family: Futura Bk bt, Sans-Serif;
+$font-family: Cantarell, Sans-Serif;
 $_bubble_bg_color: opacify($osd_bg_color,0.25);
 $_bubble_fg_color: $osd_fg_color;
 $_bubble_borders_color: transparentize($osd_fg_color,0.8);
diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css
index 76e83a9..8b46878 100644
--- a/common/gnome-shell/3.16/gnome-shell.css
+++ b/common/gnome-shell/3.16/gnome-shell.css
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 stage {
-  font-family: Futura Bk bt, Sans-Serif;
+  font-family: Cantarell, Sans-Serif;
   font-size: 9pt;
   color: #5c616c; }
 
diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg
index c20d97c..5918863 100644
--- a/common/gtk-2.0/assets.svg
+++ b/common/gtk-2.0/assets.svg
@@ -565,12 +565,12 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="478.52624"
-     inkscape:cy="293.00874"
+     inkscape:zoom="1"
+     inkscape:cx="275.83757"
+     inkscape:cy="331.30343"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="true"
+     showgrid="false"
      showborder="false"
      inkscape:window-width="1366"
      inkscape:window-height="720"
@@ -5403,5 +5403,14 @@
          id="rect6168-6"
          style="opacity:1;fill:#d7d8dd;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       y="-287.5"
+       x="-205.13783"
+       height="4"
+       width="4.0000124"
+       id="focus-line"
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.67346936"
+       inkscape:label="#rect6176-4-2" />
   </g>
 </svg>
diff --git a/common/gtk-2.0/assets.txt b/common/gtk-2.0/assets.txt
index 82bf432..9dd86d9 100644
--- a/common/gtk-2.0/assets.txt
+++ b/common/gtk-2.0/assets.txt
@@ -118,3 +118,4 @@ tab-right-active
 inline-toolbar
 toolbar
 menubar
+focus-line
diff --git a/common/gtk-2.0/assets/focus-line.png b/common/gtk-2.0/assets/focus-line.png
new file mode 100644
index 0000000..0f5ef9d
--- /dev/null
+++ b/common/gtk-2.0/assets/focus-line.png
diff --git a/common/gtk-2.0/gtkrc b/common/gtk-2.0/gtkrc
index 2dfebc4..d46640e 100644
--- a/common/gtk-2.0/gtkrc
+++ b/common/gtk-2.0/gtkrc
@@ -471,7 +471,7 @@ style "default" {
 
     image {
       function = FOCUS
-      file = "assets/null.png"
+      file = "assets/focus-line.png"
       border = { 1, 1, 1, 1 }
       stretch = TRUE
     }
@@ -970,7 +970,6 @@ style "menubar_item" {
       stretch = TRUE
     }
   }
-
 }
 
 style "button" {
@@ -1014,47 +1013,6 @@ style "button" {
   }
 }
 
-#style "button_nohilight" {
-#
-#  xthickness	= 4
-#  ythickness	= 4
-#
-#  engine "pixmap" {
-#
-#    image {
-#      function = BOX
-#      state = NORMAL
-#      file = "Buttons/button-default-nohilight.png"
-#      border = { 4, 4, 4, 4 }
-#      stretch = TRUE
-#    }
-#
-#    image {
-#      function = BOX
-#      state = PRELIGHT
-#      file = "Buttons/button-prelight-nohilight.png"
-#      border = { 4, 4, 4, 4 }
-#      stretch = TRUE
-#    }
-#
-#    image {
-#      function = BOX
-#      state = ACTIVE
-#      file = "Buttons/button-pressed-nohilight.png"
-#      border = { 4, 4, 4, 4 }
-#      stretch = TRUE
-#    }
-#
-#    image {
-#      function = BOX
-#      state = INSENSITIVE
-#      file = "Buttons/button-insensitive-nohilight.png"
-#      border = { 4, 4, 4, 4 }
-#      stretch = TRUE
-#    }
-#  }
-#}
-
 style "checkbutton" {
 
   fg[PRELIGHT] = @text_color
@@ -2531,10 +2489,8 @@ widget_class "*<GtkComboBox>*<GtkSeparator>"                        style "combo
 widget_class "*HandleBox"                                           style "toolbar"
 widget_class "*<GtkTreeView>*<GtkButton>*"                          style "treeview_header"
 widget_class "*<GtkFileChooserDefault>*<GtkToolbar>"                style "inline_toolbar"
-#widget_class "*<GtkFileChooserDefault>*<GtkToolbar>*<GtkButton>"    style "button_nohilight"
 widget_class "*<GtkComboBoxEntry>*<GtkEntry>"                       style "combobox_entry"
 widget_class "*<GtkComboBoxEntry>*<GtkButton>"                      style "combobox_entry_button"
-#widget_class "*<GtkInfoBar>*<GtkButton>"                            style "button_nohilight"
 widget_class "*<GtkNotebook>*<GtkScrolledWindow>*<GtkViewport>"     style "notebook_viewport"
 
 # Entries in notebooks draw with notebook's base color, but not if there's
diff --git a/common/gtk-3.0/3.14/_applications.scss b/common/gtk-3.0/3.14/_applications.scss
index 425cbfb..9fed413 100644
--- a/common/gtk-3.0/3.14/_applications.scss
+++ b/common/gtk-3.0/3.14/_applications.scss
@@ -82,6 +82,7 @@ NautilusCanvasViewContainer.view .entry { border-radius: 3px; }
 
 .nautilus-desktop.nautilus-canvas-item {
   color: $selected_fg_color;
+  text-shadow: 1px 1px transparentize(black, 0.4);
 
   &:active { color: $fg_color; }
   &:selected { color: $selected_fg_color; }
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index fe074c4..ecff213 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -2414,7 +2414,8 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
   border-radius: 2px; }
 
 .nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item {
-  color: #ffffff; }
+  color: #ffffff;
+  text-shadow: 1px 1px rgba(0, 0, 0, 0.6); }
   .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active {
     color: #5c616c; }
   .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected {
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index 90234ba..81b7d19 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -2414,7 +2414,8 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
   border-radius: 2px; }
 
 .nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item {
-  color: #ffffff; }
+  color: #ffffff;
+  text-shadow: 1px 1px rgba(0, 0, 0, 0.6); }
   .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active {
     color: #5c616c; }
   .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected {
diff --git a/common/gtk-3.0/3.16/_applications.scss b/common/gtk-3.0/3.16/_applications.scss
index 2f5c9fc..be4ca67 100644
--- a/common/gtk-3.0/3.16/_applications.scss
+++ b/common/gtk-3.0/3.16/_applications.scss
@@ -82,6 +82,7 @@ NautilusCanvasViewContainer.view .entry { border-radius: 3px; }
 
 .nautilus-desktop.nautilus-canvas-item {
   color: $selected_fg_color;
+  text-shadow: 1px 1px transparentize(black, 0.4);
 
   &:active { color: $fg_color; }
   &:selected { color: $selected_fg_color; }
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index 6ab3414..6712986 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -2325,7 +2325,8 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
   border-radius: 2px; }
 
 .nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item {
-  color: #ffffff; }
+  color: #ffffff;
+  text-shadow: 1px 1px rgba(0, 0, 0, 0.6); }
   .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active {
     color: #5c616c; }
   .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected {
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index 98f79d4..2eab11e 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -2325,7 +2325,8 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
   border-radius: 2px; }
 
 .nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item {
-  color: #ffffff; }
+  color: #ffffff;
+  text-shadow: 1px 1px rgba(0, 0, 0, 0.6); }
   .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active {
     color: #5c616c; }
   .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected {