Merge pull request #2663 from rosysong/rosy-bugs-fix

luci-theme-rosy: bugs fix

themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css

@@ -887,7 +887,7 @@ form[method="post"] + form[method="post"],
 
 .tabs > li {
 	margin-right: .8rem;
-    padding: .5rem 4px;
+	padding: 6px 10px;
 	position: relative;
 	display: inline-block;
 	text-align: center;
@@ -1455,6 +1455,11 @@ body.modal-overlay-active {
 	height: 100vh;
 }
 
+#modal_overlay .alert-message.warning {
+	background-color:  #fff !important;
+	margin-bottom: 10px;
+}
+
 body.modal-overlay-active #modal_overlay {
 	right: 0;
 	left: 0;
@@ -2253,6 +2258,42 @@ input[name="nslookup"] {
 	margin: 5rem 1rem 1rem;
 }
 
+/* rosy file server */
+.login-info.node-main-login{
+	background-color: #ebf1f6;
+}
+
+.login-info.node-main-login header .container,
+.login-info.node-main-login .main {
+	width: 1170px;
+}
+
+.login-info.node-main-login .main {
+	padding: 0 15px;
+}
+
+.login-info.node-main-login header {
+	display: block;
+}
+
+.login-info.node-main-login header .container {
+	margin: 1rem auto 0;
+	height: 3rem;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-radius: 50px;
+	line-height: 44px;
+}
+
+.login-info.node-main-login .label.logout {
+	background-color: #f24b7c;
+}
+
+.login-info.node-main-login .label.logout a {
+	color: #fff;
+	text-decoration: none;
+}
+
 /* node main login */
 .login-info .main {
 	margin: 0 auto;
@@ -2435,11 +2476,14 @@ input[name="nslookup"] {
 	flex-basis: 12%;
 }
 
-#cbi-firewall-zone .table,
+#cbi-firewall-zone .table {
-#cbi-network-switch_vlan .table {
 	display: table;
 }
 
+#cbi-network-switch_vlan #vlan_table {
+	overflow-x: auto;
+}
+
 #cbi-firewall-zone .td.cbi-section-actions {
 	width: 100%;
 }
@@ -2592,10 +2636,6 @@ input[name="nslookup"] {
 		font-size: .7rem;
 	}
 
-	#modal_overlay {
-		top: 3.5rem;
-	}
-
 	[data-page="admin-network-firewall-forwards"] .table:not(.cbi-section-table) {
 		display: block;
 	}
@@ -2611,6 +2651,13 @@ input[name="nslookup"] {
 	}
 }
 
+@media screen and (max-width: 992px) {
+	.login-info.node-main-login header .container,
+	.login-info.node-main-login .main {
+		width: 970px;
+	}
+}
+
 @media screen and (max-width: 992px) {
 	.login .main-right {
 		background: #354057;
@@ -2674,6 +2721,10 @@ input[name="nslookup"] {
 		width: 30px;
 	}
 
+	.login-info.node-main-login header .showSide {
+		display: none;
+	}
+
 	.showSide::before {
 		content: '';
 		display: inline-block;
@@ -2882,6 +2933,22 @@ input[name="nslookup"] {
 	.logged-in .main-left .navbar-container:hover {
 		scrollbar-face-color: #839dd67a;
 	}
+
+	.login-info.node-main-login header .container,
+	.login-info.node-main-login .main {
+		width: 750px;
+	}
+}
+
+@media screen and (max-width: 768px) {
+	.login-info.node-main-login header {
+		padding: 0 15px;
+	}
+
+	.login-info.node-main-login header .container,
+	.login-info.node-main-login .main {
+		width: 100%;
+	}
 }
 
 @media screen and (max-width: 600px) {
@@ -2900,10 +2967,6 @@ input[name="nslookup"] {
 		padding: 1rem;
 	}
 
-	.tabs {
-		margin: 0 -1rem;
-	}
-
 	.main-left .nav-container {
 		width: 70%;
 	}

themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js

@@ -276,4 +276,6 @@
 
     });
 
+    $('#cbi-network-switch_vlan .table').wrap('#vlan_table');
+    
 })(window, jQuery);

themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm

@@ -28,7 +28,7 @@
 </div>
 </div>
 </div>
-<footer class="mobile-hide">
+<footer>
     <a href="https://github.com/openwrt/luci">Powered by<%= ver.luciname %> (<%= ver.luciversion %>)</a> /
     <%= ver.distversion %>
     <% if #categories > 1 then %>