Merge pull request #1076 from mtwebster/rollup-mtwebster

Rollup of pull requests for testing purposes

NEWS

@@ -99,9 +99,3 @@ THEME CHANGES SINCE 1.4
 	max-height: 100px;
 }
 
-/* ===================================================================
- * Menu Applet
- * ===================================================================*/
-
-.menu-place-cat-button-label {
-}

data/org.cinnamon.gschema.xml.in

@@ -74,6 +74,14 @@
       </_description>
     </key>
 
+    <key name="panel-scale-text-icons" type="b">
+      <default>false</default>
+      <_summary>Scale panel applet text and icons</_summary>
+      <_description>
+        Whether the panel icons and text from applets is resized according to the custom panel height
+      </_description>
+    </key>
+
     <key name="desktop-effects" type="b">
       <default>true</default>
       <_summary>Enable desktop effects</_summary>
@@ -464,6 +472,14 @@
       </_description>
     </key>
 
+    <key name="window-list-applet-scroll" type="b">
+      <default>false</default>
+      <summary>Enable mouse-scroll in window-list applet</summary>
+      <description>
+        When enabled the mouse wheel can scroll through the items in the window list applet.
+      </description>
+    </key>
+
     <key type="b" name="enable-edge-flip">
       <default>false</default>
       <_summary>Whether edge flip is enabled</_summary>

data/theme/cinnamon.css

@@ -277,6 +277,7 @@ StScrollBar StButton#vhandle:hover {
 	spacing: 0px;
 	margin: 0px;
 }
+
 .panel-corner {
 	-panel-corner-radius: 0px;
 	-panel-corner-background-color: black;
@@ -1228,7 +1229,6 @@ StScrollBar StButton#vhandle:hover {
 /* Main menu title */
 
 .menu-favorites-box {
-	width: 50px;
 	margin: auto;
 	padding: 10px;
 	border: 1px solid #666;
@@ -1252,22 +1252,7 @@ StScrollBar StButton#vhandle:hover {
 	box-shadow: inset 0px 0px 1px 1px rgba(255,255,255,0.06);
 	border-radius: 4px;
 }
-.menu-help-button {
-	padding-top: 2px;
-	padding-left: 5px;
-	padding-right: 5px;
-	padding-bottom: 2px;
-}
-.menu-help-button:hover {
-	color: white;
-	background-gradient-direction: vertical;
-	background-gradient-start: rgba(255,255,255,0.2);
-	background-gradient-end: rgba(255,255,255,0.08);
-	box-shadow: inset 0px 0px 1px 1px rgba(255,255,255,0.06);
-	border-radius: 4px;
-}
 .menu-places-box {
-	width: 50px;
 	margin: auto;
 	padding: 10px;
 	border: 0px solid #666;
@@ -1296,7 +1281,6 @@ StScrollBar StButton#vhandle:hover {
 	padding-right: 7px;
 	padding-bottom: 7px;
 }
-.menu-application-button:hover,
 .menu-application-button-selected {
 	padding-top: 7px;
 	padding-left: 7px;
@@ -1315,19 +1299,12 @@ StScrollBar StButton#vhandle:hover {
 .menu-application-button-label:rtl { 
 	padding-right: 5px;
 }
-.menu-place-cat-button-label:ltr {
-	padding-top: 4px;
-	padding-left: 5px;
-}
-.menu-place-cat-button-label:rtl {
-	padding-top: 4px;
-	padding-right: 5px;
-}
 .menu-category-button {
 	padding-top: 7px;
 	padding-left: 7px;
 	padding-right: 7px;
 	padding-bottom: 7px;
+	transition-duration: 75;
 }
 .menu-category-button-greyed {
 	padding-top: 7px;
@@ -1348,7 +1325,7 @@ StScrollBar StButton#vhandle:hover {
 	background-gradient-end: rgba(255,255,255,0.08);
 	box-shadow: inset 0px 0px 1px 1px rgba(255,255,255,0.06);
 	border-radius: 4px;
-	transition-duration: 300;
+	transition-duration: 75;
 }
 .menu-category-button-label:ltr {
 	padding-left: 5px;
@@ -1446,7 +1423,7 @@ StScrollBar StButton#vhandle:hover {
 	border-radius: 2px 2px 0px 0px;
 	padding-left: 5px;
 	padding-right: 5px;
-	transition-duration: 300;
+	transition-duration: 100;
 }
 .window-list-item-box:active,
 .window-list-item-box:checked,
@@ -1619,12 +1596,10 @@ StScrollBar StButton#vhandle:hover {
  * ===================================================================*/
 .applet-box {
 	padding-left: 3px;
-    padding-right: 3px;	
+	padding-right: 3px;
 	color: #ccc;
 	text-shadow: black 0px 0px 2px;
 	transition-duration: 300;
-	min-width: 1em;
-
 }
 .applet-box:hover {
 	color: #fff;
@@ -1640,6 +1615,7 @@ StScrollBar StButton#vhandle:hover {
 }
 .applet-icon {
 	color: #ccc;
+	icon-size: 22px;
 }
 .applet-icon:hover,
 .applet-box:hover > .applet-icon {