• R/O
  • HTTP
  • SSH
  • HTTPS

luci: Commit

LuCI - OpenWrt Configuration Interface


Commit MetaInfo

Revisão466be1cebb3d20e392f01ce24ae8b15065db754d (tree)
Hora2022-01-26 17:12:04
AutorTianling Shen <cnsztl@immo...>
CommiterTianling Shen

Mensagem de Log

luci-theme-bootstrap-mod: sync with upstream source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit bc7fccdd43483a50e57293bbe1ca134bd102a478)

Mudança Sumário

Diff

--- a/themes/luci-theme-bootstrap-mod/Makefile
+++ b/themes/luci-theme-bootstrap-mod/Makefile
@@ -1,4 +1,4 @@
1-# Copyright (C) 2020 Lienol <lawlienol@gmail.com>
1+# Copyright (C) 2018-2022 Lienol <lawlienol@gmail.com>
22 #
33 # This is free software, licensed under the GNU General Public License v3.
44 #
@@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk
77
88 LUCI_TITLE:=Bootstrap Mod Theme By Lienol
99 LUCI_DEPENDS:=
10-PKG_VERSION:=2
11-PKG_DATE:=20200912
10+PKG_VERSION:=20220102
11+PKG_RELEASE:=1
1212
1313 include ../../luci.mk
1414
--- a/themes/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/cascade.css
+++ b/themes/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/cascade.css
@@ -6,8 +6,8 @@ body {
66 body {
77 background: #ffffff;
88 color: #333;
9- font-family: Helvetica, Arial, sans-serif;
10- font-size: 14px;
9+ font-family: "Helvetica Neue, Helvetica, Arial, sans-serif";
10+ font-size: 13px;
1111 line-height: 1.8;
1212 margin: 0;
1313 /* padding-top: 60px; */
@@ -556,23 +556,23 @@ p {
556556
557557 .tabs,
558558 .cbi-tabmenu {
559- border-bottom: 2px solid #ddd;
560- margin-bottom: 20px;
559+ border-bottom: 1px solid #ddd;
560+ margin-bottom: 15px;
561561 }
562562
563563 .tabs li,
564564 .cbi-tabmenu li {
565565 display: inline-block;
566+ margin-bottom: -1px;
566567 }
567568
568569 .tabs a,
569570 .cbi-tabmenu a {
570571 display: block;
571- color: #404040;
572+ /* color: #404040; */
572573 line-height: 34px;
573- margin-bottom: -2px;
574- margin-right: 20px;
575- padding: 0 3px;
574+ margin-right: 3px;
575+ padding: 0 15px;
576576 }
577577
578578 .active a,
@@ -581,6 +581,13 @@ p {
581581 color: #111;
582582 }
583583
584+.tabs>li>a:hover,
585+.cbi-tabmenu>li>a:hover {
586+ text-decoration: none;
587+ background-color: #eee;
588+ border-color: #eee #eee #ddd;
589+}
590+
584591
585592 /* Fieldset */
586593
@@ -603,6 +610,7 @@ fieldset fieldset {
603610 table .cbi-value-field,
604611 .table .cbi-value-field {
605612 display: table-cell;
613+ width: unset;
606614 }
607615
608616 .cbi-value-title {
@@ -613,7 +621,7 @@ table .cbi-value-field,
613621 padding-top: 0.4em;
614622 line-height: 1.2em;
615623 float: left;
616- width: 13em;
624+ width: 14em;
617625 margin-right: 1.5em;
618626 text-align: right;
619627 color: #404040;
@@ -622,6 +630,7 @@ table .cbi-value-field,
622630 .cbi-value-field {
623631 color: #811;
624632 display: table-cell;
633+ width: 0.1%;
625634 }
626635
627636 .cbi-section-table-cell {
@@ -808,6 +817,17 @@ select {
808817 line-height: 18px;
809818 }
810819
820+input[disabled],
821+select[disabled],
822+textarea[disabled],
823+input[readonly],
824+select[readonly],
825+textarea[readonly] {
826+ background-color: #f5f5f5;
827+ border-color: #ddd;
828+ color: unset;
829+}
830+
811831 table.cbi-section-table input,
812832 table.cbi-section-table textarea,
813833 table.cbi-section-table select,
@@ -880,11 +900,11 @@ input[type=file] {
880900 }
881901
882902 .cbi-value-description {
883- /* display: inline; */
903+ display: inline;
884904 background-image: url(/luci-static/resources/cbi/help.gif);
885905 /* background-position-x: 0px;
886906 background-position-y: 1px; */
887- background-position: 0em 0.3em;
907+ background-position: 0em 0.2em;
888908 background-repeat: no-repeat;
889909 padding: 0 1.2rem;
890910 }
@@ -961,8 +981,7 @@ button:focus {
961981 .cbi-button-add:active,
962982 .cbi-button-add:focus,
963983 .cbi-input-add:active,
964-.cbi-input-add:focus {
965-}
984+.cbi-input-add:focus {}
966985
967986 .cbi-button-remove,
968987 .cbi-input-remove,
@@ -977,8 +996,7 @@ button:focus {
977996 .cbi-input-remove:active,
978997 .cbi-input-remove:focus,
979998 .cbi-section-remove input:active,
980-.cbi-section-remove input:focus {
981-}
999+.cbi-section-remove input:focus {}
9821000
9831001 .cbi-button-reload,
9841002 .cbi-input-reload {
@@ -990,8 +1008,7 @@ button:focus {
9901008 .cbi-button-reload:active,
9911009 .cbi-button-reload:focus,
9921010 .cbi-input-reload:active,
993-.cbi-input-reload:focus {
994-}
1011+.cbi-input-reload:focus {}
9951012
9961013 .cbi-button-reset,
9971014 .cbi-input-reset {
@@ -1003,8 +1020,7 @@ button:focus {
10031020 .cbi-button-reset:active,
10041021 .cbi-button-reset:focus,
10051022 .cbi-input-reset:active,
1006-.cbi-input-reset:focus {
1007-}
1023+.cbi-input-reset:focus {}
10081024
10091025 .cbi-button-edit,
10101026 .cbi-input-edit {
@@ -1016,8 +1032,7 @@ button:focus {
10161032 .cbi-button-edit:active,
10171033 .cbi-button-edit:focus,
10181034 .cbi-input-edit:active,
1019-.cbi-input-edit:focus {
1020-}
1035+.cbi-input-edit:focus {}
10211036
10221037 .cbi-button-apply,
10231038 .cbi-input-apply {
@@ -1029,8 +1044,7 @@ button:focus {
10291044 .cbi-button-apply:active,
10301045 .cbi-button-apply:focus,
10311046 .cbi-input-apply:active,
1032-.cbi-input-apply:focus {
1033-}
1047+.cbi-input-apply:focus {}
10341048
10351049 .cbi-button-save,
10361050 .cbi-input-save {
@@ -1042,14 +1056,13 @@ button:focus {
10421056 .cbi-button-save:active,
10431057 .cbi-button-save:focus,
10441058 .cbi-input-save:active,
1045-.cbi-input-save:focus {
1046-}
1059+.cbi-input-save:focus {}
10471060
10481061 /* LuCI 18 DynamicList */
1049-input[type="text"] + .cbi-button,
1050-input[type="password"] + .cbi-button,
1051-select + .cbi-button {
1052- padding: 4px 8px;
1062+input[type="text"]+.cbi-button,
1063+input[type="password"]+.cbi-button,
1064+select+.cbi-button {
1065+ padding: 4px 8px;
10531066 }
10541067
10551068
@@ -1121,9 +1134,9 @@ select + .cbi-button {
11211134 text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
11221135 border-radius: 4px;
11231136 box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
1124- display: inline-flex;
1137+ /* display: inline-flex; */
11251138 flex-direction: column;
1126- line-height: 1.2em;
1139+ line-height: 1.6em;
11271140 min-width: 100px;
11281141 }
11291142
@@ -1259,8 +1272,7 @@ footer a {
12591272
12601273 /* login */
12611274 body.node-main-login {
1262- /* background: url(bg.jpg); */
1263- background: linear-gradient(#22b9a4, #9a87d4);
1275+ background: rgba(0, 0, 0, 0.7);
12641276 background-repeat: no-repeat;
12651277 background-size: 100% 100%;
12661278 -moz-background-size: 100% 100%;
@@ -1272,6 +1284,10 @@ body.node-main-login>header {
12721284 border-bottom: none;
12731285 }
12741286
1287+body.node-main-login>header .brand {
1288+ display: none;
1289+}
1290+
12751291 body.node-main-login .alert-message {
12761292 z-index: 999;
12771293 }
@@ -1283,32 +1299,17 @@ body.node-main-login .alert-message {
12831299 border-radius: .375rem;
12841300 text-align: center;
12851301 position: absolute;
1286- top: 50%;
1302+ top: 30%;
12871303 left: 50%;
12881304 transform: translate(-50%, -50%);
1305+ background: #fff;
12891306 }
12901307
12911308 .node-main-login>.container>form .errorbox {
12921309 color: red;
12931310 }
12941311
1295-.node-main-login>.container>form>.cbi-map>h2 {
1296- width: 100px;
1297- height: 100px;
1298- color: #fff;
1299- text-align: center;
1300- letter-spacing: 4px;
1301- display: block;
1302- margin: -100px auto 15px auto;
1303- padding: 0;
1304- text-indent: -500px;
1305- overflow: hidden;
1306- border-radius: 60px;
1307- /* border: #ccc 3px solid; */
1308- background-image: url(wifi.png);
1309- background-size: cover;
1310- /* box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(156, 39, 176, 0.4); */
1311-}
1312+.node-main-login>.container>form>.cbi-map>h2 {}
13121313
13131314 .node-main-login>.container>form input[name='luci_username'],
13141315 .node-main-login>.container>form input[name='luci_password'] {
@@ -1334,6 +1335,14 @@ body.node-main-login .alert-message {
13341335 text-align: center !important;
13351336 }
13361337
1338+.node-main-login>.container .cbi-button-apply {
1339+ width: 100% !important;
1340+}
1341+
1342+.node-main-login>.container .cbi-button-reset {
1343+ display: none;
1344+}
1345+
13371346 /* luci18 */
13381347 .cbi-section-table-titles.named::before {
13391348 content: attr(data-title) " ";
@@ -1365,6 +1374,10 @@ body.node-main-login .alert-message {
13651374 }
13661375
13671376 /* luci 19 */
1377+.node-main-login>header .nav {
1378+ display: none;
1379+}
1380+
13681381 body.modal-overlay-active {
13691382 overflow: hidden;
13701383 height: 100vh;
@@ -1575,18 +1588,18 @@ body.modal-overlay-active #modal_overlay>.modal {
15751588 }
15761589
15771590 header [data-indicator] {
1578- padding: 1px 3px 2px;
1579- font-size: 9.75px;
1580- font-weight: bold;
1581- color: #fff !important;
1582- text-transform: uppercase;
1583- white-space: nowrap;
1584- background-color: #bfbfbf;
1585- border-radius: 3px;
1586- text-shadow: none;
1587- margin-left: .4em;
1591+ padding: 1px 3px 2px;
1592+ font-size: 9.75px;
1593+ font-weight: bold;
1594+ color: #fff !important;
1595+ text-transform: uppercase;
1596+ white-space: nowrap;
1597+ background-color: #bfbfbf;
1598+ border-radius: 3px;
1599+ text-shadow: none;
1600+ margin-left: .4em;
15881601 }
15891602
15901603 header [data-indicator][data-style="active"] {
1591- background-color: #62cffc;
1604+ background-color: #62cffc;
15921605 }
\ No newline at end of file
Binary files a/themes/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/wifi.png and /dev/null differ
--- a/themes/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_mod/footer.htm
+++ b/themes/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_mod/footer.htm
@@ -19,7 +19,18 @@
1919 </body>
2020 </html>
2121 <script>
22- window.onload = function(){
22+ function addLoadEvent(func) {
23+ var oldonload = window.onload;
24+ if (typeof window.onload != 'function') {
25+ window.onload = func;
26+ } else {
27+ window.onload = function () {
28+ oldonload();
29+ func();
30+ }
31+ }
32+ }
33+ addLoadEvent(function(){
2334 var content = document.getElementsByName("content");
2435 var luci_username = document.getElementsByName("luci_username");
2536 var luci_password = document.getElementsByName("luci_password");
@@ -49,6 +60,6 @@
4960 }
5061 }
5162 }
52- }
63+ });
5364 </script>
5465 </html>
Show on old repository browser