refactoring

6 files changed, 56 insertions, 43 deletions

diff --git a/web/css/kvm/msd.css b/web/css/kvm/msd.css
index de22d6e5..4a1c5d28 100644
--- a/web/css/kvm/msd.css
+++ b/web/css/kvm/msd.css
@@ -2,11 +2,11 @@ div#msd-menu {
 	width: 450px;
 }
 
-div.msd-message, input.msd-message {
+div#msd-menu div.msd-message, input.msd-message {
 	display: none;
 }
 
-table.msd-info {
+div#msd-menu table.msd-info {
 	-webkit-user-select: text;
 	-moz-user-select: text;
 	user-select: text;
@@ -15,7 +15,7 @@ table.msd-info {
 	font-size: 12px;
 }
 
-table.msd-info td.msd-info-value {
+div#msd-menu table.msd-info td.msd-info-value {
 	font-weight: bold;
 	max-width: 310px;
 	overflow: hidden;
diff --git a/web/css/kvm/stream.css b/web/css/kvm/stream.css
index 4cdb7fe4..10670ef4 100644
--- a/web/css/kvm/stream.css
+++ b/web/css/kvm/stream.css
@@ -2,23 +2,6 @@ div#stream-info {
 	display: none;
 }
 
-img#stream-image {
-	width: 640px;
-	height: 480px;
-	display: block;
-	background-color: black;
-}
-
-img.stream-image-active {
-	-webkit-filter: none;
-	filter: none;
-}
-
-img.stream-image-inactive {
-	-webkit-filter: grayscale(100%) brightness(75%) sepia(75%);
-	filter: grayscale(100%) brightness(75%) sepia(75%);
-}
-
 div#stream-box {
 	position: relative;
 	display: inline-block;
@@ -39,6 +22,23 @@ div.stream-box-mouse-enabled {
 	cursor: url("../../svg/stream-mouse-cursor.svg"), pointer;
 }
 
