Merge branch 'master' into usb-lock-offusb-lock-off

1 files changed, 31 insertions, 16 deletions

diff --git a/style/default.css b/style/default.css
index 7273dba2..6c2beb86 100644
--- a/style/default.css
+++ b/style/default.css
@@ -7,24 +7,10 @@ body {
   padding-bottom: 10px;
 }
 
-.panel-heading, .panel-footer, .jumbotron, pre, .input-group-addon {
+.panel-default > .panel-heading, .panel-footer, .jumbotron, pre, .input-group-addon {
   background-image: url('bg.png');
 }
 
-.form-adduser {
-	max-width: 600px;
-	padding: 10px;
-	margin: 0 auto;
-}
-.form-adduser .form-control {
-	position: relative;
-	font-size: 16px;
-	height: auto;
-	padding: 10px;
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-}
 .form-narrow {
 	max-width: 320px;
 }
@@ -90,7 +76,7 @@ body {
 }
 
 .slx-table td {
-	padding-right: 5px;
+	padding-right: 7px;
 	padding-bottom: 2px;
 }
 
@@ -178,6 +164,7 @@ body {
   display: block;
   cursor: pointer;
 }
+
 input[readonly] {
   background-color: white !important;
   cursor: text !important;
@@ -445,6 +432,10 @@ nav.sidebar li {
 	}
 }
 
+html, .main {
+	background: #fff;
+}
+
 section{
 	padding-left: 15px;
 }
@@ -598,3 +589,27 @@ table.slx-ellipsis td {
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+
+div.disabled, ul.nav > li.disabled {
+	cursor: not-allowed;
+}
+
+ul.nav > li.disabled > a {
+	pointer-events: none;
+}
+
+div.disabled input, div.disabled label, div.disabled .btn {
+	pointer-events: none;
+}
+
+.input-group-addon > label {
+	font-weight: normal;
+	margin-bottom: inherit;
+}
+
+div.disabled-hack {
+	cursor: not-allowed;
+	margin: 0;
+	padding: 0;
+	display: inline-block;
+}