Merge remote-tracking branch 'mike/master' into dev

2017-11-07 12:20:11 +01:00
parent 47fbdda409 7b69dc574b
commit b5d4acf10a
8 changed files with 391 additions and 4 deletions
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -973,6 +973,11 @@ a .drop-icons:hover {
 	color: #FF0000;
 }

+.perm-inherited {
+	color: #FF0000;
+}
+
+
 #menulist {
 	list-style-type: none;
 }
@@ -1641,6 +1646,17 @@ dl.bb-dl > dd > li {
    background-color: #0275d8;
 }

+
+.form-group.checkbox > div > input:disabled + label .onoffswitch-switch {
+    background-color: red;
+	border-radius: 3px;
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+
+}
+
+
+
 .help-searchlist {
 	list-style-type: none;
 }