Gnome-Shell-3.24&3.26: [SearchEntry] Revert to previous styling

ceyhunn · Jul 28, 2017 · ab3b97f · ab3b97f
1 parent f37907f
commit ab3b97f
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 56 deletions.
diff --git a/shell/sass/gnome-shell/3.24/_common.scss b/shell/sass/gnome-shell/3.24/_common.scss
@@ -1969,45 +1969,36 @@ StScrollBar {
 // Search entry
 .search-entry { // use raised entry-box styling
   @include fontscaling($ref_size * 1.1);
-  width: 320px;
-  padding: 0;
-  border-radius: 100px;
+  width: if($eta == 'false', 400px, 340px);
+  padding: if($eta == 'false', 12px 0.6em, 12px 0.4em);
+  border-radius: 2px;
   border-color: transparent;
-  border-top: 1px solid if($nokto == 'false', $borders_highlight,
-                                              $panel_bg_color);
-  color: $secondary_fg_color;
-  background-color: if($nokto == 'false', $bg_color, $panel_bg_color);
-  font-weight: 500;
-  box-shadow: if($nokto == 'false', $z-depth-2, none);
+  border-top: 1px solid $borders_highlight;
+  color: $osd_dim_fg_color;
+  background-color: $osd_slight_fill_color;
+  font-weight: 400;
+  box-shadow: $z-depth-1;
+  transition-duration: $duration_medium;
 
   selection-background-color: $selected_bg_color;
   selected-color: $selected_fg_color;
 
-  StLabel { margin: 0 8px 7px; }
+  StLabel { margin-bottom: 0.1em; }
 
   &:hover,
   &:focus {
-    border-top: 1px solid if($nokto == 'false', $borders_highlight,
-                                                $panel_bg_color);
+    border-top: 1px solid if($nokto == 'false',
+                             $borders_highlight,
+                             shellopacity($borders_highlight, 0.5));
     color: $fg_color;
-    box-shadow: if($nokto == 'false', $z-depth-3, none);
-    transition-duration: $duration_medium;
+    background-color: if($nokto == 'false', $base_color, $panel_bg_color);
+    box-shadow: $z-depth-2;
   }
 
   .search-entry-icon {
-    margin: 0;
-    padding: 8px 16px 7px;
+    margin: 0.1em 4px 0;
     icon-size: 16px;
-    border-radius: 100px;
-    border-width: if($nokto == 'false', 1px, 0);
-    border-style: solid;
-    border-color: if($nokto == 'false',
-                  transparent $borders_color $borders_color,
-                  transparent transparent transparent);
-    color: $secondary_fg_color;
-    background-color: if($nokto == 'false', $base_color,
-                                            transparent);
-    box-shadow: if($nokto == 'false', $z-depth-3, none);
+    color: $osd_dim_fg_color;
   }
 
   &:hover,
@@ -2299,8 +2290,8 @@ $provider_icon_size: 32px;
 
 // .app-display { spacing: 20px; }
 
-.app-view-controls { // favorties | all toggle container
-  width: 320px;
+.app-view-controls { // favorites | all toggle container
+  width: if($eta == 'false', 400px, 340px);
   padding-bottom: if($eta == 'false', 24px, 18px);
   background-color: $hidden_fill_color !important;
   box-shadow: inset 0 1px $osd_semi_fill_color;

diff --git a/shell/sass/gnome-shell/3.26/_common.scss b/shell/sass/gnome-shell/3.26/_common.scss
@@ -2028,45 +2028,36 @@ StScrollBar {
 // Search entry
 .search-entry { // use raised entry-box styling
   @include fontscaling($ref_size * 1.1);
-  width: 320px;
-  padding: 0;
-  border-radius: 100px;
+  width: if($eta == 'false', 400px, 340px);
+  padding: if($eta == 'false', 12px 0.6em, 12px 0.4em);
+  border-radius: 2px;
   border-color: transparent;
-  border-top: 1px solid if($nokto == 'false', $borders_highlight,
-                                              $panel_bg_color);
-  color: $secondary_fg_color;
-  background-color: if($nokto == 'false', $bg_color, $panel_bg_color);
-  font-weight: 500;
-  box-shadow: if($nokto == 'false', $z-depth-2, none);
+  border-top: 1px solid $borders_highlight;
+  color: $osd_dim_fg_color;
+  background-color: $osd_slight_fill_color;
+  font-weight: 400;
+  box-shadow: $z-depth-1;
+  transition-duration: $duration_medium;
 
   selection-background-color: $selected_bg_color;
   selected-color: $selected_fg_color;
 
-  StLabel { margin: 0 8px 7px; }
+  StLabel { margin-bottom: 0.1em; }
 
   &:hover,
   &:focus {
-    border-top: 1px solid if($nokto == 'false', $borders_highlight,
-                                                $panel_bg_color);
+    border-top: 1px solid if($nokto == 'false',
+                             $borders_highlight,
+                             shellopacity($borders_highlight, 0.5));
     color: $fg_color;
-    box-shadow: if($nokto == 'false', $z-depth-3, none);
-    transition-duration: $duration_medium;
+    background-color: if($nokto == 'false', $base_color, $panel_bg_color);
+    box-shadow: $z-depth-2;
   }
 
   .search-entry-icon {
-    margin: 0;
-    padding: 8px 16px 7px;
+    margin: 0.1em 4px 0;
     icon-size: 16px;
-    border-radius: 100px;
-    border-width: if($nokto == 'false', 1px, 0);
-    border-style: solid;
-    border-color: if($nokto == 'false',
-                  transparent $borders_color $borders_color,
-                  transparent transparent transparent);
-    color: $secondary_fg_color;
-    background-color: if($nokto == 'false', $base_color,
-                                            transparent);
-    box-shadow: if($nokto == 'false', $z-depth-3, none);
+    color: $osd_dim_fg_color;
   }
 
   &:hover,
@@ -2373,8 +2364,8 @@ $provider_icon_size: 32px;
 
 // .app-display { spacing: 20px; }
 
-.app-view-controls { // favorties | all toggle container
-  width: 320px;
+.app-view-controls { // favorites | all toggle container
+  width: if($eta == 'false', 400px, 340px);
   padding-bottom: if($eta == 'false', 24px, 18px);
   background-color: $hidden_fill_color !important;
   box-shadow: inset 0 1px $osd_semi_fill_color;