Merge pull request #44 from smurphos/cinnamox

Cinnamox
smurphos · Apr 3, 2018 · 60f91bb · 60f91bb
2 parents 3bcf186 + 13b9fec
commit 60f91bb
Show file tree

Hide file tree

Showing 12 changed files with 92 additions and 144 deletions.
diff --git a/src/cinnamon/scss/_extends.scss b/src/cinnamon/scss/_extends.scss
@@ -144,6 +144,7 @@
 // .osd-window, .info-osd, .workspace-osd
 %osd-shared {
     @extend %bg-grad-to-bottom;
+
     border: 1px solid $exterior_border;
     border-radius: $roundness;
     color: $cinn_fg_color;
@@ -179,6 +180,7 @@
 // #menu-search-entry, .run-dialog-entry, #notification StEntry
 %dialog-entry {
     @extend %dark-bg-grad-to-bottom;
+
     padding: $spacing_plus2;
     border-radius: $roundness;
     color: $dark_fg_color;
@@ -195,10 +197,11 @@
 // used in selectors
 // .desklet-with-borders, .desklet-with-borders-and-header, .desklet-header, .photoframe-box
 %desklet-shared {
+    @extend %bg-grad-to-right;
+
     color: $cinn_fg_color;
     padding: 8px;
     border: 1px solid $exterior_border;
-    @extend %bg-grad-to-right;
 }
 
 // used in selectors
@@ -213,9 +216,10 @@
 // used in selectors
 // .notification-button, .notification-icon-button, .modal-dialog-button, .sound-player-overlay StButton, .keyboard-key
 %shared-button {
+    @extend %button-bg-grad-to-top;
+
     border: 1px solid $button_border;
     border-radius: $roundness;
-    @extend %button-bg-grad-to-top;
     text-align: center;
     color: $button_fg_color;
     transition-duration: 150;
@@ -225,23 +229,26 @@
 // .notification-button:hover, .notification-icon-button:hover, .modal-dialog-button:hover, .sound-player-overlay StButton:hover, .keyboard-key:hover
 %shared-button-hover {
     @extend %hover-button-bg-grad-to-top;
+
     border: 1px solid $selected_border;
 }
 
 // used in selectors
 // .notification-button:active, .notification-icon-button:active, .modal-dialog-button:active, .modal-dialog-button:pressed, .sound-player-overlay StButton:active, .keyboard-key:active
 %shared-button-active {
     @extend %selected-bg-grad-to-bottom;
+
     color: $selected_fg_color;
 }
 
 // used in selectors
 // .menu .popup-combo-menu
 %shared-menu {
+    @extend %bg-grad-to-right;
+
     padding: 8px;
     border: 1px solid $exterior_border;
     border-radius: $roundness;
-    @extend %bg-grad-to-right;
     color: $cinn_fg_color;
 }
 
@@ -291,11 +298,12 @@
 // used in selectors
 // .menu-applications-inner-box StScrollView, .starkmenu-favorites-box .menu-context-menu
 %menu-context-shared {
+    @extend %bg-grad-to-bottom;
+
     padding: 8px;
     margin: 8px 0;
     border-radius: $roundness;
     border: 1px solid $interior_border;
-    @extend %bg-grad-to-bottom;
         StIcon {
             &:ltr {
 			    padding-right: 4px;
@@ -306,38 +314,35 @@
         }
 }
 
-// used in selectors
-// .starkmenu-favorites-box StScrollView .menu-context-menu StBoxLayout >.popup-menu-item, .menu-favorites-box StScrollView .menu-context-menu StBoxLayout >.popup-menu-item
-%menu-context-shared-workaround {
-    margin: 0;
-    padding: $spacing_plus2;
-}
-
 // used in selectors
 // .panel-top .window-list-item-box:active, .panel-top .window-list-item-box:checked, .panel-top .window-list-item-box:focus
 %panel-top-shared {
     @extend %selected-bg-grad-to-top;
+
     color: $selected_fg_color;
 }
 
 // used in selectors
 // .panel-bottom .windows-list-item-box:active, .panel-bottom .window-list-item-box:checked, .panel-bottom .window-list-item-box:focus
 %panel-bottom-shared {
     @extend %selected-bg-grad-to-bottom;
+
     color: $selected_fg_color;
 }
 
 // used in selectors
 // .panel-left .window-list-item-box:active, .panel-left .window-list-item-box:checked, .panel-left .window-list-item-box:focus
 %panel-left-shared {
     @extend %selected-bg-grad-to-left;
+
     color: $selected_fg_color;
 }
 
 // used in selectors
 // .panel-right .windows-list-item-box:active, .panel-right .window-list-item-box:checked, .panel-right .window-list-item-box:focus
 %panel-right-shared {
     @extend %selected-bg-grad-to-right;
+
     color: $selected_fg_color;
 }
 

diff --git a/src/cinnamon/scss/sections/_alt-tab.scss b/src/cinnamon/scss/sections/_alt-tab.scss
@@ -5,7 +5,7 @@
 }
 .switcher-list {
     @extend %bg-grad-to-bottom;
-    
+
     border-radius: $roundness;
     border: 1px solid $exterior_border;
     padding: 16px;
@@ -15,7 +15,7 @@
         border-radius: $roundness;
         &:selected {
             @extend %selected-bg-grad-to-bottom;
-            
+
             color: $selected_fg_color;
         }
     }

diff --git a/src/cinnamon/scss/sections/_calendar.scss b/src/cinnamon/scss/sections/_calendar.scss
@@ -16,7 +16,7 @@
 }
 .calendar-change-month-back {
     @extend %calendar-shared;
-    
+
     border: 1px solid transparent;
     background-image: url(assets/calendar-arrow-left.svg);
     &:rtl {
@@ -31,7 +31,7 @@
 }
 .calendar-change-month-forward {
     @extend %calendar-shared;
-    
+
     border: 1px solid transparent;
     background-image: url(assets/calendar-arrow-right.svg);
     &:rtl {
@@ -101,7 +101,7 @@
 // this is always is an active state
 .calendar-today {
     @extend %selected-bg-grad-to-bottom;
-    
+
     font-weight: bold;
     &:active {
         color: $selected_fg_color;

diff --git a/src/cinnamon/scss/sections/_desklets.scss b/src/cinnamon/scss/sections/_desklets.scss
@@ -12,15 +12,15 @@
 // these do not inherit from .desklet
 .desklet-with-borders {
     @extend %desklet-shared;
-    
+
     border-radius: $roundness;
     &:highlight {
         background-color: $selected_bg_color;
     }
 }
 .desklet-with-borders-and-header {
     @extend %desklet-shared;
-    
+
     border-radius-bottomleft: $roundness;
     border-radius-bottomright: $roundness;
     &:highlight {
@@ -29,7 +29,7 @@
 }
 .desklet-header {
     @extend %desklet-shared;
-    
+
     font-size: 1.2em;
     border-radius-topleft: $roundness;
     border-radius-topright: $roundness;
@@ -39,7 +39,7 @@
 }
 .photoframe-box {
     @extend %desklet-shared;
-    
+
     border-radius: $roundness;
     &:highlight {
         background-color: $selected_bg_color;

diff --git a/src/cinnamon/scss/sections/_dialogs.scss b/src/cinnamon/scss/sections/_dialogs.scss
@@ -1,7 +1,7 @@
 // on screen messages and input boxes
 .modal-dialog {
     @extend %bg-grad-to-right;
-    
+
     border: 1px solid $exterior_border;
     border-radius: $roundness;
     color: $cinn_fg_color;
@@ -12,8 +12,8 @@
 }
 .modal-dialog-button {
     @extend %shared-button;
-    
-    min-width: 4em;
+
+    min-width: 5em;
     min-height: 1em;
     padding: $spacing_plus2;
     &:hover {
@@ -49,7 +49,7 @@
 }
 .run-dialog-entry {
         @extend %dialog-entry;
-        
+
         &:focus  {
             border: 1px solid $selected_border;
         }
@@ -73,28 +73,28 @@
 }
 .show-processes-dialog-subject {
     @extend %shared-dialogs-subject;
-    
+
     &:rtl {
         @extend %shared-dialogs-subject-rtl;
     }
 }
 .mount-question-dialog-subject {
     @extend %shared-dialogs-subject;
-    
+
     &:rtl {
         @extend %shared-dialogs-subject-rtl;
     }
 }
 .show-processes-dialog-description {
     @extend %shared-dialogs-description;
-    
+
     &:rtl {
         padding-right: 17px;
     }
 }
 .mount-question-dialog-description {
     @extend %shared-dialogs-description;
-    
+
     &:rtl {
         padding-right: 17px;
     }
@@ -134,7 +134,7 @@
 // displayed when media keys are pressed.
 .osd-window {
     @extend %osd-shared;
-    
+
     spacing: 1em;
     padding: 16px;
     .level {
@@ -149,7 +149,7 @@
 }
 .info-osd, .workspace-osd {
     @extend %osd-shared;
-    
+
     font-size: 1.5em;
     text-align: center;
     padding: 8px 10px;
@@ -192,7 +192,7 @@
 // dialog box for the cinnamon debug utility
 #LookingGlassDialog {
     @extend %bg-grad-to-bottom;
-    
+
     spacing: 4px;
     padding: 8px;
     border: 1px solid $exterior_border;