+img#stream-image {
+	width: 640px;
+	height: 480px;
+	display: block;
+	background-color: black;
+}
+
+img.stream-image-active {
+	-webkit-filter: none;
+	filter: none;
+}
+
+img.stream-image-inactive {
+	-webkit-filter: grayscale(100%) brightness(75%) sepia(75%);
+	filter: grayscale(100%) brightness(75%) sepia(75%);
+}
+
 div.stream-slider-box {
 	margin-top: 5px;
 	display: flex;
diff --git a/web/css/main.css b/web/css/main.css
index 65a9afe9..a9f9600f 100644
--- a/web/css/main.css
+++ b/web/css/main.css
@@ -4,6 +4,8 @@ body {
 	color: var(--fg-color-normal);
 	background-color: var(--bg-color-normal);
 	font-family: sans-serif !important;
+}
+body.body-no-select {
 	-webkit-user-select: none;
 	-moz-user-select: none;
 	user-select: none;
@@ -96,6 +98,12 @@ select:active {
 	}
 }
 
+div.buttons-row {
+	margin: 0;
+	padding: 0;
+	font-size: 0;
+}
+
 .row50 {
 	display: inline-block;
 	width: 50%;
diff --git a/web/css/menu.css b/web/css/menu.css
index b70419f9..581aaf97 100644
--- a/web/css/menu.css
+++ b/web/css/menu.css
@@ -10,20 +10,24 @@ ul.menu {
 	height: 50px;
 	z-index: 2147483646;
 }
+
 ul.menu li.menu-logo {
 	line-height: 50px;
 	margin-top: -2px;
 	margin-left: 16px;
 	float: left;
 }
-ul.menu li.menu-right-actions {
+
+ul.menu li.menu-right-items {
 	float: right;
 }
+
 ul.menu img {
 	vertical-align: middle;
 	margin-right: 10px;
 	height: 20px;
 }
+
 ul.menu li a.menu-item {
 	line-height: 50px;
 	outline: none;
@@ -35,6 +39,7 @@ ul.menu li a.menu-item {
 	padding-right: 16px;
 	text-decoration: none;
 }
+
 ul.menu li a.menu-item:hover:not(.active) {
 	background-color: var(--bg-color-hovered);
 }
@@ -44,11 +49,13 @@ ul.menu li a.menu-item:hover:not(.active) {
 		background-color: var(--bg-color-menu) !important;
 	}
 }
+
 ul.menu li a.menu-item-selected {
 	box-shadow: 0 5px 0 var(--border-color-intensive) inset;
 	background-color: var(--bg-color-selected) !important;
 }
-div.menu-dropdown-content {
+
+ul.menu li div.menu-item-content {
 	visibility: hidden;
 	overflow: hidden;
 	white-space: nowrap;
@@ -61,16 +68,22 @@ div.menu-dropdown-content {
 	box-shadow: var(--shadow-big);
 	z-index: 2147483645;
 }
-div.menu-dropdown-content button, select {
+
+ul.menu li div.menu-item-content-buttons {
+	background-color: var(--bg-color-normal);
+}
+
+ul.menu li div.menu-item-content-text {
+	margin: 10px 15px 10px 15px;
+	font-size: 14px;
+}
+
+ul.menu li div.menu-item-content button, select {
 	text-align: left;
 	padding: 0 16px;
 }
-div.menu-dropdown-content div.buttons-row {
-	margin: 0;
-	padding: 0;
-	font-size: 0;
-}
-div.menu-dropdown-content hr {
+
+ul.menu li div.menu-item-content hr {
 	margin: 0;
 	display: block;
 	height: 0px;
@@ -78,11 +91,3 @@ div.menu-dropdown-content hr {
 	border: none;
 	border-top: var(--border-dark-thin);
 }
-div.menu-dropdown-content-buttons {
-	background-color: var(--bg-color-normal);
-}
-div.menu-dropdown-content-text {
-	margin: 10px 15px 10px 15px;
-	font-size: 14px;
-}
-
diff --git a/web/css/switches.css b/web/css/switches.css
index 08e50033..603115c4 100644
--- a/web/css/switches.css
+++ b/web/css/switches.css
@@ -19,13 +19,13 @@ div.switch-box label.switch-label {
 	border-radius: 15px;
 }
 
-div.switch-box span.switch-inner {
+div.switch-box label.switch-label span.switch-inner {
 	display: block;
 	width: 200%;
 	margin-left: -100%;
 }
 
-div.switch-box span.switch-inner:before, span.switch-inner:after {
+div.switch-box label.switch-label span.switch-inner:before, span.switch-inner:after {
 	display: block;
 	float: left;
 	width: 50%;
@@ -38,7 +38,7 @@ div.switch-box span.switch-inner:before, span.switch-inner:after {
 	box-sizing: border-box;
 }
 
-div.switch-box span.switch-inner:before {
+div.switch-box label.switch-label span.switch-inner:before {
 	content: "ON";
 	padding-left: 5px;
 	background-color: var(--bg-color-gray);
@@ -46,7 +46,7 @@ div.switch-box span.switch-inner:before {
 	text-align: left;
 }
 
-div.switch-box span.switch-inner:after {
+div.switch-box label.switch-label span.switch-inner:after {
 	content: "OFF";
 	padding-right: 5px;
 	background-color: var(--bg-color-gray);
@@ -54,7 +54,7 @@ div.switch-box span.switch-inner:after {
 	text-align: right;
 }
 
-div.switch-box span.switch {
+div.switch-box label.switch-label span.switch {
 	display: block;
 	width: 15px;
 	margin: 0px;
diff --git a/web/css/windows.css b/web/css/windows.css
index 56f06106..68351896 100644
--- a/web/css/windows.css
+++ b/web/css/windows.css
@@ -67,7 +67,7 @@ div.window div.window-header button.window-button-close {
 	div.window div.window-header div.window-grab {
 		height: 35px !important;
 	}
-	div.window div.window-header  button.window-button-close {
+	div.window div.window-header button.window-button-close {
 		height: 40px !important;
 	}
 }