New Cinnamon theme fixes (colors and look/feel)

B00merang-Project · Apr 2, 2017 · 38907b0 · 38907b0
1 parent 7f45e8f
commit 38907b0
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 72 deletions.
diff --git a/cinnamon/cinnamon.css b/cinnamon/cinnamon.css
@@ -1438,7 +1438,6 @@ background-color: none;
     box-shadow: 1px -1px 4px 1px rgba(1,1,1,0.6);
 }
 
-
 .menu-favorites-box {
     margin: auto;
     padding-top: 10px;
@@ -1448,11 +1447,13 @@ background-color: none;
 }
 
 .menu-favorites-button {
-    padding: 10px;
+    padding: 8px;
+    border: 2px solid transparent;
 }
 
 .menu-favorites-button:hover {
-    border-image: url("background-assets/hover.svg") 4;
+/*    border-image: url("background-assets/hover.svg") 4;*/
+    border-color: white;
 }
 
 .menu-places-box {
@@ -1493,17 +1494,19 @@ background-color: none;
     padding-top: 7px;
     padding-left: 7px;
     padding-right: 0;
-    padding-bottom: 7px; 
-    max-width: 10px;   
+    padding-bottom: 7px;
+    max-width: 10px;
+    border: 2px solid transparent;   
 }
 
 .menu-application-button-selected {
-    border-image: url("background-assets/hover.svg") 8;
+/*    border-image: url("background-assets/hover.svg") 8;*/
     padding-top: 7px;
     padding-left: 7px;
     padding-right: 7px;
     padding-bottom: 7px;
     color: #fff; 
+    border: 2px solid white;
 }
 
 .menu-application-button-label:ltr { 
@@ -1527,23 +1530,26 @@ background-color: none;
     padding-left: 7px;
     padding-right: 7px;
     padding-bottom: 7px;
+    border: 2px solid transparent;
 }
 
 .menu-category-button-greyed {
     padding-top: 7px;
     padding-left: 7px;
     padding-right: 7px;
     padding-bottom: 7px; 
+    border: 2px solid transparent;
     color: rgba(255, 255, 255, .3);
     font-style: normal;
 }
 
 .menu-category-button-selected {
-    background-color: rgba(255,255,255,0.3);
+/*    background-color: rgba(255,255,255,0.3);*/
     padding-top: 7px;
     padding-left: 7px;
     padding-right: 7px;
     padding-bottom: 7px; 
+    border: 2px solid white;
     color: #fff; 
 }
 
@@ -1576,14 +1582,34 @@ background-color: none;
 }
 
 .menu-search-box {
-   padding-left: 20px;
+   padding-left: 10px;
 }
 
 .menu-search-entry-icon {
     icon-size: 16px;
     color: #1f1f1f;
 }
 
+#menu-search-entry {
+    padding: 10px 8px;
+    color: rgba(255,255,255,0.7);
+    font-size: 10pt;
+    background-color: rgba(255,255,255,0.3);
+    caret-color: black;
+    caret-size: 1px;
+    width: 400px;
+    height: 15px;
+}
+
+#menu-search-entry:focus,
+#menu-search-entry:hover {
+    color: black;
+    background-color: white;
+    font-weight: normal;
+    selected-color: #fff;
+    selection-background-color: #0f7bd1;
+}
+
 /* Context menu (at the moment only for favorites) */
 .menu-context-menu {
 }

diff --git a/cinnamon/third-party-APPLET-stylesheets/slingshot.css b/cinnamon/third-party-APPLET-stylesheets/slingshot.css
@@ -84,18 +84,16 @@
 
 .slingshot .button.app {
     border-image: none;
-    border-width: 0;
+    background-color: #1884da;
+    border: 2px solid transparent;
     font-size: 9pt;
     padding: 0;
 }
 
 .slingshot .app:hover {
-    border-image: url("../background-assets/hover.svg") 4;
-    background-gradient-direction: vertical;
-    background-gradient-end: transparent;
-    background-gradient-start: transparent;
-    background-color: transparent;
+/*    border-image: url("../background-assets/hover.svg") 4;*/
     color: #fff;
+    border-color: white;
 }
 
 .slingshot .app:focus {

diff --git a/gtk-2.0/ProgressBar/progressbar.png b/gtk-2.0/ProgressBar/progressbar.png
diff --git a/gtk-2.0/ProgressBar/progressbar_v.png b/gtk-2.0/ProgressBar/progressbar_v.png
diff --git a/gtk-2.0/ProgressBar/trough-progressbar.png b/gtk-2.0/ProgressBar/trough-progressbar.png
diff --git a/gtk-2.0/ProgressBar/trough-progressbar_v.png b/gtk-2.0/ProgressBar/trough-progressbar_v.png
diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
@@ -240,63 +240,18 @@ style "murrine-scale" = "murrine-thin" {
 	}
 }
 
-#style "murrine-progressbar" = "murrine-thin" {
-#	bg[NORMAL] = @bg_color
-#	bg[ACTIVE] = shade (1.08, @bg_color)
-#
-#	fg[PRELIGHT] = @progressbar_color
-#
-#	engine "murrine" {
-#		roundness = 2
-#		border_shades = { 1.2, 1.2 }
-#		trough_border_shades = { 0.8, 0.8 }
-#	}
-#}
-
-style "progressbar"
-{
-  xthickness            		= 1
-  ythickness            		= 1
-
-  engine "pixmap" 
-  {
-    image
-    {
-      function				= BOX
-      detail				= "trough"
-      file				= "ProgressBar/trough-progressbar.png"
-      border				= { 4, 4, 4, 4 }
-      stretch				= TRUE
-      orientation			= HORIZONTAL
-    }
-    image
-    {
-      function				= BOX
-      detail				= "bar"
-      file				= "ProgressBar/progressbar.png"
-      stretch				= TRUE
-      border				= { 3, 3, 3, 3 }
-      orientation			= HORIZONTAL
-    }
-    image
-    {
-      function				= BOX
-      detail				= "trough"
-      file				= "ProgressBar/trough-progressbar_v.png"
-      border				= { 4, 4, 4, 4 }
-      stretch				= TRUE
-      orientation			= VERTICAL
-    }
-    image
-    {
-      function				= BOX
-      detail				= "bar"
-      file				= "ProgressBar/progressbar_v.png"
-      stretch				= TRUE
-      border				= { 3, 3, 3, 3 }
-      orientation			= VERTICAL
-    }
-  }
+style "progressbar" {
+	bg[NORMAL] = @bg_color
+	bg[ACTIVE] = shade( 0.9, @bg_color) #trough bg color
+	bg[SELECTED] = "#06B025" #progressbar bg color
+	bg[PRELIGHT] = @selected_bg_color
+
+	fg[PRELIGHT] = @selected_fg_color
+
+	engine "murrine" {
+		border_shades = { 1.0, 1.0 }
+		trough_border_shades = { 1.0, 1.0 }
+	}
 }
 
 

diff --git a/gtk-3.0/gtk-widgets-assets.css b/gtk-3.0/gtk-widgets-assets.css
@@ -126,7 +126,6 @@
 /******************
  * window actions *
  ******************/
-
 .titlebar .titlebutton.minimize {
     color: transparent;
     border-image: none;