merge master into more-whitespace

diff --cc core/css/styles.css
index 89c074aabbfbb7af0351f2a7e53953e6f73f9ed1,1b58899eef6be57599eec8a7921d92d1336ea177..2649f16a0109a62258b86831483aa7490b52e8de
--- 1/core/css/styles.css
--- 2/core/css/styles.css
+++ b/core/css/styles.css
@@@ -322,17 -475,19 +488,21 @@@ label.infield { cursor:text !important
                filter: alpha(opacity=100);
                opacity: 1;
        }
 -
 -      /* positioning */
        #navigation .icon {
 -              display:block;
 -              width:32px; height:32px;
 -              margin:0 16px 0; padding:8px 0 4px;
 +              display: block;
 +              width: 32px;
 +              height: 32px;
 +              margin-left: 24px;
 +              padding: 10px 0 4px;
 +      }
 +      #navigation li:first-child .icon { /* special rule for Files icon as it's first */
 +              padding-top: 20px;
        }
 -      #navigation li:first-child a { padding-top:16px; }
  
+ #apps-management {
+       opacity: .6;
+ }
+ 
  
  /* USER MENU */
  #settings { float:right; margin-top:7px; color:#bbb; text-shadow:0 -1px 0 #000; }
@@@ -345,29 -500,18 +515,30 @@@
        background:#383c43 url('../img/noise.png') repeat;
        border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid;
        -moz-box-shadow:0 0 7px rgb(29,45,68); -webkit-box-shadow:0 0 7px rgb(29,45,68); box-shadow:0 0 7px rgb(29,45,68);
 +      -moz-box-sizing: border-box; box-sizing: border-box;
 +      /* prevent ugly selection effect on accidental selection */
 +      -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
  }
        #expanddiv a {
 -              display:block; color:#fff; text-shadow:0 -1px 0 #000; padding:0 8px;
 -              -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
 -              filter:alpha(opacity=70);
 -              opacity:.7;
 +              display: block;
 +              height: 40px;
 +              color: #fff;
 +              text-shadow: 0 -1px 0 #000;
 +              padding: 4px 12px 0;
 +              -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
 +              filter: alpha(opacity=70);
 +              opacity: .7;
-               -moz-box-sizing: border-box; box-sizing: border-box;
++              -moz-box-sizing: border-box;
++              box-sizing: border-box;
 +      }
 +      #expanddiv a img {
 +              margin-bottom: -3px;
 +              margin-right: 6px;
        }
 -      #expanddiv a img { margin-bottom:-3px; }
        #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active {
 -              -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 -              filter:alpha(opacity=100);
 -              opacity:1;
 +              -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 +              filter: alpha(opacity=100);
 +              opacity: 1;
        }