[gnome-shell/wip/sass: 28/86] theme: use regular borders for top bar buttons



commit b3a18d076d3a608c362c615fe39dc96e0b2824d8
Author: Jakub Steiner <jimmac gmail com>
Date:   Wed Oct 29 14:48:20 2014 +0100

    theme: use regular borders for top bar buttons
    
    - no need to abuse image assets.
    - big thanks to carlos for making it possible.

 data/gnome-shell-theme.gresource.xml |    1 -
 data/theme/_common.scss              |   11 +++--
 data/theme/gnome-shell.css           |   12 ++++--
 data/theme/panel-button-border.svg   |   74 ----------------------------------
 4 files changed, 15 insertions(+), 83 deletions(-)
---
diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
index 5b15c94..067d324 100644
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -24,7 +24,6 @@
     <file>page-indicator-inactive.svg</file>
     <file>page-indicator-checked.svg</file>
     <file>page-indicator-hover.svg</file>
-    <file>panel-button-border.svg</file>
     <file>process-working.svg</file>
     <file>running-indicator.svg</file>
     <file>source-button-border.svg</file>
diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index df23782..3387413 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -256,7 +256,7 @@ StScrollBar {
     -panel-corner-border-width: 2px;
     -panel-corner-border-color: transparent; 
     
-    &:active, &:overview, &:focus { -panel-corner-border-color: #729fcf; } //fixed due to SVG image-border
+    &:active, &:overview, &:focus { -panel-corner-border-color: lighten($selected_bg_color,5%); } 
     &.lock-screen, &.login-screen, &unlock-screen {
       -panel-corner-radius: 0;
       -panel-corner-background-color: transparent;
@@ -269,7 +269,7 @@ StScrollBar {
     font-weight: bold;
     color: #ccc;
     transition-duration: 100ms;
-   
+    padding: 2px;
     #appMenuIcon { 
       app-icon-bottom-clip: 1px;
       
@@ -287,7 +287,9 @@ StScrollBar {
     }
     
     &:active, &:overview, &:focus, &:checked {
-      border-image: url("panel-button-border.svg") 6 10 0 2;
+      border-color: lighten($selected_bg_color,5%);
+      border-bottom-width: 2px;
+      padding: 2px 2px 0 2px;
       color: lighten($fg_color,10%);
       text-shadow: black 0px 2px 2px;
       
@@ -306,7 +308,8 @@ StScrollBar {
   .panel-status-button {
   
     &:active, &:overview, &:focus, &:checked {
-      border-image: url("panel-button-border.svg") 6 10 0 2;
+      border-color: lighten($selected_bg_color,5%);
+      border-bottom-width: 2px;
     }
   }
   
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 1698a85..bac37d7 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -1195,7 +1195,7 @@ StScrollBar {
     -panel-corner-border-width: 2px;
     -panel-corner-border-color: transparent; }
     #panel .panel-corner:active, #panel .panel-corner:overview, #panel .panel-corner:focus {
-      -panel-corner-border-color: #729fcf; }
+      -panel-corner-border-color: #256ab1; }
     #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-cornerunlock-screen {
       -panel-corner-radius: 0;
       -panel-corner-background-color: transparent;
@@ -1204,7 +1204,8 @@ StScrollBar {
     padding: 0px 12px;
     font-weight: bold;
     color: #ccc;
-    transition-duration: 100ms; }
+    transition-duration: 100ms;
+    padding: 2px; }
     #panel .panel-button #appMenuIcon {
       app-icon-bottom-clip: 1px; }
       .panel-button:active #panel .panel-button #appMenuIcon, .panel-button:overview #panel .panel-button 
#appMenuIcon, .panel-button:focus #panel .panel-button #appMenuIcon, .panel-button:checked #panel 
.panel-button #appMenuIcon {
@@ -1213,7 +1214,9 @@ StScrollBar {
       color: white;
       text-shadow: black 0 2px 2px; }
     #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel 
.panel-button:checked {
-      border-image: url("panel-button-border.svg") 6 10 0 2;
+      border-color: #256ab1;
+      border-bottom-width: 2px;
+      padding: 2px 2px 0 2px;
       color: white;
       text-shadow: black 0px 2px 2px; }
       #panel .panel-button:active > .system-status-icon, #panel .panel-button:overview > 
.system-status-icon, #panel .panel-button:focus > .system-status-icon, #panel .panel-button:checked > 
.system-status-icon {
@@ -1226,7 +1229,8 @@ StScrollBar {
       .unlock-screen #panel .panel-button:focus, .unlock-screen #panel .panel-button:hover, .unlock-screen 
#panel .panel-button:active, .login-screen #panel .panel-button:focus, .login-screen #panel 
.panel-button:hover, .login-screen #panel .panel-button:active, .lock-screen #panel .panel-button:focus, 
.lock-screen #panel .panel-button:hover, .lock-screen #panel .panel-button:active {
         color: white; }
   #panel .panel-status-button:active, #panel .panel-status-button:overview, #panel 
.panel-status-button:focus, #panel .panel-status-button:checked {
-    border-image: url("panel-button-border.svg") 6 10 0 2; }
+    border-color: #256ab1;
+    border-bottom-width: 2px; }
   #panel .panel-menu {
     -boxpointer-gap: 4px; }
   #panel .panel-status-indicators-box,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]