1 files changed, 70 insertions, 70 deletions

diff --git a/gnome-shell/_common.scss b/gnome-shell/_common.scss
index c9bdc89..dd0ef43 100644
--- a/gnome-shell/_common.scss
+++ b/gnome-shell/_common.scss
@@ -75,6 +75,7 @@ StEntry {
   selection-background-color: $selected_bg_color;
   selected-color: $selected_fg_color;
   transition-duration: 300ms;
+  border-radius: 20px;
 
   @include entry(normal);
 
@@ -197,7 +198,7 @@ StScrollBar {
   color: $fg_color;
   background-color: transparentize($bg_color, 1);
   border: none;
-  border-image: url("misc/modal2.svg") 10 10 10 10;
+  border-image: url("misc/modal.svg") 10 10 10 10;
   padding: 0 6px 6px 6px;
 
   > * { padding: 14px; }
@@ -209,7 +210,7 @@ StScrollBar {
     background-color: opacify($osd_bg_color, 1);
     border: solid 0px rgba(0,0,0,0.3);
     border-top: 1px;
-    border-radius: 0px 0px 2px 2px;
+    border-radius: 0px 0px 1px 1px;
 
     .button {
       @include button(osd);
@@ -569,9 +570,9 @@ StScrollBar {
 
 .candidate-popup-boxpointer {
   -arrow-border-radius: 2px;
-  -arrow-background-color: $base_color;
+  -arrow-background-color: $panel_bg;
   -arrow-border-width: 1px;
-  -arrow-border-color: $borders_color;
+  -arrow-border-color: darken($panel_bg, 7%);
   -arrow-base: 5;
   -arrow-rise: 5;
 }
@@ -642,7 +643,7 @@ StScrollBar {
 .switcher-list {
   background: none;
   border: none;
-  border-image: url("misc/modal.svg") 10 10 35 14;
+  border-image: url("misc/bg.svg") 10 10 35 14;
   border-radius: 3px;
   padding: 20px;
 
@@ -709,7 +710,7 @@ StScrollBar {
   &-group { padding: 12px; }
 
   &-container {
-    border-image: url("misc/modal.svg") 10 10 35 14;
+    border-image: url("misc/bg.svg") 10 10 35 14;
     border-radius: 3px;
     padding: 20px;
     padding-bottom: 24px;
@@ -764,9 +765,11 @@ StScrollBar {
 //
 #panel {
   background-color: $panel_bg;
+  border-color: darken($panel_bg, 9%);
+  border-bottom-width: 1px;
   font-weight: bold;
   height: 2.1em;
-  min-height: 23px;
+  min-height: 26px;
 
   &.unlock-screen,
   &.login-screen,
@@ -775,6 +778,8 @@ StScrollBar {
     border-image: none;
   }
 
+  &:overview { background-color: transparentize(darken($panel_bg,10%), 0.15); }
+
   #panelLeft, #panelCenter { // spacing between activities<>app menu and such
     spacing: 8px;
   }
@@ -1369,34 +1374,30 @@ StScrollBar {
 //
 #dash {
   font-size: 1em;
-  color: $fg_color;
-  background-color: transparent;
-  padding: 10px 0px 10px 0px;
-  border: none;
+  color: $osd_fg_color;
+  background-color: transparentize($panel_bg, 0.08);
+  padding: 6px 0px 6px 0px;
+  border-color: transparentize(darken($panel_bg, 9%), 0.08);
   border-radius: 0px 3px 3px 0px;
-  border-image: url('dash/dash.svg') 6 11 10 10;
 
   .right &,
   &:rtl {
-    padding: 10px 0px 10px 0px;
+    padding: 6px 0px 6px 0px;
     border-radius: 3px 0 0 3px;
-    border-image: url('dash/dash-right.svg') 11 6 10 10;
   }
 
   .bottom & {
-    padding: 0px 10px 0px 10px;
+    padding: 0px 6px 0px 6px;
     border-radius: 3px 3px 0 0;
-    border-image: url('dash/dash-bottom.svg') 10 10 11 6;
   }
 
   .top & {
-    padding: 0px 10px 0px 10px;
+    padding: 0px 6px 0px 6px;
     border-radius: 0 0 3px 3px;
-    border-image: url('dash/dash-top.svg') 10 10 6 11;
   }
 
   .placeholder {
-    background-image: url("dash/dash-placeholder.svg");
+    background-image: url("misc/dash-placeholder.svg");
     background-size: contain;
     height: 24px;
   }
@@ -1408,11 +1409,11 @@ StScrollBar {
 }
 
 .dash-item-container > StWidget {
-  padding: 0px 10px 0px 3px;
+  padding: 0px 4px 0px 5px;
 
-  .right &, &:rtl { padding: 0px 3px 0px 10px; }
-  .bottom & { padding: 10px 0px 3px 0px; }
-  .top & { padding: 3px 0px 10px 0px; }
+  .right &, &:rtl { padding: 0px 5px 0px 4px; }
+  .bottom & { padding: 4px 0px 5px 0px; }
+  .top & { padding: 5px 0px 4px 0px; }
 }
 
 //osd tooltip
@@ -1434,31 +1435,21 @@ StScrollBar {
 #dash .app-well-app {
 
   .overview-icon,
-  .right & .overview-icon {
-    padding: 10px;
-  }
-
+  .right & .overview-icon,
   .bottom & .overview-icon,
   .top & .overview-icon {
     padding: 10px;
   }
 
   &:hover .overview-icon,
-  .right &:hover .overview-icon {
-    background-color: $selected_bg_color;
-  }
-
+  .right &:hover .overview-icon,
   .bottom &:hover .overview-icon,
   .top &:hover .overview-icon {
     background-color: $selected_bg_color;
   }
 
   &:active .overview-icon,
-  .right &:active .overview-icon {
-    box-shadow: none;
-    background-color: darken($selected_bg_color, 10%);
-  }
-
+  .right &:active .overview-icon,
   .bottom &:active .overview-icon,
   .top &:active .overview-icon {
     box-shadow: none;
@@ -1466,14 +1457,10 @@ StScrollBar {
   }
 
   &-running-dot {
-    width: 20px;
+    width: 11px;
     height: 2px;
-    margin-bottom: 4px;
+    margin-bottom: 6px;
     background-color: $selected_bg_color;
-
-    .bottom &, .top & {
-      margin-bottom: 0px;
-    }
   }
 }
 
@@ -1522,9 +1509,9 @@ StScrollBar {
 .app-view-control {
   padding: 4px 32px;
 
-  color: transparentize($selected_fg_color, 0.4);
+  color: transparentize($selected_fg_color, 0.2);
   background-color: transparentize(darken($panel_bg,10%), 0.15);
-  border-color: transparentize(darken($panel_bg,10%), 0.15);
+  border-color: transparentize($osd_fg_color, 0.7);
 
   &:hover {
     color: $selected_fg_color;
@@ -1556,7 +1543,7 @@ StScrollBar {
   &:active, &:checked { background-color: transparentize(darken($osd_bg_color,10%),.1); }
 
   &:focus, &:selected, &:hover {
-    background-color: transparentize($osd_fg_color,.9);
+    background-color: transparentize($osd_fg_color,.6);
     transition-duration: 200ms;
   }
 }
@@ -1572,13 +1559,13 @@ StScrollBar {
   &:active .overview-icon,
   &:checked .overview-icon {
     background-color: transparentize(darken($osd_bg_color,10%),.1);
-    box-shadow: inset 0 1px 2px $osd_borders_color;
+    box-shadow: inset 0 0 $selected_bg_color;
   }
 
   &:hover .overview-icon,
   &:focus .overview-icon,
   &:selected .overview-icon {
-    background-color: transparentize($osd_fg_color,.9);
+    background-color: transparentize($osd_fg_color,.6);
     transition-duration: 0ms;
     border-image: none;
     background-image: none;
@@ -1607,7 +1594,8 @@ StScrollBar {
 .app-well-app.app-folder {
 
   > .overview-icon {
-    background-color: $panel_bg;
+    background-color: transparentize(darken($panel_bg,10%), 0.15);
+    border: 1px solid transparentize($osd_fg_color, 0.7);
   }
 
   &:hover > .overview-icon {
@@ -1626,12 +1614,11 @@ StScrollBar {
 
 .app-folder-popup { //expanded collection
   -arrow-border-radius: 2px;
-  -arrow-background-color: transparent;
-  -arrow-border-color: transparent;
-  -arrow-border-width: 0px;
-  -arrow-base: 0px;
-  -arrow-rise: 0px;
-  border-image: url("misc/modal.svg") 10 10 35 14;
+  -arrow-background-color: transparentize(darken($panel_bg,10%), 0.15);
+  -arrow-border-color: transparentize($osd_fg_color, 0.7);
+  -arrow-border-width: 1px;
+  -arrow-base: 5;
+  -arrow-rise: 5;
 }
 .app-folder-popup-bin { padding: 5px; }
 .app-folder-icon {
@@ -1669,15 +1656,19 @@ StScrollBar {
 .workspace-thumbnails { //container ala dash
   visible-width: 40px; //amount visible before hover
   spacing: 11px;
-  padding: 18px 9px 18px 18px;
-  background-color: transparent;
-  border-image: url('dash/dash-right.svg') 10 10 10 10;
+  padding: 12px;
+  padding-right: 7px;
+  border-radius: 3px 0 0 3px;
+  background-color: transparentize($panel_bg, 0.08);
+  border-color: transparentize(darken($panel_bg, 9%), 0.08);
 
   &:rtl {
-    padding: 18px 18px 18px 9px;
-    border-image: url('dash/dash.svg') 10 10 10 10;
+    padding: 12px;
+    padding-left: 7px;
+    border-radius: 0 3px 3px 0;
   }
 }
+
 .workspace-thumbnail-indicator {
   border: 4px solid transparentize($selected_bg_color, 0.2);
   border-radius: 1px;
@@ -1712,7 +1703,7 @@ StScrollBar {
   margin: 5px;
   padding: 10px;
   border-radius: 2px;
-  color: $osd_fg_color;
+  color: $fg_color;
   background-color: $bg_color;
   border: 0px solid transparent;
   box-shadow: 0 1px 5px transparentize(black, 0.8);
@@ -1743,7 +1734,7 @@ StScrollBar {
 // Chat Bubbles
 .chat-body { spacing: 5px; }
 .chat-response { margin: 5px; }
-.chat-log-message { color: darken($osd_fg_color,10%); }
+.chat-log-message { color: $fg_color; }
 .chat-new-group { padding-top: 1em; }
 .chat-received {
   padding-left: 4px;
@@ -1753,7 +1744,7 @@ StScrollBar {
 
 .chat-sent {
   padding-left: 18pt;
-  color: darken($osd_fg_color, 15%);
+  color: $selected_bg_color;
 
   &:rtl { padding-left: 0; padding-right: 18pt; }
 }
@@ -1762,7 +1753,7 @@ StScrollBar {
   padding-left: 4px;
   font-size: 9pt;
   font-weight: bold;
-  color: darken($osd_fg_color,20%);
+  color: transparentize($fg_color, 0.4);
 
   &:rtl { padding-left: 0; padding-right: 4px; }
 }
@@ -1898,16 +1889,18 @@ $legacy_icon_size: 24px;
 .candidate-popup-content {
   padding: 0.5em;
   spacing: 0.3em;
+  color: $osd_fg_color;
 }
 
   .candidate-index {
     padding: 0 0.5em 0 0;
-    color: darken($fg_color,10%);
+    color: lighten($osd_fg_color, 10%);
   }
 
   .candidate-box {
     padding: 0.3em 0.5em 0.3em 0.5em;
     border-radius: 4px;
+    color: $osd_fg_color;
     &:selected,&:hover { background-color: $selected_bg_color; color: $selected_fg_color; }
   }
 
@@ -2132,12 +2125,14 @@ $legacy_icon_size: 24px;
   padding: 8px 8px 10px 8px;
   background-color: transparentize(black, 0.3);
   border: 1px solid black;
-	border-image: url("misc/osd.svg") 10 10 9 11;
+  border-image: url("misc/osd.svg") 10 10 9 11;
   border-radius: 2px;
+  color: $osd_fg_color;
+
   & > #Toolbar {
     padding: 3px;
-    border: 1px solid $borders_color;
-    background-color: $bg_color;
+    border: 1px solid darken($osd_bg_color, 7%);
+    background-color: transparent;
     border-radius: 0px;
   }
   .labels { spacing: 4px; }
@@ -2145,17 +2140,17 @@ $legacy_icon_size: 24px;
     -natural-hpadding: 12px;
     -minimum-hpadding: 6px;
     font-weight: bold;
-    color: transparentize($fg_color, 0.5);
+    color: $osd_fg_color;
     transition-duration: 100ms;
     padding-left: .3em;
     padding-right: .3em;
     &:hover {
-      color: $fg_color;
+      color: $selected_fg_color;
       text-shadow: black 0px 2px 2px;
     }
     &:selected {
       border-bottom-width: 0px;
-      color: $selected_fg_color;
+      color: $selected_bg_color;
       text-shadow: black 0px 2px 2px;
     }
   }
@@ -2165,8 +2160,13 @@ $legacy_icon_size: 24px;
 
   .lg-dialog {
     StEntry {
+      background-color: transparentize(black, 0.7);
+      color: $osd_fg_color;
       selection-background-color: $selected_bg_color;
       selected-color: $selected_fg_color;
+      border-color: transparentize($osd_fg_color, 0.7);
+
+      &:focus { border-color: $selected_bg_color; }
     }
     .shell-link {
       color: $link_color;