Merge branch 'master' of https://github.com/horst3180/Arc-theme

horst3180 · Sep 21, 2015 · 519ff85 · 519ff85
2 parents 2413f6e + dee39f4
commit 519ff85
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css
@@ -192,7 +192,7 @@ StScrollBar {
     border-bottom-width: 0;
     color: #BAC3CF;
     background-color: rgba(53, 57, 69, 0.95);
-    border-color: rgba(42, 45, 55, 0.95); }
+    border-color: rgba(35, 38, 46, 0.95); }
     .modal-dialog-linked-button:hover {
       background-color: rgba(64, 69, 83, 0.95); }
     .modal-dialog-linked-button:focus {

diff --git a/common/gnome-shell/3.18/gnome-shell.css b/common/gnome-shell/3.18/gnome-shell.css
@@ -185,10 +185,10 @@ StScrollBar {
   .modal-dialog .modal-dialog-content-box {
     padding: 20px 10px 10px 10px; }
   .modal-dialog-linked-button {
-    height: 38px;
+    height: 39px;
     padding: 0;
     box-shadow: inset 0 0 black;
-    border-top-width: 1px;
+    border-top-width: 0px;
     border-bottom-width: 0;
     color: #BAC3CF;
     background-color: rgba(53, 57, 69, 0.95);

diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss
@@ -213,15 +213,15 @@ StScrollBar {
   }
 
   &-linked-button {
-    height: 38px;
+    height: if($variant=='light', 39px, 38px);
     padding: 0;
     box-shadow: inset 0 0 black;
-    border-top-width: 1px;
+    border-top-width: if($variant=='light', 0px, 1px);
     border-bottom-width: 0;
 
     color: $osd_fg_color;
     background-color: $osd_bg_color;
-    border-color: darken($osd_bg_color, 5%);
+    border-color: if($variant=='light', darken($osd_bg_color, 5%), darken($osd_bg_color, 8%));
 
     &:hover { background-color: lighten($osd_bg_color, 5%); }
     &:focus { color: $selected_bg_color; }