Merge pull request #9 from shimmerproject/master

upstream fixes
Antergos · Nov 3, 2015 · f4dfcf8 · f4dfcf8
2 parents 53c9d48 + c61729d
commit f4dfcf8
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 37 deletions.
diff --git a/gtk-3.0/scss/apps/_nautilus.scss b/gtk-3.0/scss/apps/_nautilus.scss
@@ -23,6 +23,11 @@
 
         .sidebar .frame { border: 0; }
 
+        .sidebar-icon {
+            padding-left: $spacing;
+            padding-right: $spacing;
+        }
+
         GtkPaned {
             border-width: 0 1px 0 0;
             border-style: solid;

diff --git a/gtk-3.0/scss/apps/_unity-greeter.scss b/gtk-3.0/scss/apps/_unity-greeter.scss
@@ -5,35 +5,33 @@
 @include exports("unity-greeter") {
 
 
-.lightdm.menu {
-    background-image: none;
-    background-color: alpha($black, 0.6);
-    border-color: alpha($white, 0.2);
-    border-radius: 4px;
-    padding: 1px;
-
-    color: $white;
-}
-
-.lightdm-combo .menu {
-    background-color: shade($dark_bg_color, 1.08);
-    border-radius: 0px;
-    padding: 0px;
+    .lightdm.menu {
+        background-image: none;
+        background-color: fade-out($black, .4);
+        border-color: fade-out($white, .8);
+        border-radius: 4px;
+        padding: 1px;
 
-    color: $white;
-}
+        color: $white;
+    }
 
-.lightdm.menu .menuitem *,
-.lightdm.menu .menuitem.check:active,
-.lightdm.menu .menuitem.radio:active {
-    color: $white;
-}
+    .lightdm-combo .menu {
+        background-color: shade($dark_bg_color, 1.08);
+        border-radius: 0;
+        padding: 0;
+        color: $white;
+    }
 
-.lightdm.menubar {
-    background-image: none;
-    background-color: alpha(#00ff00, 0.5);
-}
+    .lightdm.menu .menuitem *,
+    .lightdm.menu .menuitem.check:active,
+    .lightdm.menu .menuitem.radio:active {
+        color: $white;
+    }
 
+    .lightdm.menubar *,    
+    .lightdm.menubar .menuitem {
+        padding: 2px;
+    }
 
     .lightdm-combo.combobox-entry .button,
     .lightdm-combo .cell,
@@ -42,16 +40,16 @@
 
     .lightdm.button{
         background-image: none;
-        background-color: alpha($black, 0.3);
-        border-color: alpha($white, 0.9);
+        background-color: fade-out($black, .7);
+        border-color: fade-out($white, .1);
         border-radius: 5px;
         padding: 5px;
         color: $white;
         }
     .lightdm.button:hover {
         background-image: none;
-        background-color: alpha($white, 0.3);
-        border-color: alpha($white, 0.6);
+        background-color: fade-out($white, .7);
+        border-color: fade-out($white, .4);
         border-radius: 5px;
         padding: 5px;
         color: $white;
@@ -63,8 +61,8 @@
 
     .lightdm.entry {
         background-image: none;
-        background-color: alpha($black, 0.3);
-        border-color: alpha($white, 0.6);
+        background-color: fade-out($black, .7);
+        border-color: fade-out($white, .4);
         border-radius: 5px;
         padding: 7px;
         color: $white;
@@ -77,13 +75,13 @@
         border-image: none;
     }
     .lightdm.entry:focused {
-        border-color: alpha($white, 0.6);
+        border-color: fade-out($white, .4);
         border-width: 1px;
         border-style: solid;
         color: $white;
     }
     .lightdm.entry:selected {
-        background-color: alpha($white, 0.2);
+        background-color: fade-out($white, .8);
     }
 
     @keyframes dashentry_spinner {
@@ -106,13 +104,13 @@
         border-width: 0;
     }
     .lightdm.toggle-button.selected:hover {
-        background-color: alpha($white, 0.3);
-        border-color: alpha($white, 0.3);
+        background-color: fade-out($white, .7);
+        border-color: fade-out($white, .7);
         border-width: 1px;
     }
     .lightdm.toggle-button.selected {
-        background-color: alpha($black, 0.3);
-        border-color: alpha($white, 0.3);
+        background-color: fade-out($black, .7);
+        border-color: fade-out($white, .7);
         border-width: 1px;
     }
 }