Improvement: Cinnamon - entries shape

thekomer · Jan 31, 2022 · 12f2d9a · 12f2d9a
1 parent 070805f
commit 12f2d9a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 26 deletions.
diff --git a/cinnamon/cinnamon.css b/cinnamon/cinnamon.css
@@ -19,37 +19,37 @@ stage {
 /* * * * * *
  * Buttons *
  * * * * * */
-.popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, .notification-button, .notification-icon-button, .modal-dialog-button-box .modal-dialog-button, .sound-button {
+.sound-button, .modal-dialog-button-box .modal-dialog-button, .notification-button, .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button {
   min-height: 20px;
   padding: 5px 32px;
   transition-duration: 0;
   color: #BFC3CD;
   background-color: #161b2e;
   border: 1px solid #040508;
   box-shadow: inset 0 2px 4px rgba(22, 27, 46, 0.05); }
-  .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, .notification-button, .notification-icon-button, .modal-dialog-button-box .modal-dialog-button, .sound-button, .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .notification-button:focus, .notification-icon-button:focus, .modal-dialog-button-box .modal-dialog-button:focus, .sound-button:focus, .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .notification-button:hover, .notification-icon-button:hover, .modal-dialog-button-box .modal-dialog-button:hover, .sound-button:hover, .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .notification-button:hover:focus, .notification-icon-button:hover:focus, .modal-dialog-button-box .modal-dialog-button:hover:focus, .sound-button:hover:focus, .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .notification-button:active, .notification-icon-button:active, .modal-dialog-button-box .modal-dialog-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .notification-button:active:focus, .notification-icon-button:active:focus, .modal-dialog-button-box .modal-dialog-button:active:focus, .sound-button:active:focus, .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .notification-button:insensitive, .notification-icon-button:insensitive, .modal-dialog-button-box .modal-dialog-button:insensitive, .sound-button:insensitive {
+  .sound-button, .modal-dialog-button-box .modal-dialog-button, .notification-button, .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button {
     border-radius: 0.5em; }
-  .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .notification-button:focus, .notification-icon-button:focus, .modal-dialog-button-box .modal-dialog-button:focus, .sound-button:focus {
+  .sound-button:focus, .modal-dialog-button-box .modal-dialog-button:focus, .notification-button:focus, .notification-icon-button:focus, .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus {
     color: #BFC3CD;
     background-color: #161b2e;
     border: 1px solid #ff6a00;
     box-shadow: inset 0 2px 4px rgba(22, 27, 46, 0.05); }
-  .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .notification-button:hover, .notification-icon-button:hover, .modal-dialog-button-box .modal-dialog-button:hover, .sound-button:hover {
+  .sound-button:hover, .modal-dialog-button-box .modal-dialog-button:hover, .notification-button:hover, .notification-icon-button:hover, .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover {
     color: #BFC3CD;
     background-color: #1f253f;
     border: 1px solid #040508;
     box-shadow: inset 0 2px 4px rgba(31, 37, 63, 0.05); }
-  .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .notification-button:hover:focus, .notification-icon-button:hover:focus, .modal-dialog-button-box .modal-dialog-button:hover:focus, .sound-button:hover:focus {
+  .sound-button:hover:focus, .modal-dialog-button-box .modal-dialog-button:hover:focus, .notification-button:hover:focus, .notification-icon-button:hover:focus, .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus {
     color: #BFC3CD;
     background-color: #1f253f;
     border: 1px solid #ff6a00;
     box-shadow: inset 0 2px 4px rgba(22, 27, 46, 0.05); }
-  .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .notification-button:active, .notification-icon-button:active, .modal-dialog-button-box .modal-dialog-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .notification-button:active:focus, .notification-icon-button:active:focus, .modal-dialog-button-box .modal-dialog-button:active:focus, .sound-button:active:focus {
+  .sound-button:active, .modal-dialog-button-box .modal-dialog-button:active, .notification-button:active, .notification-icon-button:active, .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active {
     color: #fefefe;
     background-color: #ff6a00;
     border: 1px solid #ff6a00;
     box-shadow: inset 0 2px 4px #ff6a00; }
-  .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .notification-button:insensitive, .notification-icon-button:insensitive, .modal-dialog-button-box .modal-dialog-button:insensitive, .sound-button:insensitive {
+  .sound-button:insensitive, .modal-dialog-button-box .modal-dialog-button:insensitive, .notification-button:insensitive, .notification-icon-button:insensitive, .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive {
     color: rgba(191, 195, 205, 0.45);
     border: 1px solid rgba(4, 5, 8, 0.55);
     background-color: rgba(22, 27, 46, 0.55);
@@ -58,28 +58,28 @@ stage {
 /* * * * * *
  * Entries *
  * * * * * */
-.popup-menu #notification StEntry, #menu-search-entry {
+#menu-search-entry, .popup-menu #notification StEntry {
   padding: 7px;
   caret-size: 1px;
   selection-background-color: #ff6a00;
   selected-color: #fefefe;
   transition-duration: 300ms;
-  border-radius: 0.5em;
+  border-radius: 1em;
   color: #BFC3CD;
   background-color: #131727;
   border: 1px solid #040508;
   box-shadow: inset 0 2px 4px rgba(19, 23, 39, 0.05); }
-  .popup-menu #notification StEntry:focus, #menu-search-entry:focus, .popup-menu #notification StEntry:hover, #menu-search-entry:hover {
+  #menu-search-entry:focus, .popup-menu #notification StEntry:focus, #menu-search-entry:hover, .popup-menu #notification StEntry:hover {
     color: #BFC3CD;
     background-color: #131727;
     border: 1px solid #ff6a00;
     box-shadow: inset 0 2px 4px rgba(19, 23, 39, 0.05); }
-  .popup-menu #notification StEntry:insensitive, #menu-search-entry:insensitive {
+  #menu-search-entry:insensitive, .popup-menu #notification StEntry:insensitive {
     color: rgba(191, 195, 205, 0.45);
     background-color: #111423;
     border-color: 1px solid #090a12;
     box-shadow: inset 0 2px 4px rgba(17, 20, 35, 0.05); }
-  .popup-menu #notification StEntry StIcon.capslock-warning, #menu-search-entry StIcon.capslock-warning {
+  #menu-search-entry StIcon.capslock-warning, .popup-menu #notification StEntry StIcon.capslock-warning {
     icon-size: 16px;
     warning-color: #cc5500;
     padding: 0 4px; }
@@ -91,7 +91,7 @@ stage {
   selection-background-color: #ff6a00;
   selected-color: #fefefe;
   transition-duration: 300ms;
-  border-radius: 0.5em;
+  border-radius: 1em;
   color: #fefefe;
   background-color: rgba(69, 79, 89, 0.2);
   border: 1px solid rgba(0, 0, 0, 0.2);
@@ -1631,8 +1631,7 @@ StScrollBar {
 .workspace-switcher {
   padding-left: 3px;
   padding-right: 3px; }
-  .panel-left .workspace-switcher,
-  .panel-right .workspace-switcher {
+  .panel-left .workspace-switcher, .panel-right .workspace-switcher {
     padding: 0; }
 
 .workspace-button {
@@ -1771,18 +1770,14 @@ StScrollBar {
 .applet-label {
   font-weight: bold;
   color: #BFC3CD; }
-  .applet-label:hover, .applet-label:checked,
-  .applet-box:hover > .applet-label,
-  .applet-box:checked > .applet-label {
+  .applet-label:hover, .applet-label:checked, .applet-box:hover > .applet-label, .applet-box:checked > .applet-label {
     color: #fefefe;
     text-shadow: none; }
 
 .applet-icon {
   color: #BFC3CD;
   icon-size: 22px; }
-  .applet-icon:hover, .applet-icon:checked,
-  .applet-box:hover > .applet-icon,
-  .applet-box:checked > .applet-icon {
+  .applet-icon:hover, .applet-icon:checked, .applet-box:hover > .applet-icon, .applet-box:checked > .applet-icon {
     color: #fefefe;
     text-shadow: none; }
 

diff --git a/cinnamon/sass/_common.scss b/cinnamon/sass/_common.scss
@@ -54,7 +54,7 @@ stage {
   selection-background-color: $selected_bg_color;
   selected-color: $selected_fg_color;
   transition-duration: 300ms;
-  border-radius: 0.5em;
+  border-radius: 1em;
 
   @include entry(normal);
 
@@ -75,7 +75,7 @@ stage {
   selection-background-color: $selected_bg_color;
   selected-color: $selected_fg_color;
   transition-duration: 300ms;
-  border-radius: 0.5em;
+  border-radius: 1em;
 
   @include entry(osd);
 
@@ -998,13 +998,14 @@ StScrollBar {
 }
 
 .calendar-today {
-	color: $fg_color;
+	color: $selected_fg_color;
 	background-color: if($variant == 'light', transparentize($selected_bg_color, 0.6), transparentize($selected_bg_color, 0.6));
 	//border-width: 0;
-	border: 1px solid $orange;
+	border: 1px solid $selected_bg_color;
 	border-radius: 0.5em;
 	&:selected {
-		color: $selected_fg_color;
+		color: $selected_bg_color;
+		font-weight: bold;
 		//@include bg_gradient(horizontal, $orange_gradient_start, $orange_gradient_end, 1);
   }
 }