Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into modularization

Conflicts:
	install/content.sql
	install/schema.sql

1 files changed, 10 insertions, 70 deletions

diff --git a/style/default.css b/style/default.css
index d49bcb18..9b93bfda 100644
--- a/style/default.css
+++ b/style/default.css
@@ -310,7 +310,7 @@ nav.sidebar li {
 }
 
 .slx-topbar div {
-	margin-left: 225px;
+	margin-left: 270px;
 }
 
 .sidebar-bg {
@@ -324,6 +324,10 @@ nav.sidebar li {
 /* .....NavBar: Fully showing nav bar..... */
 
 @media (min-width: 1200px) {
+
+	nav.navbar.sidebar {
+		z-index: 200;
+	}
 	
 	.navbar-right {
 		float: left !important;
@@ -465,76 +469,12 @@ section{
 	padding-left: 15px;
 }
 
-/*
- * Sysconfig Module Editor
- */
-
-.mod-nav {
-  width: 250px;
-  float: left;
-  margin-right: 4px;
-  border-right: solid 1px #DDD;
-  padding: 4px;
-  height: 545px;
-  overflow: auto;
-}
-
-.item {
-  padding: 4px;
-  margin: 3px 0;
-  border-radius: 3px;
-}
-
-.item:HOVER {
-  background-color: #EEE;
-  cursor: pointer;
-}
-
-.item-link {
-  color: #5893C6;
-}
-
-.item-lock {
-  color: #939393;
-}
-
-.dir-icon {
-  color: #2E6DA4;
-}
-
-.folder {
-  padding-left: 16px;
-  display: none;
-  border-left: dashed 1px #CCC;
-}
-
-#editor-header{
-  display: block;
-  float: none;
-  width: 875px;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-.mod-editor{
-  display: block;
-  float: none;
-  resize: none;
-  width: 875px;
-  border-top-right-radius: 0;
-  border-top-left-radius: 0;
-}
-
-.slx-cfg-toggle > input[type=checkbox] ~ label {
-	font-weight: normal;
-}
-
-.slx-cfg-toggle > input[type=checkbox]:checked ~ label {
+li.slx-submenu a {
+	font-size: 80%;
 	font-weight: bold;
+	padding-left: 3em;
 }
 
-/* what's this?
-textarea.form-control .editor-box{
-  height: 520px;
+nav.navbar.sidebar {
+	color: #eee;
 }
-*/