Merge branch 'master' into clean-settings-layout

1 files changed, 31 insertions, 3 deletions

diff --git a/settings/css/settings.css b/settings/css/settings.css
index f99aa57be22..2e4c41786ea 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -90,7 +90,7 @@ input#pass1, input#pass2, input#passwordbutton {
 }
 
 #avatarform .jcrop-keymgr {
-	display:none !important;
+	display: none !important;
 }
 
 #displayavatar {
@@ -362,7 +362,7 @@ table.nostyle td {
 	max-width: 580px;
 }
 
-#security table th{
+#security table th {
 	opacity: .5;
 }
 
@@ -745,11 +745,17 @@ input#recoveryPassword {
 	height: 37px;
 }
 
-select.quota-user {
+#userlist td.quota {
 	position: relative;
+	width: 10em;
+}
+
+select.quota-user {
+	position: absolute;
 	left: 0;
 	top: 0;
 	width: 10em;
+	height: 34px;
 }
 
 select.quota.active {
@@ -760,6 +766,20 @@ input.userFilter {
 	width: 200px;
 }
 
+.quota_progress_container {
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 10em;
+	margin: 3px 3px 3px 0;
+	border-radius: 3px;
+}
+
+.quota_progress {
+	background-color: #eee;
+	height: 34px;
+}
+
 /* positioning fixes */
 #newuser {
 	padding-left: 3px;
@@ -1345,3 +1365,11 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 	margin-bottom: 12px;
 	opacity: .7;
 }
+
+.settings-caption {
+	font-weight: bold;
+	line-height: 44px;
+	padding: 0 12px;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}