diff options
Diffstat (limited to 'themes')
26 files changed, 3241 insertions, 4678 deletions
diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css index ab4e08a9e9..21a2291e5b 100644 --- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css +++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css @@ -454,11 +454,14 @@ select, padding: 4px; font-size: 13px; line-height: 18px; - color: #808080; border: 1px solid #ccc; border-radius: 3px; } +.uneditable-input { + color: #808080; +} + .cbi-dropdown, .cbi-dynlist { min-width: 210px; diff --git a/themes/luci-theme-freifunk-generic/Makefile b/themes/luci-theme-freifunk-generic/Makefile deleted file mode 100644 index 2fc62fdbca..0000000000 --- a/themes/luci-theme-freifunk-generic/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# -# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org> -# -# This is free software, licensed under the Apache License, Version 2.0 . -# - -include $(TOPDIR)/rules.mk - -LUCI_TITLE:=Freifunk Generic Theme -LUCI_DEPENDS:= - -include ../../luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css deleted file mode 100644 index 590eb3d979..0000000000 --- a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css +++ /dev/null @@ -1,1792 +0,0 @@ -@charset "utf-8"; - -@media all { - -html { - min-height: 100%; - height: auto; -} - -body { - color: #ccc; - background: #e5eef5 linear-gradient(#fff 0%, #e5eef5 100%) no-repeat; - font-family: Verdana, Arial, sans-serif; - font-size: 100%; - line-height: 100%; - padding-bottom: 1.5em; -} - -html, body { - height: 99%; -} - -* { - margin: 0; - padding: 0; - box-sizing: border-box; -} - -.table { display: table; width: 100%; position: relative; } -.tr { display: table-row; } -.thead { display: table-header-group; } -.tbody { display: table-row-group; } -.tfoot { display: table-footer-group; } -.td, .th { display: table-cell; } -.th { font-weight: bold; } - -.table[width="33%"], .th[width="33%"], .td[width="33%"] { width: 33%; } -.table[width="100%"], .th[width="100%"], .td[width="100%"] { width: 100%; } - -.col-1 { flex: 1 1 30px !important; -webkit-flex: 1 1 30px !important; } -.col-2 { flex: 2 2 60px !important; -webkit-flex: 2 2 60px !important; } -.col-3 { flex: 3 3 90px !important; -webkit-flex: 3 3 90px !important; } -.col-4 { flex: 4 4 120px !important; -webkit-flex: 4 4 120px !important; } -.col-5 { flex: 5 5 150px !important; -webkit-flex: 5 5 150px !important; } -.col-6 { flex: 6 6 180px !important; -webkit-flex: 6 6 180px !important; } -.col-7 { flex: 7 7 210px !important; -webkit-flex: 7 7 210px !important; } -.col-8 { flex: 8 8 240px !important; -webkit-flex: 8 8 240px !important; } -.col-9 { flex: 9 9 270px !important; -webkit-flex: 9 9 270px !important; } -.col-10 { flex: 10 10 300px !important; -webkit-flex: 10 10 300px !important; } - -.tr.placeholder { - height: 3.5em; -} - -.tr.placeholder > .td { - position: absolute; - left: 1px; - right: 1px; - bottom: 1px; - text-align: center; - line-height: 3em; -} - -abbr, -acronym { - font-style: normal; - font-variant: normal; -} - -abbr[title], -acronym[title] { - border-bottom: 1px dotted; - cursor: help; -} - -a:link abbr[title], -a:visited abbr[title], -a:link acronym[title], -a:visited acronym[title] { - cursor: pointer; -} - -code { - font-family: monospace; - white-space: pre; -} - -h2, h3, h4, legend { - font-size: 150%; - font-family: Trebuchet MS, Verdana, sans-serif; - font-weight: bold; - margin: .25em 0 .5em 0; - border-bottom: 1px solid; - padding-bottom: 4px; - display: block; - width: 100%; -} - -h3, legend { - font-size: 125%; -} - -h4 { - font-size: 112%; -} - -.cbi-section-node + h4 { - margin-top: 1em; -} - -fieldset { border: none; } - -fieldset > legend { float: left; } -fieldset > legend + * { clear: both; } - -#maincontent ul { - margin-left: 2em; -} - -.warning { - color: red; - background-color: white; - font-weight: bold; - text-decoration: blink; -} - -.clear { - clear: both; -} - -a img { - border: 0; -} - -.skiplink, -.navigation, -.hidden { - position: absolute; - left: -1000px; - top: -1000px; - width: 0px; - height: 0px; - overflow: hidden; - display: inline; -} - -.error { - color: #f00; - background-color: white; -} - -.alert-message { - font-weight: normal; - padding: .5em; - border-radius: 3px; - color: #000; -} - -.alert-message, .cbi-tooltip.error { - background: #fee; - color: #a22; -} - -.alert-message.notice, .cbi-tooltip.notice { - background: linear-gradient(#ccc 0%, #eee 100%); - color: #4a6b7c; -} - -.alert-message.warning, .cbi-tooltip.warning { - background: linear-gradient(#dda 0%, #dd8 100%); - color: #c00; -} - -.alert-message > * { - margin: .5em; -} - -.alert-message > h4 { - font-weight: bold; -} - - -.ifacebadge, .ifacebox { - display: inline-flex; - align-content: center; - border: 1px solid #ccc; - border-radius: 3px; - padding: 2px; - background: #fff; - margin: .25em .5em; -} - -.ifacebox-head { - background: #eee; -} - -.ifacebox-head.active { - background: #90c0e0; -} - -.ifacebadge, .zonebadge { - align-items: center; -} - -.ifacebadge > * { - align-self: flex-start; -} - -.ifacebadge > img, -.ifacebadge > em { - margin-right: 5px; - display: inline-block; - height: 16px; -} - -.ifacebadge-active { - border-color: #000000; - font-weight: bold; -} - -.ifacebox { - flex-direction: column; - margin: 0; - padding: 0; - min-width: 100px; - text-align: center; -} - -.ifacebox > * { - padding: 2px; -} - -.td > .ifacebadge, -.td > .zonebadge { - margin: 0; - vertical-align: top; -} - -.network-status-table { - display: flex; - flex-wrap: wrap; -} - -.network-status-table .ifacebox { - margin: .5em; - font-size: 90%; - flex-grow: 1; -} - -.network-status-table .ifacebox-body { - display: flex; - flex-direction: column; - flex: 1 0; -} - -.network-status-table .ifacebox-body > span { - flex: 10; -} - -.network-status-table .ifacebox-body > div { - display: flex; - flex-wrap: wrap; -} - -.ifacebadge.large, -.network-status-table .ifacebox-body .ifacebadge { - flex: 1; - margin: .5em .25em .25em .25em; - padding: .5em; - min-width: 220px; - white-space: nowrap; -} - - -.zonebadge { - padding: 2px; - display: inline-block; - white-space: nowrap; - border-radius: 3px; -} - -.zonebadge > em, -.zonebadge > strong { - margin: 3px; -} - -.zonebadge input { - width: 6em; - height: 1.5em; -} - -.zonebadge .ifacebadge, -.cbi-dropdown .ifacebadge { - margin: 1px; -} - -.zonebadge .ifacebadge img, -.zonebadge .ifacebadge em, -.cbi-dropdown .ifacebadge img, -.cbi-dropdown .ifacebadge em { - margin: 0 1px; -} - -.zonebadge-empty { - border: 1px dashed #AAAAAA; - color: #AAAAAA; - font-style: italic; - font-size: smaller; -} - - - -#header { - height: auto; - background: #FFF url(header.jpg) repeat-x left bottom; - color: #ccc; - font-weight: bold; - text-align:right; -} - -.header_left { - padding-bottom: 10px; -} - -.header_left img { - padding: 10px 10px 0px 10px; -} - -.header_banner { - overflow:hidden; - padding-bottom: 6px; - text-align:left; -} - -.header_banner img{ - padding: 0px; -} - -.header_left { - text-align:left; - max-width: 50%; - float:left; -} - -.header_left a { - color: #dc0067; - font: bold 36px Helvetica, Verdana, Arial, sans-serif; - text-decoration: none; -} - -#header h1, -.header_right { - max-width: 45%; - text-align: right; - font-size: 70%; - font-weight: normal; - line-height: 160%; - float:right; - padding: 10px 10px 0 0; -} - -ul.dropdowns { - float: left; - margin: 0; - padding: 0; - width: auto; - list-style: none; -} - -html>body ul.dropdowns { - position: relative; -} - -ul.dropdowns li, -ul.dropdowns ul { - margin: 0; - padding: 0; - list-style: none; -} - -ul.dropdowns li { - float: left; - position: relative; - white-space: nowrap; -} - -ul.dropdowns li ul { - position: absolute; - z-index: 1100; - top: auto; - min-width: 10em; -} - -ul.dropdowns li li { - float: none; - position: relative; -} - -ul.dropdowns li a { - display: block; -} - -ul.dropdowns ul li ul { - top: 0; -} - -ul.dropdowns li ul, -ul.dropdowns li.over ul ul, -ul.dropdowns li.focus ul ul, -ul.dropdowns li:hover ul ul, -ul.dropdowns li.over ul ul ul, -ul.dropdowns li.focus ul ul ul, -ul.dropdowns li:hover ul ul ul, -ul.dropdowns li.over ul ul ul ul, -ul.dropdowns li.focus ul ul ul ul, -ul.dropdowns li:hover ul ul ul ul { - left: -3000px; -} - -ul.dropdowns li.over ul, -ul.dropdowns li.focus ul, -ul.dropdowns li:hover ul { - left: 0; -} - -ul.dropdowns ul li.over ul, -ul.dropdowns ul li.focus ul, -ul.dropdowns ul li:hover ul, -ul.dropdowns ul ul li.over ul, -ul.dropdowns ul ul li.focus ul, -ul.dropdowns ul ul li:hover ul, -ul.dropdowns ul ul ul li.over ul, -ul.dropdowns ul ul ul li.focus ul, -ul.dropdowns ul ul ul li:hover ul { - left: 100%; -} - -#xhr_poll_status { - cursor: pointer; -} - -#xhr_poll_status #xhr_poll_status_off { - font-weight: bold; - color: #FF0000; -} - -#xhr_poll_status #xhr_poll_status_on { - font-weight: bold; - color: #00FF00; -} - -#menubar { - position: relative; - width: 100%; - background: #FFF; - color: #004a9c; - border-bottom: 1px dotted #5A5A5A; -} -#menubar .warning { - color: red; - background-color: #FFF; -} - -#menubar ul.dropdowns { - min-height: 1.8em; - background: #FFF; - color: #004a9c; -} - -#menubar ul.dropdowns li ul { - background: #FFF; - color: #004a9c; - border-width: 0 1px 1px 1px; - border-style: dotted; - border-color: #5a5a5a; -} - -#menubar ul.dropdowns ul li ul { - border-width: 1px; -} - -html #menubar a:link, -html #menubar a:visited { - position: relative; - display: block; - padding: 0.5em; - background: #FFF; - color: #004a9c; - text-decoration: none; - font-size: 80%; - font-weight: normal; -} - -html #menubar a:link:hover, -html #menubar a:visited:hover, -html #menubar a:link:active, -html #menubar a:visited:active, -#menubar a:link:focus, -#menubar a:visited:focus { - background: #F2F2F2; - color: #e60076; -} - -html #menubar a:link.active, -html #menubar a:visited.active, -html #menubar a:link.preactive, -html #menubar a:visited.preactive { - background: #FFF; - color: #e60076; -} - -html #menubar a:link.warning, -html #menubar a:visited.warning { - background: #FFF; - color: red; - font-weight: bold; - text-decoration: blink; -} - -#menubar ul.dropdowns li.over>a, -#menubar ul.dropdowns li.focus>a, -#menubar ul.dropdowns li:hover>a { -} - -.lang_de #submenu_mini_system { min-width: 13.3em; } -* html .lang_de #submenu_mini_system { width: 13.3em; } - -.lang_pt-br #submenu_mini_network { min-width: 14em; } -* html .lang_pt-br #submenu_mini_network { width: 14em; } - -.lang_pt-br #submenu_mini_system { min-width: 11.5em; } -* html .lang_pt-br #submenu_mini_system { width: 11.5em; } - -.lang_ru #submenu_mini_system { min-width: 18em; } -* html .lang_ru #submenu_mini_system { width: 18em; } - -.lang_pt-br #submenu_admin_index { min-width: 11em; } -* html .lang_pt-br #submenu_admin_index { width: 11em; } - -.lang_ru #submenu_admin_index { min-width: 15.5em; } -* html .lang_ru #submenu_admin_index { width: 15.5em; } - -.lang_ru #submenu_admin_status { min-width: 10.5em; } -* html .lang_ru #submenu_admin_status { width: 10.5em; } - -.lang_de #submenu_admin_system { min-width: 13.3em; } -* html .lang_de #submenu_admin_system { width: 13.3em; } - -.lang_fr #submenu_admin_system { min-width: 14.5em; } -* html .lang_fr #submenu_admin_system { width: 14.5em; } - -.lang_pt-br #submenu_admin_system { min-width: 11.5em; } -* html .lang_pt-br #submenu_admin_system { width: 11.5em; } - -.lang_ru #submenu_admin_system { min-width: 18em; } -* html .lang_ru #submenu_admin_system { width: 18em; } - -#submenu_admin_services_chillispot { min-width: 15.5em; } -* html #submenu_admin_services_chillispot { width: 15.5em; } - -#submenu_admin_services_coovachilli { min-width: 15em; } -* html #submenu_admin_services_coovachilli { width: 15em; } - -.lang_ru #submenu_admin_network_routes { min-width: 15.3em; } -* html .lang_ru #submenu_admin_network_routes { width: 15.3em; } - -#submenu_admin_network_firewall { min-width: 14em; } -* html #submenu_admin_network_firewall { width: 14em; } - -.lang_de #submenu_admin_network_firewall { min-width: 16.5em; } -* html .lang_de #submenu_admin_network_firewall { width: 16.5em; } - -.lang_pt-br #submenu_admin_network_firewall { min-width: 15em; } -* html .lang_pt-br #submenu_admin_network_firewall { width: 15em; } - -#modemenu { -/* width: auto;*/ - background: #000; - color: #fff; - list-style: none; - margin-right: 1px; -} - -#modemenu li { - float: right; - list-style: none; -} - -#savemenu { - float: right; - margin-right: 2em; -} - -#applyreboot-section { - line-height: 300%; -} - -.lang_de #submenu_admin_uci { - width: 12em; -} - -.lang_ru #submenu_admin_uci { - width: 11.5em; -} - -textarea#syslog { - width: 98%; - min-height: 500px; - border: 3px solid #ccc; - padding: 5px; - font-family: monospace; -} - - -#maincontent { - clear: both; - width: 90%; - margin: 0 auto; - padding: 0.5em; - color: #000; - font-size: 80%; -} - -#maincontent p { - margin-bottom: 1em; -} - -.cbi-section { - margin-bottom: 1.5em; - color: #000; -} - -.cbi-section-descr { - margin-bottom: 0.5em; - font-size: 95%; -} - -.cbi-title-ref { - color: inherit; - text-decoration: none; - padding-right: 18px; - background: url('../resources/cbi/link.gif') no-repeat scroll right center; - background-color: inherit; -} - -ul.cbi-apply { - font-size: 90%; -} - -ul.cbi-tabmenu { - list-style-type: none; - display: flex; - margin: 0 0 .5em 0 !important; - padding: 0 0 0 5px; - border-bottom: 1px solid #bbb; -} - -ul.cbi-tabmenu li { - display: inline-flex; - margin: 0 5px -1px 0; - flex: 0 1 auto; - border: 1px solid #bbb; - border-bottom: none; - border-radius: 3px 3px 0 0; - background: linear-gradient(#ddd 90%, #aaa 100%); - color: #888; - overflow: hidden; - text-overflow: ellipsis; - word-wrap: break-word; -} - -ul.cbi-tabmenu li a, -ul.cbi-tabmenu li a:hover { - text-decoration: none; - color: inherit; - padding: 5px; - flex: 1; - width: 100%; - height: 100%; -} - -ul.cbi-tabmenu li.cbi-tab-highlighted { - color: #000; - background: #fea; -} - -ul.cbi-tabmenu li.cbi-tab { - color: #000; - background: #fff; -} - -ul.cbi-tabmenu + .cbi-section-node { - margin-top: -.5em; -} - -[data-tab-title] { - height: 0; - opacity: 0; - overflow: hidden; -} - -[data-tab-active="true"] { - opacity: 1; - height: auto; - overflow: visible; - transition: opacity .25s ease-in; -} - -div.cbi-tab-descr { - background-image: url(/luci-static/resources/cbi/help.gif); - background-position: 0.25em 50%; - background-repeat: no-repeat; - border-bottom: 1px solid #ccc; - margin: 0.25em 0.25em 2em; - padding: 0.5em 0.5em 0.5em 2em; -} - -input[type=submit], -input[type=reset], -input[type=image], -input[type=button] { - cursor: pointer; -} - -select, -input, -textarea { - background: #fff; - color: #000; - border: 1px solid #cccccc; -} - -input[type=image] { - border: none; -} - -input:focus, -input:hover, -select:focus, -select:hover, -textarea:focus, -textarea:hover { - background-color: #fff; - color: #000; -} - -select, -input[type=text], -input[type=password] { - width: 20em; - font-size: inherit; - line-height: 13pt; - height: 14pt; -} - -select[multiple] { - height: auto; -} - -input[type=radio], -input[type=checkbox], -[data-dynlist] > input + img, -input.cbi-input-password + img { - vertical-align: middle; -} - -.td select, -.td .cbi-dropdown, -.td input[type=text] { - width: 100%; -} - -.td [data-dynlist] > input, -.td input.cbi-input-password { - width: calc(100% - 20px); -} - -img.cbi-image-button { - cursor: pointer; - margin: 0 2px; - vertical-align: middle; -} - -.btn, .cbi-button { - padding: 0 .5em; - border-radius: 3px; - border: 1px solid #aaa; - text-decoration: none; - color: #000; - display: inline-block; - font-size: inherit; - -webkit-appearance: none; - background: #fff; - text-align: center; - font-weight: bold; - line-height: 13pt; - height: 14pt; -} - -.btn:hover, .cbi-button:hover { - box-shadow: 0 0 3px #59d; -} - -.btn[disabled], -.btn[disabled]:hover, -.cbi-button[disabled], -.cbi-button[disabled]:hover { - opacity: .6; - cursor: default; - pointer-events: none; -} - -.cbi-button-positive, -.cbi-button-fieldadd, -.cbi-button-add, -.cbi-button-save { - border-color: #7b7; - color: #7b7; -} - -.cbi-button-neutral, -.cbi-button-reset, -.cbi-button-download, -.cbi-button-find, -.cbi-button-link, -.cbi-button-up, -.cbi-button-down { - border-color: #444; - color: #444; -} - -.cbi-button-action, -.cbi-button-apply, -.cbi-button-reload, -.cbi-button-edit { - border-color: #59d; - color: #59d; -} - -.cbi-button-negative, -.cbi-section-remove .cbi-button, -.cbi-button-remove { - border-color: #b77; - color: #b77; -} - -.cbi-button-action.important, -.cbi-page-actions .cbi-button-apply, -.cbi-section-actions .cbi-button-edit { - color: #fff; - background: #59d; -} - -.cbi-button-positive.important, -.cbi-page-actions .cbi-button-save { - color: #fff; - background: #7b7; -} - -.cbi-page-actions .cbi-button-apply + .cbi-button-save { - background: #fff; - color: #7b7; -} - -.cbi-input-invalid { - background-image: url('../resources/cbi/reset.gif'); - background-repeat: no-repeat; - background-position: right; - color: #FF0000 !important; - border-color: #FF0000; -} - -.cbi-input-invalid { - background-image: url('../resources/cbi/reset.gif'); - background-repeat: no-repeat; - background-position: right; - color: #FF0000 !important; - border-color: #FF0000; -} - -div.cbi-section-remove input { - border-bottom: none; -} - -textarea { - margin-left: -1px; - margin-bottom: 0.5em; -} - -.table .td, .table .th { - color: #000000; - padding: .25em; -} - -.table.smalltext { - background: #f5f5f5; - color: #000; - border: 1px solid #666; - font-size: 90%; - width: 80%; - margin-left: auto; - margin-right: auto; - border-collapse: collapse; -} - -.table.smalltext .tr:hover .td { - background-color: #bbddee; - color: #000; -} - -.table.smalltext .tr .th { - padding: 0 0.25em; - border-left: 1px dotted #666; - text-align: left; -} - -.table.smalltext .tr .td { - padding: 0.2em; - border-top: 1px dotted #666; - border-left: 1px dotted #666; -} - -.cbi-section-node .tr:not(.placeholder):nth-child(even) { - background: #e5eef5; -} - -.table.cbi-section-table .cbi-section-table-cell { - padding: 3px; - white-space: nowrap; -} - -.table .tr > .th:empty { - display: none; -} - -.table.cbi-section-table .tr > *, -.table.cbi-section-table .tr[data-title]::before { - border-top: 1px dotted #bbb; - display: table-cell; -} - -.table.cbi-section-table .tr.table-titles > *, -.table.cbi-section-table .tr.cbi-section-table-titles > *, -.table.cbi-section-table .tr.cbi-section-table-desc > *, -.table.cbi-section-table .tr.table-titles::before, -.table.cbi-section-table .tr.cbi-section-table-titles::before, -.table.cbi-section-table .tr.cbi-section-table-desc::before { - border-top: none; -} - -.table.cbi-section-table .tr:hover::before, -.table.cbi-section-table .tr:hover > * { - background: #eee; -} - -.table.cbi-section-table .tr:nth-child(even):hover::before, -.table.cbi-section-table .tr:nth-child(even):hover > * { - background: #bde; -} - - -div.cbi-value { - clear: left; - vertical-align: middle; - padding-left: 0.25em; - border-bottom: 1px dotted #bbb; -} - -div.cbi-value:hover { - background: #f8f8f8; - color: #000; -} - -.cbi-value-title { - float: left; - width: 40%; - line-height: 1.8em; -} - -.cbi-value-field { - width: 58%; - margin-left: 40%; - padding: 0.25em 0; -} - -.td.cbi-value-field { - width: auto; - margin-left: 0; - align-self: center; -} - -.cbi-value-description { - background-image: url(/luci-static/resources/cbi/help.gif); - background-position: .25em .25em; - background-repeat: no-repeat; - margin: .25em 0 0 0; - padding: .25em .25em .25em 1.75em; -} - -.cbi-section-create { - padding: 0 0 .25em 0; - margin: -3px; - display: inline-flex; - align-items: center; -} - -.cbi-section-create > * { - margin: 3px; - flex: 1 1 auto; -} - -.cbi-section-create > * > input { - width: 100%; -} - -.cbi-section-remove > .cbi-button { - margin-bottom: -1px; - border-radius: 3px 3px 0 0; -} - -.cbi-section-node + .cbi-section-create { - padding-top: 0; -} - -div.cbi-map-descr { - margin-bottom: 1em; -} - -div.cbi-optionals { - padding: 0.25em; - border-bottom: 1px dotted #bbb; -} - - - -.cbi-section-node { - clear: both; - padding-bottom: 0; - position: relative; - border: 1px dotted #555; - background: #fff; - margin-bottom: 5px; -} - -.cbi-section-node-tabbed { - border-top: none; -} - -.cbi-section-node .cbi-optionals:last-child, -.cbi-section-node .cbi-value:last-child { - border-bottom: none; -} - -.table.cbi-section-table { - width: 100%; - font-size: 95%; - border: 1px dotted #444; - background: #fff; - margin: 0 0 .5em 0; -} - -.cbi-section-node > .table.cbi-section-table { - border: none; - margin: 0; -} - -@keyframes flash { - 0% { opacity: 1; } - 50% { opacity: .5; } - 100% { opacity: 1; } -} - -.tr.cbi-section-table-row.flash { - animation: flash .35s; -} - -.tr.cbi-section-table-descr .th { - font-weight: normal; - font-size: 90%; - vertical-align: top; -} - -.td.cbi-section-table-optionals { - text-align: left !important; - padding-top: 1em; -} - -.th.cbi-section-actions, -.td.cbi-section-actions { - display: flex; - justify-content: flex-end; - flex-direction: row; - flex: 1 1 150px; - margin: auto 0 auto auto; -} - -.td.cbi-section-actions > form { - display: flex; -} - -.td.cbi-section-actions > *, -.td.cbi-section-actions > form > * { - flex: 1 1 4em; - margin: 1px; -} - -.cbi-page-actions { - display: flex; - justify-content: flex-end; - margin: -3px; - padding: 0 .25em .25em .25em; -} - -.cbi-page-actions > form { - display: flex; -} - -.cbi-page-actions > * { - flex: 0 1 auto; - margin: 3px; -} - -.cbi-page-actions > form > * { - flex: 1; - margin: 0 3px 0 0; -} - -.cbi-page-actions > .cbi-button-link, -.cbi-page-actions > form[method="get"]:first-child { - margin-right: auto; -} - - -.th[data-type="button"], .td[data-type="button"], -.th[data-type="fvalue"], .td[data-type="fvalue"] { - flex: 1 1 2em; - text-align: center; -} - -#cbi-network-switch_vlan .th, -#cbi-network-switch_vlan .td { - flex-basis: 12%; -} - -#cbi-wireless-overview .td:first-child { - align-self: center; -} - -.td[data-title]::before { - content: attr(data-title) ":\20"; - font-weight: bold; - text-align: left; - display: none; - padding: 1px; - white-space: nowrap; -} - -.tr.placeholder .td[data-title]::before { - display: none; -} - -.tr[data-title]::before, -.tr.cbi-section-table-titles.named::before { - content: attr(data-title) "\20"; - font-weight: bold; - text-align: left; - display: inline-block; - align-self: center; - flex: 1 1 5%; - padding: .25em; - white-space: normal; - word-wrap: break-word; -} - -.cbi-value-helpicon img { - vertical-align: bottom; -} - -div.cbi-error { - font-size: 95%; - font-weight: bold; - color: #f00; - background-color: #fff; -} - -td.cbi-value-error { - border-color: red; -} - -.cbi-value-error input, -.cbi-value-error select { - color: red; - background-color: #fcc; -} - -.cbi-section-error { - color: red; - background-color: white; - font-size: 95%; - border: 1px dotted red; - margin: 3px; - padding: 3px; -} - - -.cbi-dropdown { - border: 1px solid #ccc; - display: inline-flex; - cursor: pointer; - background: #fff; - position: relative; - padding: 0; - color: #000; - min-width: 20em; - max-width: 100%; -} - -.cbi-dropdown:focus { - outline: 2px solid #4b6e9b; -} - -.cbi-dropdown > ul { - margin: 0 !important; - padding: 0; - list-style: none; - overflow-x: hidden; - overflow-y: auto; - display: flex; - width: 100%; -} - -.cbi-dropdown > ul.preview { - display: none; -} - -.cbi-dropdown > .open { - background: #eee; - border: 2px outset #eee; - flex-basis: 15px; -} - -.cbi-dropdown > .open, -.cbi-dropdown > .more { - flex-grow: 0; - flex-shrink: 0; - display: flex; - flex-direction: column; - justify-content: center; - text-align: center; - line-height: 2em; - padding: 0 .25em; -} - -.cbi-dropdown > .more, -.cbi-dropdown > ul > li[placeholder] { - color: #777; - font-weight: bold; - text-shadow: 1px 1px 0px #fff; - display: none; -} - -.cbi-dropdown > ul > li { - display: none; - padding: .25em; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - flex-shrink: 1; - flex-grow: 1; - align-items: center; - align-self: center; - min-height: 20px; -} - -.cbi-dropdown > ul > li .hide-open { display: initial; } -.cbi-dropdown > ul > li .hide-close { display: none; } - -.cbi-dropdown > ul > li[display]:not([display="0"]) { - border-left: 1px solid #ccc; -} - -.cbi-dropdown[empty] > ul { - max-width: 1px; -} - -.cbi-dropdown > ul > li > form { - display: none; - margin: 0; - padding: 0; - pointer-events: none; -} - -.cbi-dropdown > ul > li img { - vertical-align: middle; - margin-right: .25em; -} - -.cbi-dropdown > ul > li > form > input[type="checkbox"] { - margin: 0; -} - -.cbi-dropdown > ul > li input[type="text"] { - height: 20px; -} - -.cbi-dropdown[open] { - position: relative; -} - -.cbi-dropdown[open] > ul.dropdown { - display: block; - background: #f6f6f5; - border: 1px solid #918e8c; - box-shadow: 0 0 4px #918e8c; - position: absolute; - z-index: 1000; - max-width: none; - min-width: 100%; - width: auto; -} - -.cbi-dropdown > ul > li[display], -.cbi-dropdown[open] > ul.preview, -.cbi-dropdown[open] > ul.dropdown > li, -.cbi-dropdown[multiple] > ul > li > label, -.cbi-dropdown[multiple][open] > ul.dropdown > li, -.cbi-dropdown[multiple][more] > .more, -.cbi-dropdown[multiple][empty] > .more { - flex-grow: 1; - display: flex; - align-items: center; -} - -.cbi-dropdown[empty] > ul > li, -.cbi-dropdown[optional][open] > ul.dropdown > li[placeholder], -.cbi-dropdown[multiple][open] > ul.dropdown > li > form { - display: block; -} - -.cbi-dropdown[open] > ul.dropdown > li .hide-open { display: none; } -.cbi-dropdown[open] > ul.dropdown > li .hide-close { display: initial; } - -.cbi-dropdown[open] > ul.dropdown > li { - border-bottom: 1px solid #ccc; -} - -.cbi-dropdown[open] > ul.dropdown > li[selected] { - background: #b0d0f0; -} - -.cbi-dropdown[open] > ul.dropdown > li.focus { - background: linear-gradient(90deg, #a3c2e8 0%, #84aad9 100%); -} - -.cbi-dropdown[open] > ul.dropdown > li:last-child { - margin-bottom: 0; - border-bottom: none; -} - -.cbi-dropdown[disabled] { - pointer-events: none; - opacity: .6; -} - - -.cbi-tooltip-container { - cursor: help; -} - -.cbi-tooltip { - position: absolute; - z-index: 1000; - left: -1000px; - border-radius: 3px; - background: #fff; - padding: 2px 5px; - white-space: pre; - opacity: 0; - transition: opacity .25s ease-out; - pointer-events: none; - box-shadow: 0 0 2px #444; -} - -.cbi-tooltip-container:hover .cbi-tooltip { - left: auto; - opacity: 1; - transition: opacity .25s ease-in; -} - -.zonebadge .cbi-tooltip { - padding: 1px; - background: inherit; - margin: -1.6em 0 0 -5px; -} - - -.zone-forwards { - display: flex; - flex-wrap: wrap; -} - -.zone-forwards > * { - flex: 1 1 45%; - padding: 1px; -} - -.zone-forwards > span { - flex-basis: 10%; - text-align: center; -} - -.zone-forwards .zone-src, -.zone-forwards .zone-dest { - display: flex; - flex-direction: column; -} - - -.left, .left::before { - text-align: left !important; -} - -.right, .right::before { - text-align: right !important; -} - -.center, .center::before { - text-align: center !important; -} - -.td.bottom { - align-self: flex-end; -} - -.td.top { - align-self: flex-start; -} - -.td.middle { - align-self: center; -} - - -.footer, .push { - height: 2em; -} - -.footer { - width: 99%; - padding: 0.3em; -} - - -.wrapper { - min-height: 100%; - height: auto !important; - height: 100%; - margin: 0 auto -2em; -} - -.luci a:link, -.luci a:visited, -.exectime { - color: #666; - text-decoration: none; - font-size: 70%; -} - -.inline { - display: inline; -} - -.error500 { - white-space: normal; - border: 1px dotted #f00; - background-color: #fff; - color: #000; - padding: 0.5em; -} - -.uci-change-list { - font-family: monospace; -} - -.uci-change-list ins, -.uci-change-legend-label ins { - text-decoration: none; - border: 1px solid #00FF00; - background-color: #CCFFCC; - display: block; - padding: 2px; -} - -.uci-change-list del, -.uci-change-legend-label del { - text-decoration: none; - border: 1px solid #FF0000; - background-color: #FFCCCC; - display: block; - font-style: normal; - padding: 2px; -} - -.uci-change-list var, -.uci-change-legend-label var { - text-decoration: none; - border: 1px solid #CCCCCC; - background-color: #EEEEEE; - display: block; - font-style: normal; - padding: 2px; -} - -.uci-change-list var ins, -.uci-change-list var del { - /*display: inline;*/ - border: none; - white-space: pre; - font-style: normal; - padding: 0px; -} - -.uci-change-legend { - padding: 5px; -} - -.uci-change-legend-label { - width: 150px; - float: left; - font-size: 80%; -} - -.uci-change-legend-label>ins, -.uci-change-legend-label>del, -.uci-change-legend-label>var { - float: left; - margin-right: 4px; - width: 10px; - height: 10px; - display: block; -} - -.uci-change-legend-label var ins, -.uci-change-legend-label var del { - line-height: 6px; - border: none; -} - -} - -@media screen and (max-width: 992px) { - body { - -webkit-text-size-adjust: 100%; - } - - #maincontent { - width: 100%; - } - - .table { - display: flex; - flex-direction: column; - width: 100%; - } - - .tr { - display: flex; - flex-direction: row; - flex-wrap: wrap; - align-items: flex-end; - } - - .th, .td { - flex: 2 2 25%; - align-self: flex-start; - overflow: hidden; - text-overflow: ellipsis; - word-wrap: break-word; - display: inline-block; - } - - .td select { - word-wrap: normal; - } - - .td[data-type="button"], - .td[data-type="fvalue"] { - flex: 1 1 12.5%; - text-align: left; - } - - .td.cbi-value-field { - align-self: flex-start; - } - - .td.cbi-value-field .cbi-button { - width: 100%; - } - - .table.cbi-section-table { - border: none; - background: none; - margin: 0; - } - - .tr.table-titles, - .cbi-section-table-titles, - .cbi-section-table-descr { - display: none; - } - - .table.cbi-section-table .tr > *, - .table.cbi-section-table .tr[data-title]::before { - border-top: none; - } - - .cbi-section-table-row { - display: flex; - flex-direction: row; - flex-wrap: wrap; - border: 1px dotted #444; - margin: 0 0 .5em 0; - background: #fff; - } - - .cbi-section-table-row:hover { - border: 1px solid #4a6b7c; - } - - .table.cbi-section-table .tr:hover > *, - .table.cbi-section-table .tr:nth-child(2n):hover > * { - background: none; - } - - .cbi-section-table + .cbi-section-create { - padding-top: 0; - } - - .tr[data-title]::before { - display: block; - flex: 1 1 100%; - background: #eef; - } - - .td[data-title]::before { - display: block; - } - - .td.cbi-section-actions { - flex-basis: 100%; - margin: auto 0 0 auto; - } - - .td.cbi-section-actions > *, - .td.cbi-section-actions > form > * { - flex: 0 1 100%; - max-width: 150px; - } - - .hide-sm, - .hide-xs { - display: none; - } -} - -@media screen and (max-width: 480px) { - body { - font-size: 12pt; - } - - input, textarea, select { - font-size: 12pt !important; - line-height: 1.4em; - } - - select, input[type="text"], input[type="password"] { - width: 100%; - height: 1.4em; - } - - [data-dynlist] > input, - input.cbi-input-password { - width: calc(100% - 20px); - } - - .cbi-dropdown { - min-width: 100%; - } - - .btn, .cbi-button { - font-size: 9pt !important; - line-height: 11pt; - } - - #maincontent { - padding: .25em; - } - - #tabmenu { - margin: -.25em -.25em 1em -.25em; - } - - .th, .td { - flex: 2 2 50%; - } - - .td.cbi-value-field { - flex-basis: 100%; - } - - .td.cbi-value-field[data-type="dvalue"] { - flex-basis: 50%; - } - - .td.cbi-value-field[data-type="button"], - .td.cbi-value-field[data-type="fvalue"] { - flex-basis: 25%; - text-align: left; - } - - .cbi-section { - padding: .25em; - } - - .cbi-value { - padding: 0 .25em; - } - - .cbi-value-title { - float: none; - font-weight: bold; - } - - .cbi-value-field { - width: 100%; - margin: 0; - } - - .cbi-value-description { - margin-top: 5px; - display: block; - } - - .cbi-section-create { - margin-bottom: 1em; - } - - .cbi-optionals { - display: flex; - } - - .cbi-page-actions { - flex-wrap: wrap; - } - - .cbi-page-actions > .cbi-button-link { - flex-basis: 100%; - margin-right: 2px; - } - - .cbi-optionals > *, - .cbi-page-actions > * { - flex: 1 1 auto; - margin: 2px; - height: auto; - } - - ul.cbi-tabmenu { - padding: 0 3px; - } - - ul.cbi-tabmenu li { - font-size: 90%; - margin: 0 1px -1px 0; - } - - .hide-xs { - display: none; - } - - #cbi-network .td[id] > strong { - display: block; - } - - #cbi-network-switch_vlan .td.cbi-section-actions { - flex-basis: 100%; - } - - .network-status-table .ifacebox { - margin: 0 0 .5em 0; - } -} diff --git a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg Binary files differdeleted file mode 100644 index 2fde5a2125..0000000000 --- a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg +++ /dev/null diff --git a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg Binary files differdeleted file mode 100644 index ea06ce77f4..0000000000 --- a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg +++ /dev/null diff --git a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css deleted file mode 100644 index 37d77b4f43..0000000000 --- a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css +++ /dev/null @@ -1,59 +0,0 @@ -#header{ - padding-left:0px !important; - padding-bottom:24px; -} - -.header_left{ - max-width: 100%; -} - -#mainlogo { - max-width: 90%; -} - -#content { - margin-left:0px !important; -} - -#maincontent{ - font-size:1.2em; - line-height:1.5em; -} - -input[type=submit], -.cbi-button, -.cbi-button-reset, -.cbi-button-save{ - display:inline !important; - float:none !important; - padding:10px 30px !important; - margin: 10px 10px 10px 0 !important; -} - -.cbi-input-text, -.cbi-input-select, -.cbi-input-user, -.cbi-input-password{ - display:block !important; - margin: 0 !important; - padding:0 !important; -} - -.cbi-value-field{ - margin:0 !important; - margin-bottom: 1em !important; - width:100% !important; -} - -.cbi-section legend{ - white-space:normal !important; -} - -.cbi-value-title{ - font-weight:bold; - float:none !important; -} - -img { - max-width:100%; -} diff --git a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css deleted file mode 100644 index 660cd8df4d..0000000000 --- a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css +++ /dev/null @@ -1,3 +0,0 @@ -.header_right { - display:none; -} diff --git a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm deleted file mode 100644 index 4c38821bbd..0000000000 --- a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm +++ /dev/null @@ -1,30 +0,0 @@ -<%# - Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> - Licensed to the public under the Apache License 2.0. --%> - -<% - local ver = require "luci.version" - - local xtime - if exectime then - xtime = (string.format("%.2fs", os.clock() - exectime)) - end -%> - -</div> -<div class="clear"></div> -<div class="push"></div> -</div> - -<div class="footer"> -<p class="luci"><a href="https://github.com/openwrt/luci">Powered by <%= ver.luciname %> (<%= ver.luciversion %>)</a></p> -<% if xtime then %> -<p class="exectime">Script execution time: <%=xtime%></p> -<% end %> -</div> - -</body> -</html> - diff --git a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm deleted file mode 100644 index fa749325f6..0000000000 --- a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm +++ /dev/null @@ -1,224 +0,0 @@ -<%# - Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org> - Licensed to the public under the Apache License 2.0. --%> - -<% - local fs = require "nixio.fs" - local sys = require "luci.sys" - local util = require "luci.util" - local http = require "luci.http" - local disp = require "luci.dispatcher" - local version = require "luci.version" - - local sysinfo = util.ubus("system", "info") or { } - local loadinfo = sysinfo.load or { 0, 0, 0 } - local boardinfo = util.ubus("system", "board") or { } - - local request = disp.context.path - local category = request[1] - local cattree = category and disp.node(category) - - local tree = disp.node() - local node = disp.context.dispatched - - local categories = disp.node_childs(tree) - - local c = tree - local i, r - - -- tag all nodes leading to this page - for i, r in ipairs(request) do - if c.nodes and c.nodes[r] then - c = c.nodes[r] - c._menu_selected = true - end - end - - local uci = require "luci.model.uci".cursor() - local ff = uci:get("freifunk", "community", "name") or "" - local co = "profile_" .. ff - local community = uci:get_first(co, "community", "name") or "Freifunk" - local hp = uci:get_first(co, "community", "homepage") or "http://www.freifunk.net" - local logo = "/luci-static/freifunk-generic/logo.jpg" - local banner = false - local show_comm = true - - local file - for file in fs.glob("/www/luci-static/resources/custom_logo.*") do - logo = string.gsub(file, "/www", "") - break - end - - for file in fs.glob("/www/luci-static/resources/custom_logo_only.*") do - logo = string.gsub(file, "/www", "") - show_comm = false - break - end - - for file in fs.glob("/www/luci-static/resources/custom_header.*") do - logo = string.gsub(file, "/www", "") - show_comm = false - banner = true - end --%> - -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%=luci.i18n.context.lang%>" lang="<%=luci.i18n.context.lang%>"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta http-equiv="Content-Script-Type" content="text/javascript" /> -<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" /> -<link rel="stylesheet" media="only screen and (max-device-width: 854px)" href="<%=media%>/mobile.css" type="text/css" /> -<link rel="stylesheet" media="only screen and (max-width: 854px)" href="<%=media%>/smallscreen.css" type="text/css" /> -<link rel="stylesheet" media="handheld" href="<%=media%>/mobile.css" type="text/css" /> -<% if node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" /> -<% end -%> -<% if css then %><style title="text/css"> -<%= css %> -</style> -<% end -%> -<meta name="viewport" content="initial-scale=1.0" /> -<script type="text/javascript" src="<%=url('admin/translations', luci.i18n.context.lang)%><%# ?v=PKG_VERSION %>"></script> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> -<script type="text/javascript" src="<%=resource%>/xhr.js"></script> - -<title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(tostring(node.title)) or '')) %> - LuCI</title> -</head> - -<body class="lang_<%=luci.i18n.context.lang%>" data-page="<%= table.concat(disp.context.requestpath, "-") %>"> - -<div class="wrapper"> - -<!--[if lt IE 7]> -<div class="warning"><div style="background-color: #cccccc;padding: 2px 10px 2px 10px"> -<%: Your Internet Explorer is too old to display this page correctly. Please upgrade it to at least version 7 or use another browser like Firefox, Opera or Safari.%> -</div></div> -<![endif]--> - -<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%> - <div class="warning"> - <strong><%:No password set!%></strong><br /> - <%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%> - </div> -<%- end -%> - -<p class="skiplink"> -<span id="skiplink1"><a href="#navigation"><%:Skip to navigation%></a></span> -<span id="skiplink2"><a href="#content"><%:Skip to content%></a></span> -</p> - -<div id="header"> - <%if banner then%> - <div class="header_banner"> - <a href="<%=hp%>"><img src="<%=logo%>" alt="Header" /></a> - </div> - <%else%> - <div class="header_left"> - <a href="<%=hp%>"><img src="<%=logo%>" id="mainlogo" alt="Logo" /></a> - <%if show_comm then%> - <a href="<%=hp%>"><%=community%></a> - <br/> - <%end%> - </div> - <div class="header_right"> - <%=version.distversion%><br /> - <%:Load%>: <%="%.2f" % (loadinfo[1] / 65535.0)%> <%="%.2f" % (loadinfo[2] / 65535.0)%> <%="%.2f" % (loadinfo[3] / 65535.0)%><br /> - <%:Hostname%>: <%=boardinfo.hostname or "?"%><br /> - <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()"> - <%:Auto Refresh%>: - <span id="xhr_poll_status_on"><%:on%></span> - <span id="xhr_poll_status_off" style="display:none"><%:off%></span> - </span> - </div> - <div class="clear"></div> - - <%end%> -</div> - -<%- - local function submenu(prefix, node) - local childs = disp.node_childs(node) - if #childs > 0 then -%> - <ul id="submenu_<%=string.gsub(string.gsub(prefix, "/", "_"), "^_(.-)_$", "%1")%>"> - <%- - for i, r in ipairs(childs) do - local nnode = node.nodes[r] - local href = controller .. prefix .. r .. "/" .. - (nnode.query and http.build_querystring(nnode.query) or "") - %> - <li> - <a<%=ifattr(nnode._menu_selected, "class", "active")%> href="<%=luci.util.pcdata(href)%>"><%=translate(nnode.title)%></a> - <%- submenu(prefix .. r .. "/", nnode) %> - </li> - <%- - end - %> - </ul> -<% - end - end -%> - -<div id="menubar"> -<h2 class="navigation"><a id="navigation" name="navigation"><%:Navigation%></a></h2> -<ul id="mainmenu" class="dropdowns"> - <% - local childs = disp.node_childs(cattree) - if #childs > 0 then - for i, r in ipairs(childs) do - local nnode = cattree.nodes[r] - local href = controller .. "/" .. category .. "/" .. r .. - (nnode.query and http.build_querystring(k.query) or "") - %> - <li> - <a<%=ifattr(nnode._menu_selected, "class", "preactive")%> href="<%=href%>"><%=translate(nnode.title)%></a> - <%- submenu("/" .. category .. "/" .. r .. "/", nnode) %> - </li> - <% - end - end - %> - <li></li> -</ul> - -<% if #categories > 1 then %> - <ul id="modemenu"> - <% for i, r in ipairs(categories) do %> - <li><a<%=ifattr(request[1] == r, "class", "active")%> href="<%=controller%>/<%=r%>/"><%=striptags(translate(tree.nodes[r].title))%></a></li> - <% end %> - </ul> -<% end %> - -<% -if tree.nodes[category] and tree.nodes[category].ucidata then - local ucic = 0 - for i, j in pairs(require("luci.model.uci").cursor():changes()) do - for k, l in pairs(j) do - for m, n in pairs(l) do - ucic = ucic + 1; - end - end - end --%> - <div id="savemenu"> - <% if ucic > 0 then %> - <a class="uci_change_indicator warning" href="<%=controller%>/<%=category%>/uci/changes/?redir=<%=http.urlencode(http.formvalue('redir') or table.concat(disp.context.request, "/"))%>"><%:Unsaved Changes%>: <%=ucic%></a> - <% end -%> - </div> -<% end %> - -<div class="clear"></div> -</div> -<div id="maincontent"> -<% if category ~= "freifunk" and category ~= "splash" then %> -<noscript> - <div class="errorbox"> - <strong><%:JavaScript required!%></strong><br /> - <%:You must enable JavaScript in your browser or LuCI will not work properly.%> - </div> -</noscript> -<% end %> diff --git a/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/30_luci-theme-freifunk-generic b/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/30_luci-theme-freifunk-generic deleted file mode 100644 index 017e7f7bad..0000000000 --- a/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/30_luci-theme-freifunk-generic +++ /dev/null @@ -1,5 +0,0 @@ -uci batch <<-EOF - set luci.themes.Freifunk_Generic=/luci-static/freifunk-generic - set luci.main.mediaurlbase=/luci-static/freifunk-generic - commit luci -EOF diff --git a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css index 8c6f681105..2a88ef3750 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -15,6 +15,9 @@ * MUI: * https://github.com/muicss/mui * + * Menu and loading spinner icons from IcoMoon: + * https://icomoon.io + * * Pure CSS ripple effect: * https://github.com/mladenplavsic/css-ripple-effect * @@ -26,38 +29,6 @@ */ @import url("custom.css"); -/* - * Font generate by Icomoon<icomoon.io> - */ -@font-face { - font-family: "icomoon"; - font-weight: normal; - font-style: normal; - src: url("fonts/font.eot"); - src: url("fonts/font.eot") format("embedded-opentype"), - url("fonts/font.ttf") format("truetype"), - url("fonts/font.woff") format("woff"), - url("fonts/font.svg") format("svg"); -} - -::-webkit-scrollbar { - width: 10px; - height: 10px; - background: transparent; -} - -::-webkit-scrollbar-thumb { - background: #9e9e9e; -} - -::-webkit-scrollbar-thumb:hover { - background: #757575; -} - -::-webkit-scrollbar-thumb:active { - background: #424242; -} - .table { position: relative; display: table; @@ -161,20 +132,6 @@ flex: 10 10 300px !important; } -.cbi-button-up, -.cbi-button-down, -.cbi-value-helpicon, -.showSide { - font-family: "icomoon" !important; - font-weight: normal; - font-style: normal; - font-variant: normal; - line-height: 1; - text-transform: none; - -webkit-font-smoothing: antialiased; - speak: none; -} - * { box-sizing: border-box; margin: 0; @@ -247,12 +204,12 @@ input, select, .cbi-dropdown { width: inherit; + cursor: default; } select:not([multiple="multiple"]):focus, input:not(.cbi-button):focus, -.cbi-dropdown:focus, -.cbi-dynlist > .item:focus { +.cbi-dropdown:focus { border-color: #09c; border-color: var(--main-color); } @@ -270,7 +227,6 @@ code { font-size-adjust: .35; padding: 1px 3px; color: #101010; - border: thin solid #999; border-radius: 2px; background: #ddd; } @@ -317,6 +273,12 @@ footer > a { color: #aaa; } +small { + font-size: 90%; + line-height: 1.42857143; + white-space: normal; +} + .main { position: relative; top: 4rem; @@ -339,7 +301,7 @@ footer > a { .main > .loading > span { font-family: monospace; - font-size: 2.0rem; + font-size: 2rem; font-size-adjust: .35; position: relative; top: 12.5%; @@ -348,17 +310,16 @@ footer > a { color: #888; } -.main > .loading > span > .loading-img:before { - content: "\e603"; -} - .main > .loading > span > .loading-img { - font-family: "icomoon" !important; - font-size: 1.0rem; - font-size-adjust: .6; + position: relative; + top: .1rem; + left: .05rem; display: inline-block; + width: 1.25rem; + height: 1.25rem; margin-right: 1rem; animation: anim-rotate 2s infinite linear; + background: url(./icons/spinner.svg) no-repeat center; } @keyframes anim-rotate { @@ -425,6 +386,9 @@ header { header > .fill > .container { margin-top: .5rem; padding: .5rem 1rem 0 1rem; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; user-select: none; } @@ -527,12 +491,17 @@ header > .fill > .container > .status > * { .main > .main-left > .nav > li { padding: .5rem 1rem; cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } -.main > .main-left > .nav > li:nth-last-child(1) { - font-size: 1.2rem; - margin-top: 1rem; - margin-bottom: 1rem; +.main > .main-left > .nav > li:last-child { + display: flex; + align-items: center; + margin: 2rem 0 1rem 0; + padding: 0 0 0 2rem; } .main > .main-left > .nav > li a { @@ -549,29 +518,50 @@ header > .fill > .container > .status > * { display: none; } +.main > .main-left > .nav > .slide > .menu, +.main > .main-left > .nav > li > [data-title="Logout"] { + font-size: 1.15rem; + font-weight: 500; + display: flex; + align-items: center; + width: 100%; + padding: .5rem 1rem; + text-decoration: none; + color: #202124; + color: var(--main-menu-color); +} + .main > .main-left > .nav > .slide > .menu::before { - font-weight: 900; position: absolute; right: 17px; - content: "\2228"; - transform: scale(1.3, .75); + width: 16px; + height: 16px; + content: ""; + background: url(./icons/arrow.svg) no-repeat; } .main > .main-left > .nav > .slide > .menu.active::before { - content: "\2227"; + transform: rotate(-180deg); +} + +body[class*="node-"] > .main > .main-left > .nav > .slide > .menu::before { + transition: transform .1s ease-in-out; +} + +body[class*="node-"] > .main > .main-left > .nav > .slide > .menu.active::before { + transition: transform .2s ease-in-out; } -.main > .main-left[style$="overflow: hidden;"] > .nav > .slide > .menu::before { +.main > .main-left[style*="overflow: hidden"] > .nav > .slide > .menu::before { display: none; } -.main > .main-left > .nav > .slide > .menu { - font-size: 1.15rem; - font-weight: 500; - display: block; - padding: .5rem 1rem; - text-decoration: none; - color: var(--menu-color); +.main > .main-left > .nav > li:last-child::before { + position: absolute; + left: 14px; + width: 24px; + height: 24px; + content: url(./icons/logout.svg); } .main > .main-left > .nav > li:hover, @@ -613,21 +603,22 @@ header > .fill > .container > .status > * { } .main > .main-left > .nav > .slide > .slide-menu > .active:hover { - cursor: hand; background-color: #09c; background-color: var(--main-color); } /* ripple effect */ .main > .main-left > .nav > .slide > .menu, -.main > .main-left > .nav > .slide > .slide-menu > li { +.main > .main-left > .nav > .slide > .slide-menu > li, +.main > .main-left > .nav > li:last-child { position: relative; overflow: hidden; transform: translate3d(0, 0, 0); } -.main > .main-left > .nav > .slide > .menu:after, -.main > .main-left > .nav > .slide > .slide-menu > li:after { +.main > .main-left > .nav > .slide > .menu::after, +.main > .main-left > .nav > .slide > .slide-menu > li::after, +.main > .main-left > .nav > li:last-child::after { position: absolute; top: 0; left: 0; @@ -644,8 +635,9 @@ header > .fill > .container > .status > * { background-position: 50%; } -.main > .main-left > .nav > .slide > .menu:active:after, -.main > .main-left > .nav > .slide > .slide-menu > li:active:after { +.main > .main-left > .nav > .slide > .menu:active::after, +.main > .main-left > .nav > .slide > .slide-menu > li:active::after, +.main > .main-left > .nav > li:last-child:active::after { transition: 0s; transform: scale(0, 0); opacity: .2; @@ -655,10 +647,6 @@ header > .fill > .container > .status > * { margin: 0 2rem 1rem 2rem; } -.Processes #maincontent > .container { - margin-right: 0; -} - ul { line-height: normal; } @@ -700,6 +688,8 @@ h5 { .cbi-section, .cbi-section-error, +#iptables, +.Firewall form, #cbi-network > .cbi-section-node, #cbi-wireless > .cbi-section-node, #cbi-wireless > #wifi_assoclist_table, @@ -718,6 +708,14 @@ h5 { box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .16), 0 0 2px 0 rgba(0, 0, 0, .12); } +.cbi-map-descr, +.cbi-section-descr { + font-size: small; + line-height: 1.42857143; + padding: .5rem; + color: #999; +} + .cbi-map-descr + fieldset { margin-top: 1rem; } @@ -795,8 +793,6 @@ tr > th, border-top: thin solid #ddd; } -tr:first-child > td -.tr:first-child > .td, #cbi-wireless .td, #cbi-network .tr:first-child > .td, .table[width="100%"] > .tr:first-child > .td, @@ -806,6 +802,10 @@ tr:first-child > td border-top: 0 !important; } +.table[width="100%"] > .tr:first-child > .td { + margin: auto 0; +} + .cbi-section-table-row { margin-bottom: 1rem; text-align: center !important; @@ -816,10 +816,10 @@ tr:first-child > td margin-bottom: 0; } +.cbi-section-table-row > .cbi-value-field .cbi-dropdown, .cbi-section-table-row > .cbi-value-field .cbi-input-select, .cbi-section-table-row > .cbi-value-field .cbi-input-text, -.cbi-section-table-row > .cbi-value-field .cbi-input-password, -.cbi-section-table-row > .cbi-value-field .cbi-dropdown { +.cbi-section-table-row > .cbi-value-field .cbi-input-password { width: 100%; } @@ -839,20 +839,11 @@ div > .table > .tr:nth-of-type(2n) { /* fix multiple table */ table table, -.table .table { - border: 0; -} - +.table .table, .cbi-value-field table, -.cbi-value-field .table { - border: 0; -} - +.cbi-value-field .table, td > table > tbody > tr > td, -.td > .table > .tbody > .tr > .td { - border: 0; -} - +.td > .table > .tbody > .tr > .td, .cbi-value-field > table > tbody > tr > td, .cbi-value-field > .table > .tbody > .tr > .td { border: 0; @@ -887,11 +878,25 @@ td > table > tbody > tr > td, touch-action: manipulation; } +.cbi-button-up, +.cbi-button-down { + font-size: 1.2rem; + display: inline-block; + min-width: 0; + padding: .2rem .3rem; + color: transparent !important; + background: url(./icons/arrow.svg) no-repeat center; + background-size: 12px 20px; +} + +.cbi-button-up { + transform: scaleY(-1); +} + .cbi-button:not(select) { -webkit-appearance: none !important; } -form[method="post"] + form[method="post"], .cbi-button + .cbi-button { margin-left: .6rem; } @@ -915,15 +920,27 @@ form[method="post"] + form[method="post"], .btn:hover, .btn:focus, .cbi-button:hover, -.cbi-button:focus { +.cbi-button:focus, +.item:hover::after, +.item:focus::after { box-shadow: 0 0 2px rgba(0, 0, 0, .12), 0 2px 2px rgba(0, 0, 0, .2); } .btn:active, -.cbi-button:active { +.cbi-button:active, +.item:active::after { box-shadow: 0 10px 20px rgba(0, 0, 0, .19), 0 6px 6px rgba(0, 0, 0, .23); } +.cbi-button-up:hover, +.cbi-button-up:focus { + box-shadow: 0 0 2px rgba(0, 0, 0, .12), 0 -2px 2px rgba(0, 0, 0, .2); +} + +.cbi-button-up:active { + box-shadow: 0 -10px 20px rgba(0, 0, 0, .19), 0 -6px 6px rgba(0, 0, 0, .23); +} + .btn:disabled, .cbi-button:disabled { cursor: not-allowed; @@ -974,6 +991,7 @@ form[method="post"] + form[method="post"], .cbi-button-reload, .cbi-button-action, .cbi-button[value="Submit"], +.cbi-button[value="Upload"], .cbi-button[value$="Apply"], .cbi-button[onclick="addKey(event)"] { font-weight: normal; @@ -1016,7 +1034,7 @@ form[method="post"] + form[method="post"], .cbi-button-success, .cbi-button-download, .cbi-button[name="backup"], -.cbi-button[value="Upload"], +.cbi-button[value="Download"], .cbi-button[value="Save mtdblock"] { font-weight: normal; color: #fff; @@ -1034,41 +1052,44 @@ form[method="post"] + form[method="post"], .cbi-value-field .cbi-button-add { font-weight: bold; + margin: 9px 0 4px 3px; padding: 1px 6px; } -.cbi-value-field .cbi-button-neutral { - padding: 1px 8px; -} - -/* table */ .tabs { margin: 0 -2rem; padding-left: .5rem; background-color: #fff; } -.cbi-tabmenu > li, -.tabs > li { +.tabs > li, +.cbi-tabmenu > li { display: inline-block; - padding: .6rem 0; + padding: .55rem 0; + cursor: pointer; } -.cbi-tabmenu > li > a, -.tabs > li > a { - padding: .5rem .8rem; - text-decoration: none; - color: #404040; +.tabs > li { + padding-bottom: .4rem; + border-bottom: .2rem solid transparent; } .tabs > li[class~="active"], .tabs > li:hover { - margin-bottom: -.18751rem; + border-bottom-color: #09c; + border-bottom-color: var(--main-color); +} + +.tabs > li:hover { cursor: pointer; - color: #09c; - color: var(--main-color); - border-bottom: #09c; - border-bottom: .2rem solid var(--main-color); + border-bottom-color: #c9c9c9; +} + +.tabs > li > a, +.cbi-tabmenu > li > a { + padding: .6rem .9rem; + text-decoration: none; + color: #404040; } .tabs > li[class~="active"] > a { @@ -1076,10 +1097,6 @@ form[method="post"] + form[method="post"], color: var(--main-color); } -.tabs > li:hover { - border-bottom: .18751rem solid #c9c9c9; -} - .cbi-tabmenu { border: thin solid #d4d4d4; border-bottom: 0; @@ -1103,15 +1120,15 @@ form[method="post"] + form[method="post"], } [data-tab-title] { + overflow: hidden; height: 0; opacity: 0; - overflow: hidden; } [data-tab-active="true"] { - opacity: 1; - height: auto; overflow: visible; + height: auto; + opacity: 1; transition: opacity .25s ease-in; } @@ -1137,41 +1154,9 @@ form[method="post"] + form[method="post"], display: table-cell; } -.cbi-input-invalid { - color: #f00; - border-color: #f00; -} - -.cbi-section-error { - font-weight: bold; - line-height: 1.42857143; - margin: 18px; - padding: 6px; - border: thin solid #f00; - border-radius: 3px; - background-color: #fce6e6; -} - -.cbi-section-error ul { - margin: 0 0 0 20px; -} - -.cbi-section-error ul li { - font-weight: bold; - color: #f00; -} - -.cbi-value-helpicon > img { - display: none; -} - -.cbi-value-helpicon:before { - content: "\f059"; -} - .cbi-value-description { font-size: small; - padding: .5rem 0 0 0; + padding-top: .4rem; opacity: .5; } @@ -1179,7 +1164,7 @@ form[method="post"] + form[method="post"], display: table-cell; float: left; width: 23rem; - padding-top: .4rem; + padding-top: .35rem; padding-right: 2rem; text-align: right; word-wrap: break-word; @@ -1188,13 +1173,53 @@ form[method="post"] + form[method="post"], .cbi-value { display: inline-block; width: 100%; - padding: .3rem 1rem; + padding: .35rem 1rem .2rem 1rem; } .cbi-value ul { line-height: 1.25; } +.cbi-value-field .cbi-dropdown, +.cbi-value-field .cbi-input-select, +.cbi-value input[type="text"], +.cbi-value input[type="password"] { + min-width: 25rem; +} + +#cbi-firewall-zone .cbi-input-select, +#cbi-network-switch_vlan .cbi-input-select { + min-width: 11rem; +} + +#cbi-network-switch_vlan .cbi-input-text { + max-width: 3rem; +} + +.cbi-input-invalid { + color: #f00; + border-bottom-color: #f00; +} + +.cbi-section-error { + font-weight: bold; + line-height: 1.42857143; + margin: 18px; + padding: 6px; + border: thin solid #f00; + border-radius: 3px; + background-color: #fce6e6; +} + +.cbi-section-error ul { + margin: 0 0 0 20px; +} + +.cbi-section-error ul li { + font-weight: bold; + color: #f00; +} + .td[data-title]::before { font-weight: bold; display: none; @@ -1232,7 +1257,7 @@ form[method="post"] + form[method="post"], .cbi-rowstyle-2 .cbi-button-up, .cbi-rowstyle-2 .cbi-button-down, -.cbi-rowstyle-2:first-child { +body:not(.Interfaces) .cbi-rowstyle-2:first-child { background-color: #fff !important; } @@ -1259,30 +1284,23 @@ form[method="post"] + form[method="post"], margin: 0; } -/* desc */ -.cbi-section-descr, -.cbi-map-descr { - font-size: small; - line-height: 1.42857143; - padding: .5rem; - color: #999; -} - +/* lists */ .cbi-dynlist { line-height: 1.3; flex-direction: column; min-height: 30px; + cursor: text; } .cbi-dynlist > .item { position: relative; - max-width: 24.9rem; - margin: 0 2em 4px 0; - padding: 2px 4px; - cursor: default; + max-width: 25rem; + margin-right: 2em; + padding: .5em .25em .25em 0; pointer-events: none; color: #666; border-bottom: 2px solid rgba(0, 0, 0, .26); + outline: 0; } .cbi-dynlist[name="sshkeys"] > .item { @@ -1309,13 +1327,36 @@ form[method="post"] + form[method="post"], word-break: break-word; } +.cbi-dynlist > .add-item { + display: inline-flex; + align-items: center; + width: 100%; + min-width: 16rem; +} + +.cbi-dynlist > .add-item:not([ondrop]) > input { + overflow: hidden; + width: 100%; + min-width: 15rem; + white-space: nowrap; + text-overflow: ellipsis; +} + +.cbi-dynlist > .add-item[ondrop] > input { + min-width: 13rem; +} + .cbi-dynlist, .cbi-dropdown { position: relative; display: inline-flex; - height: auto; padding: 0; - cursor: default; +} + +.cbi-dropdown[placeholder*="select"] { + max-width: 25rem; + height: auto; + margin-top: -3px; } .cbi-dropdown > ul { @@ -1326,6 +1367,7 @@ form[method="post"] + form[method="post"], margin: 0 !important; padding: 0; list-style: none; + outline: 0; } .cbi-dropdown > ul.preview { @@ -1347,7 +1389,9 @@ form[method="post"] + form[method="post"], flex-shrink: 0; justify-content: center; padding: 0 .25em; + cursor: default; text-align: center; + outline: 0; } .cbi-dropdown > .more, @@ -1408,10 +1452,6 @@ form[method="post"] + form[method="post"], height: 20px; } -.cbi-dropdown[open] { - position: relative; -} - .cbi-dropdown[open] > ul.dropdown { position: absolute; z-index: 1100; @@ -1489,6 +1529,43 @@ form[method="post"] + form[method="post"], width: auto; } +/* progressbar */ +.cbi-progressbar { + position: relative; + min-width: 170px; + height: 20px; + margin: 6px 0; + border: thin solid #999; + background: #eee; +} + +.cbi-progressbar > div { + width: 0; + height: 100%; + transition: width .25s ease-in; + background: #5bc0de; + background: var(--bar-bg); +} + +.cbi-progressbar::after { + font-family: monospace; + font-size: 1.3em; + font-weight: bold; + font-size-adjust: .38; + line-height: normal; + position: absolute; + top: 2px; + right: 0; + bottom: 2px; + left: 0; + overflow: hidden; + content: attr(title); + text-align: center; + white-space: pre; + text-overflow: ellipsis; + text-shadow: 0 0 2px #eee; +} + #modal_overlay { position: fixed; z-index: 900; @@ -1531,6 +1608,7 @@ form[method="post"] + form[method="post"], overflow: auto; margin-bottom: .5em; padding: 8.5px; + cursor: auto; white-space: pre-wrap; color: #eee; outline: 0; @@ -1599,7 +1677,7 @@ body.modal-overlay-active #modal_overlay { bottom: 0; left: .2em; width: 32px; - content: " "; + content: ""; background: url(../resources/icons/loading.gif) no-repeat center; background-size: 16px; } @@ -1647,60 +1725,6 @@ body.modal-overlay-active #modal_overlay { display: inline-block; } -/* input */ -.cbi-value input[type="password"], -.cbi-value input[type="text"] { - min-width: 15rem; -} - -/* select */ -.cbi-value-field .cbi-dropdown, -.cbi-value-field .cbi-input-select { - min-width: 15rem; -} - -.cbi-value-field .cbi-input-invalid { - color: #f00; - border-bottom-color: #f00; -} - -/* progressbar */ -.cbi-progressbar { - position: relative; - min-width: 170px; - height: 20px; - margin: 4px 0; - border: thin solid #999; - background: #eee; -} - -.cbi-progressbar > div { - width: 0; - height: 100%; - transition: width .25s ease-in; - background: #5bc0de; - background: var(--bar-bg); -} - -.cbi-progressbar::after { - font-family: monospace; - font-size: 1.3em; - font-weight: bold; - font-size-adjust: .38; - line-height: normal; - position: absolute; - top: 2px; - right: 0; - bottom: 2px; - left: 0; - overflow: hidden; - content: attr(title); - text-align: center; - white-space: pre; - text-overflow: ellipsis; - text-shadow: 0 0 2px #eee; -} - .th[data-type="button"], .td[data-type="button"], .th[data-type="fvalue"], @@ -1779,9 +1803,10 @@ td > .ifacebadge, #syslog { font-size: small; + line-height: 1.25; + overflow-y: hidden; width: 100%; min-height: 15rem; - margin-bottom: 20px; padding: 1rem; resize: none; color: #eee; @@ -1933,7 +1958,7 @@ td > .ifacebadge, .cbi-value-field .cbi-input-checkbox, .cbi-value-field .cbi-input-radio { - margin-top: .15rem; + margin-top: .1rem; } .cbi-value-field > ul > li { @@ -1975,20 +2000,6 @@ td.cbi-value-field var, color: #0069d6; } -small { - font-size: 90%; - line-height: 1.42857143; - white-space: normal; -} - -.cbi-button-up, -.cbi-button-down { - font-size: 1.2rem; - display: inline-block; - min-width: 0; - padding: .2rem .3rem; -} - .cbi-optionals { padding: 1rem 1rem 0 1rem; border-top: thin solid #ccc; @@ -2064,8 +2075,6 @@ span[data-tooltip] .label { text-decoration: none; text-transform: uppercase; color: #fff !important; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; border-radius: 3px; background-color: #bfbfbf; text-shadow: none; @@ -2096,11 +2105,13 @@ label > input[type="radio"] { /* diagnostics */ #diag-rc-output > pre, -#command-rc-output > pre { +#command-rc-output > pre, +[data-page="admin-services-wol"] .notice code { font-size: 1.2rem; font-size-adjust: .35; line-height: normal; display: block; + overflow-y: hidden; width: 100%; padding: 8.5px; white-space: pre; @@ -2155,7 +2166,7 @@ input[name="nslookup"] { box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .16), 0 0 2px 0 rgba(0, 0, 0, .12); } -.node-main-login > .main form > div:nth-last-child(1) { +.node-main-login > .main form > div:last-child { float: right; } @@ -2168,6 +2179,7 @@ input[name="nslookup"] { } .node-main-login > .main .cbi-input-text { + width: 100% !important; min-width: 15rem; } @@ -2183,20 +2195,12 @@ input[name="nslookup"] { } } -/* fix status overview */ -.node-status-overview > .main fieldset:nth-child(4) .td:nth-child(2) { - white-space: normal; -} - -/* fix status processes */ +/* fix status */ +.node-status-overview > .main fieldset:nth-child(4) .td:nth-child(2), .node-status-processes > .main .table .tr .td:nth-child(3) { white-space: normal; } -.node-admin-status form { - margin: 2rem 2rem 0 0; -} - /* fix system reboot */ [data-page="admin-system-reboot"] p { padding-left: 2rem; @@ -2209,11 +2213,11 @@ input[name="nslookup"] { } /* samba */ -#cbi-samba .cbi-value-last .cbi-value-field { +#cbi-samba [data-tab="template"] .cbi-value-field { display: block; } -#cbi-samba .cbi-value-last .cbi-value-title { +#cbi-samba [data-tab="template"] .cbi-value-title { width: auto; padding-bottom: .6rem; } @@ -2287,16 +2291,13 @@ input[name="nslookup"] { /* firewall */ #iptables { - font-family: inherit; - font-weight: normal; - font-style: normal; - line-height: 1; - min-width: inherit; - margin: 0 0 2rem 0; - padding: 2rem; - border: 0; - border-radius: 0; - background-color: #fff; + margin: 0; +} + +.Firewall form { + margin: 2rem 2rem 0 0; + padding: 0; + box-shadow: none; } #cbi-firewall-redirect table *, @@ -2327,7 +2328,8 @@ input[name="nslookup"] { display: block; } -#cbi-firewall-zone .td.cbi-section-actions { +#cbi-firewall-zone .td, +#cbi-network-switch_vlan .td { width: 100%; } @@ -2349,6 +2351,7 @@ input[name="nslookup"] { /* custom commands */ .commandbox { width: 24% !important; + margin: 10px 0 0 10px !important; padding: .5rem 1rem; border-bottom: thin solid #ccc; background: #eee; @@ -2369,16 +2372,20 @@ input[name="nslookup"] { .commandbox code { position: absolute; - overflow-x: hidden; - overflow-y: auto; + overflow: hidden; max-width: 60%; - max-height: 55px; - margin-top: -3px; margin-left: 4px; padding: 2px 3px; + white-space: nowrap; text-overflow: ellipsis; } +.commandbox code:hover { + overflow-y: auto; + max-height: 50px; + white-space: normal; +} + .commandbox p:first-of-type { margin-top: -6px; } @@ -2389,7 +2396,7 @@ input[name="nslookup"] { [data-page^="admin-system-commands"] .panel-title, [data-page^="command-cfg"] .mobile-hide, -[data-page^="command-cfg"] header > .fill > .container > #logo { +[data-page^="command-cfg"] .showSide { display: none; } @@ -2401,6 +2408,7 @@ input[name="nslookup"] { max-width: 40%; margin: 0; animation: anim-fade-in 1.5s forwards; + word-break: break-word; opacity: 0; } @@ -2410,6 +2418,21 @@ input[name="nslookup"] { } } +/* IE hacks */ +@media all and (-ms-high-contrast: none) { + .main > .main-left > .nav > .slide > .menu::before { + top: 30.25%; + } + + .main > .main-left > .nav > li:last-child::before { + top: 20%; + } + + .showSide::before { + top: -12px; + } +} + @media screen and (max-width: 1600px) { header > .fill > .container > #logo { margin: 0 2.5rem 0 .5rem; @@ -2423,10 +2446,6 @@ input[name="nslookup"] { width: calc(100% - 13rem); } - .cbi-dynlist > .item { - max-width: 21.9rem; - } - .btn:not(button), .cbi-button { font-size: .8rem; @@ -2437,14 +2456,25 @@ input[name="nslookup"] { padding: .2rem .6rem; } + fieldset, + .cbi-section { + padding: 1rem; + } + .cbi-value-title { width: 15rem; padding-right: .6rem; } - fieldset, - .cbi-section { - padding: 1rem; + .cbi-value-field .cbi-dropdown, + .cbi-value-field .cbi-input-select, + .cbi-value input[type="text"], + .cbi-value input[type="password"] { + min-width: 22rem; + } + + #cbi-firewall-zone .cbi-input-select { + min-width: 9rem; } .cbi-input-textarea { @@ -2454,10 +2484,6 @@ input[name="nslookup"] { .node-admin-status > .main fieldset li > a { padding: .3rem .6rem; } - - #cbi-firewall-zone > .table { - display: block; - } } @media screen and (max-width: 1366px) { @@ -2485,12 +2511,8 @@ input[name="nslookup"] { width: calc(100% - 13rem); } - .cbi-dynlist > .item { - max-width: 19.9rem; - } - - .cbi-tabmenu > li > a, - .tabs > li > a { + .tabs > li > a, + .cbi-tabmenu > li > a { padding: .2rem .5rem; } @@ -2508,9 +2530,21 @@ input[name="nslookup"] { width: 100%; } + .cbi-value-field .cbi-dropdown, + .cbi-value-field .cbi-input-select, + .cbi-value input[type="text"], + .cbi-value input[type="password"] { + min-width: 19rem; + } + + #cbi-firewall-zone .cbi-input-select { + min-width: 4rem; + } + .main > .main-left > .nav > li, .main > .main-left > .nav > li a, - .main > .main-left > .nav > .slide > .menu { + .main > .main-left > .nav > .slide > .menu, + .main > .main-left > .nav > li > [data-title="Logout"] { font-size: .9rem; } @@ -2528,7 +2562,8 @@ input[name="nslookup"] { [data-page="admin-network-firewall-forwards"] .table:not(.cbi-section-table), [data-page="admin-network-firewall-rules"] .table:not(.cbi-section-table), - [data-page="admin-network-hosts"] .table { + [data-page="admin-network-hosts"] .table, + [data-page="admin-network-routes"] .table { overflow-y: visible; } @@ -2546,16 +2581,15 @@ input[name="nslookup"] { position: relative; } - [data-page^="command-cfg"] header > .fill > .container > .brand { - display: block; - margin-top: -1.75rem; - } - html, .main { overflow-y: visible; } + .main > .loading > span { + top: 25%; + } + .main-left { position: fixed; z-index: 100; @@ -2566,29 +2600,30 @@ input[name="nslookup"] { width: 100%; } - .cbi-dynlist > .item { - max-width: 14.9rem; - } - .showSide { - display: inline-block; - overflow: visible; - margin-right: .5rem; - padding: .1rem; + position: relative; + top: .18rem; + display: inline-flex; + align-items: center; + width: 1.6rem; + height: 1.6rem; + margin-right: .7rem; cursor: pointer; - border-radius: 50%; } - .showSide:before { - font-size: 1.7rem; - content: "\e20e"; + .showSide::before { + position: absolute; + left: 1px; + width: 24px; + height: 24px; + content: ""; + background: url(./icons/menu.svg) no-repeat center; } body:not(.logged-in) .showSide { visibility: hidden; width: 0; margin: 0; - padding: 0; } .node-main-login > .main .cbi-value-title { @@ -2596,12 +2631,27 @@ input[name="nslookup"] { } .cbi-value-title { - width: 9rem; + width: 12rem; padding-right: 1rem; } + .cbi-value-field .cbi-dropdown, + .cbi-value-field .cbi-input-select, + .cbi-value input[type="text"] { + width: 16rem; + min-width: 16rem; + } + + .cbi-value input[type="password"], + .cbi-value input[name^="pw"], + .cbi-value input[data-update="change"]:nth-child(2) { + width: 13rem !important; + min-width: 13rem; + } + #diag-rc-output > pre, - #command-rc-output > pre { + #command-rc-output > pre, + [data-page="admin-services-wol"] .notice code { font-size: 1rem; } @@ -2609,6 +2659,10 @@ input[name="nslookup"] { display: block; } + .Interfaces .table { + overflow-x: hidden; + } + #packages.table { display: grid; } @@ -2629,7 +2683,6 @@ input[name="nslookup"] { .tr.placeholder > .td, #cbi-firewall .tr > .td, - #iptables .tr:nth-child(2) > .td, #cbi-network .tr:nth-child(2) > .td, .cbi-section #wifi_assoclist_table .tr > .td { border-top: 0; @@ -2723,17 +2776,9 @@ input[name="nslookup"] { } .Firewall form { - font-family: inherit; - font-weight: normal; - font-style: normal; - line-height: normal; position: static !important; - min-width: inherit; margin: 0 0 2rem 0; padding: 2rem; - border: 0; - border-radius: 0; - background-color: #fff; box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .16), 0 0 2px 0 rgba(0, 0, 0, .12); } @@ -2750,6 +2795,7 @@ input[name="nslookup"] { .commandbox { width: 100% !important; + margin-left: 0 !important; } } @@ -2766,7 +2812,6 @@ input[name="nslookup"] { fieldset, .cbi-section { margin: 1rem 0 0 0; - padding: 1rem; } .tabs { @@ -2777,7 +2822,8 @@ input[name="nslookup"] { margin: 0 1rem 1.5rem 1rem; } - .main > .main-left > .nav > .slide > .menu { + .main > .main-left > .nav > .slide > .menu, + .main > .main-left > .nav > li > [data-title="Logout"] { font-size: 1.2rem; } @@ -2787,15 +2833,17 @@ input[name="nslookup"] { .cbi-value-title { display: block; - width: 100%; min-width: 0 !important; - margin-top: 1rem; - margin-bottom: .5rem; + margin: .5rem 0; text-align: left; } + .cbi-value-title, + .cbi-value-description, .cbi-value-field, - .cbi-value-description { + .cbi-value-field .cbi-dropdown, + .cbi-value-field .cbi-input-select, + .cbi-value input[type="text"] { width: 100%; } @@ -2803,13 +2851,8 @@ input[name="nslookup"] { display: inline-block; } - .cbi-tabmenu > li, - .tabs > li { - padding: .6rem 0; - } - - .cbi-tabmenu > li > a, - .tabs > li > a { + .tabs > li > a, + .cbi-tabmenu > li > a { font-size: .9rem; padding: .2rem .3rem; } @@ -2831,7 +2874,7 @@ input[name="nslookup"] { padding: 0; } - .node-main-login > .main form > div:nth-last-child(1) { + .node-main-login > .main form > div:last-child { margin-top: 2rem; } @@ -2849,9 +2892,11 @@ input[name="nslookup"] { margin-top: -8px; } + #syslog, #diag-rc-output > pre, - #command-rc-output > pre { - font-size: .8rem; + #command-rc-output > pre, + [data-page="admin-services-wol"] .notice code { + font-size: .8rem !important; } h2 { @@ -2913,61 +2958,47 @@ input[name="nslookup"] { font-size: .62rem; } - #cbi-wireless .td { + #cbi-wireless > #wifi_assoclist_table .td { overflow: hidden; } - .hide-sm, - .hide-xs:not([data-title="MAC-Address"]) { - display: none; - } -} - -@media screen and (min-width: 1152px) { - .cbi-value input[type="password"], - .cbi-value input[type="text"] { - min-width: 20rem; - } - - .cbi-value-field .cbi-input-select { - width: 20rem; + #cbi-wireless > .cbi-section-node .td, + .Interfaces .td.cbi-section-actions { + text-align: center !important; } - .cbi-value-field .cbi-dropdown { - min-width: 20rem; + [data-page="admin-status-processes"] .td[data-title="Hang Up"]::before, + [data-page="admin-status-processes"] .td[data-title="Terminate"]::before, + [data-page="admin-status-processes"] .td[data-title="Kill"]::before { + display: none; } - .cbi-section-node .tr { - overflow: hidden; + .hide-sm, + .hide-xs:not([data-title="MAC-Address"]) { + display: none; } } -@media screen and (min-width: 1366px) { - .cbi-value input[type="password"], - .cbi-value input[type="text"] { - min-width: 22rem; - } - - .cbi-value-field .cbi-input-select { - width: 22rem; +@media screen and (min-width: 600px) { + ::-webkit-scrollbar { + width: 10px; + height: 10px; } - .cbi-value-field .cbi-dropdown { - min-width: 22rem; + ::-webkit-scrollbar, + ::-webkit-scrollbar-corner { + background: transparent; } -} -@media screen and (min-width: 1600px) { - .cbi-value input[type="password"], - .cbi-value input[type="text"] { - min-width: 25rem; + ::-webkit-scrollbar-thumb { + background: #9e9e9e; } - .cbi-value-field .cbi-input-select { - width: 25rem; + ::-webkit-scrollbar-thumb:hover { + background: #757575; } - .cbi-value-field .cbi-dropdown { - min-width: 25rem; + ::-webkit-scrollbar-thumb:active { + background: #424242; } } diff --git a/themes/luci-theme-material/htdocs/luci-static/material/custom.css b/themes/luci-theme-material/htdocs/luci-static/material/custom.css index 6acd5aa3dd..7a5bbb93e8 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/custom.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/custom.css @@ -6,6 +6,7 @@ --menu-bg-color: #fff; --menu-color: #5f6368; --menu-color-hover: #202124; + --main-menu-color: #202124; --submenu-bg-hover: #d4d4d4; --submenu-bg-hover-active: #09c; --font-body: "Microsoft Yahei", "WenQuanYi Micro Hei", "sans-serif", "Helvetica Neue", "Helvetica", "Hiragino Sans GB"; diff --git a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.eot b/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.eot Binary files differdeleted file mode 100644 index 9e6ffc9b82..0000000000 --- a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.eot +++ /dev/null diff --git a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.svg b/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.svg deleted file mode 100644 index d38d057da3..0000000000 --- a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.svg +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > -<svg xmlns="http://www.w3.org/2000/svg"> -<metadata>Generated by IcoMoon</metadata> -<defs> -<font id="icomoon" horiz-adv-x="1024"> -<font-face units-per-em="1024" ascent="960" descent="-64" /> -<missing-glyph horiz-adv-x="1024" /> -<glyph unicode=" " horiz-adv-x="512" d="" /> -<glyph unicode="" glyph-name="expand_less" d="M512 596.667l256-256-60-60-196 196-196-196-60 60z" /> -<glyph unicode="" glyph-name="expand_more" d="M708 572.667l60-60-256-256-256 256 60 60 196-196z" /> -<glyph unicode="" glyph-name="menu" d="M128 682.667h768v-86h-768v86zM128 384.667v84h768v-84h-768zM128 170.667v86h768v-86h-768z" /> -<glyph unicode="" glyph-name="favorite" d="M512 28.667l-62 56q-106 96-154 142t-107 114-81 123-22 113q0 98 67 166t167 68q116 0 192-90 76 90 192 90 100 0 167-68t67-166q0-78-52-162t-113-146-199-186z" /> -<glyph unicode="" glyph-name="spinner9" d="M512 960c-278.748 0-505.458-222.762-511.848-499.974 5.92 241.864 189.832 435.974 415.848 435.974 229.75 0 416-200.576 416-448 0-53.020 42.98-96 96-96s96 42.98 96 96c0 282.77-229.23 512-512 512zM512-64c278.748 0 505.458 222.762 511.848 499.974-5.92-241.864-189.832-435.974-415.848-435.974-229.75 0-416 200.576-416 448 0 53.020-42.98 96-96 96s-96-42.98-96-96c0-282.77 229.23-512 512-512z" /> -<glyph unicode="" glyph-name="question-circle" horiz-adv-x="878" d="M512 164.571v109.714q0 8-5.143 13.143t-13.143 5.143h-109.714q-8 0-13.143-5.143t-5.143-13.143v-109.714q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143zM658.286 548.571q0 50.286-31.714 93.143t-79.143 66.286-97.143 23.429q-138.857 0-212-121.714-8.571-13.714 4.571-24l75.429-57.143q4-3.429 10.857-3.429 9.143 0 14.286 6.857 30.286 38.857 49.143 52.571 19.429 13.714 49.143 13.714 27.429 0 48.857-14.857t21.429-33.714q0-21.714-11.429-34.857t-38.857-25.714q-36-16-66-49.429t-30-71.714v-20.571q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143q0 10.857 12.286 28.286t31.143 28.286q18.286 10.286 28 16.286t26.286 20 25.429 27.429 16 34.571 7.143 46.286zM877.714 438.857q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -</font></defs></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.ttf b/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.ttf Binary files differdeleted file mode 100644 index 84669323e9..0000000000 --- a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.ttf +++ /dev/null diff --git a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.woff b/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.woff Binary files differdeleted file mode 100644 index 00cf84ea03..0000000000 --- a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.woff +++ /dev/null diff --git a/themes/luci-theme-material/htdocs/luci-static/material/icons/arrow.svg b/themes/luci-theme-material/htdocs/luci-static/material/icons/arrow.svg new file mode 100644 index 0000000000..be864c5ac9 --- /dev/null +++ b/themes/luci-theme-material/htdocs/luci-static/material/icons/arrow.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#202124" d="m8,10.033663l-6.898535,-6.013274l-1.060688,0.972974l7.959223,6.986249l7.959223,-6.986249l-1.060688,-0.972974l-6.898535,6.013274z"/></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/icons/logout.svg b/themes/luci-theme-material/htdocs/luci-static/material/icons/logout.svg new file mode 100644 index 0000000000..d529b94e6f --- /dev/null +++ b/themes/luci-theme-material/htdocs/luci-static/material/icons/logout.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#202124" d="M10.09,15.59L11.5,17l5,-5,-5,-5,-1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0,-2,0.9,-2,2v4h2V5h14v14H5v-4H3v4c0,1.1,0.89,2,2,2h14c1.1,0,2,-0.9,2,-2V5c0,-1.1,-0.9,-2,-2,-2z"/></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/icons/menu.svg b/themes/luci-theme-material/htdocs/luci-static/material/icons/menu.svg new file mode 100644 index 0000000000..46bd0ae687 --- /dev/null +++ b/themes/luci-theme-material/htdocs/luci-static/material/icons/menu.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#fff" d="m2.037076,18.641983l19.925899,0l0,-2.231286l-19.925899,0l0,2.231286zm0,-7.731664l0,2.179395l19.925899,0l0,-2.179395l-19.925899,0zm0,-5.552269l0,2.231286l19.925899,0l0,-2.231286l-19.925899,0z"/></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/icons/spinner.svg b/themes/luci-theme-material/htdocs/luci-static/material/icons/spinner.svg new file mode 100644 index 0000000000..6ddd3b3ed8 --- /dev/null +++ b/themes/luci-theme-material/htdocs/luci-static/material/icons/spinner.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#888" d="M8,0c-4.355,0-7.898,3.481-7.998,7.812,0.092-3.779,2.966-6.812,6.498-6.812,3.59,0,6.5,3.134,6.5,7,0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5c0-4.418-3.582-8-8-8zM8,16c4.355,0,7.898-3.481,7.998-7.812-0.092,3.779-2.966,6.812-6.498,6.812-3.59,0-6.5-3.134-6.5-7,0-0.828-0.672-1.5-1.5-1.5s-1.5,0.672-1.5,1.5c0,4.418,3.582,8,8,8z"/></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js index 3c25ed712d..755191f335 100755 --- a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js +++ b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js @@ -1,237 +1,218 @@ /** - * Material is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI + * Material is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI * - * luci-theme-material - * Copyright 2015 Lutty Yang <lutty@wcan.in> + * luci-theme-material + * Copyright 2015 Lutty Yang <lutty@wcan.in> * - * Have a bug? Please create an issue here on GitHub! - * https://github.com/LuttyYang/luci-theme-material/issues + * Have a bug? Please create an issue here on GitHub! + * https://github.com/LuttyYang/luci-theme-material/issues * - * luci-theme-bootstrap: - * Copyright 2008 Steven Barth <steven@midlink.org> - * Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> - * Copyright 2012 David Menting <david@nut-bolt.nl> + * luci-theme-bootstrap: + * Copyright 2008 Steven Barth <steven@midlink.org> + * Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> + * Copyright 2012 David Menting <david@nut-bolt.nl> * - * MUI: - * https://github.com/muicss/mui + * MUI: + * https://github.com/muicss/mui * - * Licensed to the public under the Apache License 2.0 + * Licensed to the public under the Apache License 2.0 */ + (function ($) { - $(".main > .loading").fadeOut(); - - /** - * trim text, Remove spaces, wrap - * @param text - * @returns {string} - */ - function trimText(text) { - return text.replace(/[ \t\n\r]+/g, " "); - } - - - var lastNode = undefined; - var mainNodeName = undefined; - - var nodeUrl = ""; - (function(node){ - var luciLocation; - if (node[0] == "admin"){ - luciLocation = [node[1], node[2]]; - }else{ - luciLocation = node; - } - - for(var i in luciLocation){ - nodeUrl += luciLocation[i]; - if (i != luciLocation.length - 1){ - nodeUrl += "/"; - } - } - })(luciLocation); - - /** - * get the current node by Burl (primary) - * @returns {boolean} success? - */ - function getCurrentNodeByUrl() { - var ret = false; - if (!$('body').hasClass('logged-in')) { - luciLocation = ["Main", "Login"]; - return true; - } - - $(".main > .main-left > .nav > .slide > .menu").each(function () { - var ulNode = $(this); - ulNode.next().find("a").each(function () { - var that = $(this); - var href = that.attr("href"); - - if (href.indexOf(nodeUrl) != -1) { - ulNode.click(); - ulNode.next(".slide-menu").stop(true, true); - lastNode = that.parent(); - lastNode.addClass("active"); - ret = true; - return true; - } - }); - }); - return ret; - } - - /** - * menu click - */ - $(".main > .main-left > .nav > .slide > .menu").click(function () { - var ul = $(this).next(".slide-menu"); - var menu = $(this); - if (!ul.is(":visible")) { - menu.addClass("active"); - ul.addClass("active"); - ul.stop(true).slideDown("fast"); - } else { - ul.stop(true).slideUp("fast", function () { - menu.removeClass("active"); - ul.removeClass("active"); - }); - } - return false; - }); - - /** - * hook menu click and add the hash - */ - $(".main > .main-left > .nav > .slide > .slide-menu > li > a").click(function () { - if (lastNode != undefined) lastNode.removeClass("active"); - $(this).parent().addClass("active"); - $(".main > .loading").fadeIn("fast"); - return true; - }); - - /** - * fix menu click - */ - $(".main > .main-left > .nav > .slide > .slide-menu > li").click(function () { - if (lastNode != undefined) lastNode.removeClass("active"); - $(this).addClass("active"); - $(".main > .loading").fadeIn("fast"); - window.location = $($(this).find("a")[0]).attr("href"); - return false; - }); - - /** - * get current node and open it - */ - if (getCurrentNodeByUrl()) { - mainNodeName = "node-" + luciLocation[0] + "-" + luciLocation[1]; - mainNodeName = mainNodeName.replace(/[ \t\n\r\/]+/g, "_").toLowerCase(); - $("body").addClass(mainNodeName); - } - $(".cbi-button-up").val(""); - $(".cbi-button-down").val(""); - - - /** - * hook other "A Label" and add hash to it. - */ - $("#maincontent > .container").find("a").each(function () { - var that = $(this); - var onclick = that.attr("onclick"); - if (onclick == undefined || onclick == "") { - that.click(function () { - var href = that.attr("href"); - if (href.indexOf("#") == -1) { - $(".main > .loading").fadeIn("fast"); - return true; - } - }); - } - }); - - /** - * Sidebar expand - */ - var showSide = false; - $(".showSide").click(function () { - if (showSide) { - $(".darkMask").stop(true).fadeOut("fast"); - $(".main-left").stop(true).animate({ - width: "0" - }, "fast"); - $(".main-right").css("overflow-y", "visible"); - showSide = false; - } else { - $(".darkMask").stop(true).fadeIn("fast"); - $(".main-left").stop(true).animate({ - width: "15rem" - }, "fast"); - $(".main-right").css("overflow-y", "hidden"); - showSide = true; - } - }); - - - $(".darkMask").click(function () { - if (showSide) { - showSide = false; - $(".darkMask").stop(true).fadeOut("fast"); - $(".main-left").stop(true).animate({ - width: "0" - }, "fast"); - $(".main-right").css("overflow-y", "visible"); - } - }); - - $(window).resize(function () { - if ($(window).width() > 921) { - $(".main-left").css("width", ""); - $(".darkMask").stop(true); - $(".darkMask").css("display", "none"); - showSide = false; - } - }); - - /** - * fix legend position - */ - $("legend").each(function () { - var that = $(this); - that.after("<span class='panel-title'>" + that.text() + "</span>"); - }); - - $(".cbi-section-table-titles, .cbi-section-table-descr, .cbi-section-descr").each(function () { - var that = $(this); - if (that.text().trim() == ""){ - that.css("display", "none"); - } - }); - - - $(".main-right").focus(); - $(".main-right").blur(); - $("input").attr("size", "0"); - - if (mainNodeName != undefined) { - console.log(mainNodeName); - switch (mainNodeName) { - case "node-status-system_log": - case "node-status-kernel_log": - $("#syslog").focus(function () { - $("#syslog").blur(); - $(".main-right").focus(); - $(".main-right").blur(); - }); - break; - case "node-status-firewall": - var button = $(".node-status-firewall > .main fieldset li > a"); - button.addClass("cbi-button cbi-button-reset a-to-btn"); - break; - case "node-system-reboot": - var button = $(".node-system-reboot > .main > .main-right p > a"); - button.addClass("cbi-button cbi-input-reset a-to-btn"); - break; - } - } + $(".main > .loading").fadeOut(); + + /** + * trim text, Remove spaces, wrap + * @param text + * @returns {string} + */ + function trimText(text) { + return text.replace(/[ \t\n\r]+/g, " "); + } + + var lastNode = undefined; + var mainNodeName = undefined; + + var nodeUrl = ""; + (function(node){ + var luciLocation; + if (node[0] == "admin"){ + luciLocation = [node[1], node[2]]; + }else{ + luciLocation = node; + } + + for(var i in luciLocation){ + nodeUrl += luciLocation[i]; + if (i != luciLocation.length - 1){ + nodeUrl += "/"; + } + } + })(luciLocation); + + /** + * get the current node by Burl (primary) + * @returns {boolean} success? + */ + function getCurrentNodeByUrl() { + var ret = false; + if (!$('body').hasClass('logged-in')) { + luciLocation = ["Main", "Login"]; + return true; + } + + $(".main > .main-left > .nav > .slide > .menu").each(function () { + var ulNode = $(this); + ulNode.next().find("a").each(function () { + var that = $(this); + var href = that.attr("href"); + + if (href.indexOf(nodeUrl) != -1) { + ulNode.click(); + ulNode.next(".slide-menu").stop(true, true); + lastNode = that.parent(); + lastNode.addClass("active"); + ret = true; + return true; + } + }); + }); + return ret; + } + + /** + * menu click + */ + $(".main > .main-left > .nav > .slide > .menu").click(function () { + var ul = $(this).next(".slide-menu"); + var menu = $(this); + if (!ul.is(":visible")) { + menu.addClass("active"); + ul.addClass("active"); + ul.stop(true).slideDown("fast"); + } else { + ul.stop(true).slideUp("fast", function () { + menu.removeClass("active"); + ul.removeClass("active"); + }); + } + return false; + }); + + /** + * hook menu click and add the hash + */ + $(".main > .main-left > .nav > .slide > .slide-menu > li > a").click(function () { + if (lastNode != undefined) lastNode.removeClass("active"); + $(this).parent().addClass("active"); + $(".main > .loading").fadeIn("fast"); + return true; + }); + + /** + * fix menu click + */ + $(".main > .main-left > .nav > .slide > .slide-menu > li").click(function () { + if (lastNode != undefined) lastNode.removeClass("active"); + $(this).addClass("active"); + $(".main > .loading").fadeIn("fast"); + window.location = $($(this).find("a")[0]).attr("href"); + return false; + }); + + /** + * get current node and open it + */ + if (getCurrentNodeByUrl()) { + mainNodeName = "node-" + luciLocation[0] + "-" + luciLocation[1]; + mainNodeName = mainNodeName.replace(/[ \t\n\r\/]+/g, "_").toLowerCase(); + $("body").addClass(mainNodeName); + } + + /** + * Sidebar expand + */ + var showSide = false; + $(".showSide").click(function () { + if (showSide) { + $(".darkMask").stop(true).fadeOut("fast"); + $(".main-left").stop(true).animate({ + width: "0" + }, "fast"); + $(".main-right").css("overflow-y", "visible"); + showSide = false; + } else { + $(".darkMask").stop(true).fadeIn("fast"); + $(".main-left").stop(true).animate({ + width: "15rem" + }, "fast"); + $(".main-right").css("overflow-y", "hidden"); + showSide = true; + } + }); + + $(".darkMask").click(function () { + if (showSide) { + showSide = false; + $(".darkMask").stop(true).fadeOut("fast"); + $(".main-left").stop(true).animate({ + width: "0" + }, "fast"); + $(".main-right").css("overflow-y", "visible"); + } + }); + + $(window).resize(function () { + if ($(window).width() > 921) { + $(".main-left").css("width", ""); + $(".darkMask").stop(true); + $(".darkMask").css("display", "none"); + showSide = false; + } + }); + + /** + * fix legend position + */ + $("legend").each(function () { + var that = $(this); + that.after("<span class='panel-title'>" + that.text() + "</span>"); + }); + + $(".cbi-section-table-titles, .cbi-section-table-descr, .cbi-section-descr").each(function () { + var that = $(this); + if (that.text().trim() == ""){ + that.css("display", "none"); + } + }); + + $(".main-right").focus(); + $(".main-right").blur(); + $("input").attr("size", "0"); + $(".cbi-button-up").val("__"); + $(".cbi-button-down").val("__"); + $(".slide > a").removeAttr("href"); + + if (mainNodeName != undefined) { + console.log(mainNodeName); + switch (mainNodeName) { + case "node-status-system_log": + case "node-status-kernel_log": + $("#syslog").focus(function () { + $("#syslog").blur(); + $(".main-right").focus(); + $(".main-right").blur(); + }); + break; + case "node-status-firewall": + var button = $(".node-status-firewall > .main fieldset li > a"); + button.addClass("cbi-button cbi-button-reset a-to-btn"); + break; + case "node-system-reboot": + var button = $(".node-system-reboot > .main > .main-right p > a"); + button.addClass("cbi-button cbi-input-reset a-to-btn"); + break; + } + } })(jQuery); diff --git a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css index 77f0ecf3e2..26a08be463 100644 --- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css @@ -16,557 +16,966 @@ * Licensed to the public under the Apache License 2.0 */ +/* + * Font generate by Icomoon<icomoon.io> + */ @font-face { - font-family: 'icomoon'; - src: url('fonts/font.eot'); - src: url('fonts/font.eot') format('embedded-opentype'), url('fonts/font.ttf') format('truetype'), url('fonts/font.woff') format('woff'), url('fonts/font.svg') format('svg'); - font-weight: normal; - font-style: normal; -} -strong { - font-weight: normal; + font-family: "icomoon"; + font-weight: normal; + font-style: normal; + src: url("fonts/font.eot"); + src: url("fonts/font.eot") format("embedded-opentype"), url("fonts/font.ttf") format("truetype"), + url("fonts/font.woff") format("woff"), url("fonts/font.svg") format("svg"); } + +/* Table correlation 表格 */ .table { - display: table; - position: relative; + position: relative; + display: table; } + .tr { - display: table-row; + display: table-row; } + .thead { - display: table-header-group; + display: table-header-group; } + .tbody { - display: table-row-group; + display: table-row-group; } + .tfoot { - display: table-footer-group; + display: table-footer-group; } + .td, .th { - vertical-align: middle; - text-align: center; - display: table-cell; - padding: .8em; + line-height: normal; + display: table-cell; + padding: .5em; + text-align: center; + vertical-align: middle; } + .th { - font-weight: normal; + color: #333; +} + +.td { + color: #777; } + .tr.placeholder { - height: 4em; - background-color: #f9f9f9; -} -.tr.placeholder>.td { - position: absolute; - left: 0; - right: 0; - bottom: 0; - text-align: center; - line-height: 3em; - background: #f9f9f9; + height: 4em; } + +.tr.placeholder > .td { + line-height: 3; + position: absolute; + right: 0; + bottom: 0; + left: 0; + text-align: center !important; + background: inherit; +} + +.td[width="33%"] { + padding: 1.1em; +} + .table[width="33%"], .th[width="33%"], .td[width="33%"] { - width: 33%; + width: 33%; } + .table[width="100%"], .th[width="100%"], .td[width="100%"] { - width: 100%; + width: 100%; } + +/* grid 栅格 */ .col-1 { - flex: 1 1 30px !important; - -webkit-flex: 1 1 30px !important; + flex: 1 1 30px !important; } + .col-2 { - flex: 2 2 60px !important; - -webkit-flex: 2 2 60px !important; + flex: 2 2 60px !important; } + .col-3 { - flex: 3 3 90px !important; - -webkit-flex: 3 3 90px !important; + flex: 3 3 90px !important; } + .col-4 { - flex: 4 4 120px !important; - -webkit-flex: 4 4 120px !important; + flex: 4 4 120px !important; } + .col-5 { - flex: 5 5 150px !important; - -webkit-flex: 5 5 150px !important; + flex: 5 5 150px !important; } + .col-6 { - flex: 6 6 180px !important; - -webkit-flex: 6 6 180px !important; + flex: 6 6 180px !important; } + .col-7 { - flex: 7 7 210px !important; - -webkit-flex: 7 7 210px !important; + flex: 7 7 210px !important; } + .col-8 { - flex: 8 8 240px !important; - -webkit-flex: 8 8 240px !important; + flex: 8 8 240px !important; } + .col-9 { - flex: 9 9 270px !important; - -webkit-flex: 9 9 270px !important; + flex: 9 9 270px !important; } + .col-10 { - flex: 10 10 300px !important; - -webkit-flex: 10 10 300px !important; + flex: 10 10 300px !important; } -.cbi-button-up, -.cbi-button-down, -.cbi-value-helpicon, -.main>.loading>span { - font-family: 'icomoon' !important; - speak: none; - font-style: normal !important; - font-weight: normal !important; - font-variant: normal !important; - text-transform: none !important; - line-height: 1; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} -* { - margin: 0; - padding: 0; - box-sizing: border-box; -} -.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { - font-family: inherit; - font-weight: normal; - line-height: 1.1; - color: inherit; -} -html { - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; - position: relative; -} -body { - font-size: 0.8rem; - background-color: #EEE; -} -html, -body { - margin: 0px; - padding: 0px; - height: auto; - min-height: 100%; - font-family: Microsoft Yahei, WenQuanYi Micro Hei, sans-serif, "Helvetica Neue", Helvetica, Hiragino Sans GB; + +/* dom 元素 */ +.h1, +.h2, +.h3, +.h4, +.h5, +.h6, +h1, +h2, +h3, +h4, +h5, +h6 { + font-family: inherit; + font-weight: normal; + line-height: 1.1 !important; + color: inherit; } -select { - padding: 0.36rem 0.8rem; - color: #555; - background-color: #fff; - background-image: none; - border: 1px solid #ccc; + + +header { + display: none; + height: 3rem; + z-index: 1000; } -select, -input, -.cbi-dropdown { - background-color: transparent; - color: rgba(0, 0, 0, .87); - border: none; - border-bottom: 2px solid rgba(0, 0, 0, .26); - outline: 0; - padding: 0; - box-shadow: none; - border-radius: 0; - background-image: none; - height: auto; - font-size: 0.8rem; + +header .container { + padding: 0 0.5rem; } -select:not([multiple="multiple"]):focus, -input:focus { - border-color: #0099CC; + +select { + padding: .36rem .8rem; + color: #555; + border: thin solid #ccc; + background-color: #fff; + background-image: none; } -select[multiple="multiple"] { - height: auto; + +pre { + overflow: auto; } + code { - color: #0099CC; + font-size: 1rem; + font-size-adjust: .35; + padding: 1px 3px; + color: #101010; + border: thin solid #999; + border-radius: 2px; + background: #ddd; } + abbr { - color: #005470; - text-decoration: underline; - cursor: help; + cursor: help; + text-decoration: underline; + color: #005470; } + hr { - margin: 1rem 0; - border-color: #EEE; - opacity: 0.1; -} -footer>a { - color: #aaa; - text-decoration: none; -} -.main>.loading { - position: fixed; - width: 100%; - height: 100%; - z-index: 2000; - display: block; - background-color: #354057; - top: 0; -} -.main>.loading>span { - display: block; - text-align: center; - margin-top: 2rem; - color: #888; - font-size: 1.2rem; - line-height: 45px; -} -.main>.loading>span>.loading-img { - margin-right: 0.2rem; - display: inline-block; -} -.main>.loading>span>.loading-img img { - vertical-align: middle; + margin: 1rem 0; + opacity: .1; + border-color: #eee; +} + +textarea { + resize: none; + border-radius: 20px; } + .pull-right { - float: right; + float: right; } + .pull-left { - float: left; + float: left; +} + +.nowrap:not(.td) { + white-space: nowrap; +} + +[disabled="disabled"] { + pointer-events: none; +} + +#xhr_poll_status { + display: flex; +} + +.danger { + background-color: #f794b0 !important; } + +.warning { + background-color: #f0e68c !important; +} + +.success { + background-color: #f24c7c !important; +} + +.notice { + background-color: #468ea4 !important; +} + +.error { + color: #f00; +} + +ul { + line-height: normal; +} + li { - list-style-type: none; + list-style-type: none; } + h1 { - font-size: 2rem; - padding-bottom: 10px; - border-bottom: 1px solid #eee; + font-size: 2rem; + padding-bottom: 10px; + border-bottom: thin solid #eee; } + h2 { - margin: 2rem 0 0 0; - color: #354057; - font-size: 1.8rem; - padding-bottom: 10px; - border-bottom: 1px solid #eee; + font-size: 1.8rem; + margin: 2rem 0 0 0; + padding-bottom: 10px; + color: #354057; } + h3 { - margin: 2rem 0 0 0; - font-size: 1.4rem; - padding-bottom: 10px; + font-size: 1.4rem; + margin: 2rem 0 0 0; + padding-bottom: 10px; } + h4 { - margin: 2rem 0 0 0; - font-size: 1.2rem; - padding-bottom: 10px; + font-size: 1.2rem; + margin: 2rem 0 0 0; + padding-bottom: 10px; } -.mobile-hide { - display: inline-block; + +h5 { + font-size: 1rem; + margin: 2rem 0 0 0; + padding-bottom: 10px; } -.PC-hide { - width: 100%; - display: none; -} -.cbi-section { - margin: 1rem 0 0 0; - padding: 2rem; - border: 0; - font-weight: normal; - font-style: normal; - line-height: 1; - font-family: inherit; - min-width: inherit; - border-radius: 20px; - background-color: #FFF; - -webkit-overflow-scrolling: touch; -} -.cbi-section>legend { - display: none !important; -} -.cbi-section>h3:first-child, + +.cbi-section, +.cbi-section-error, +#cbi-network > .cbi-section-node, +#cbi-wireless > .cbi-section-node, +#cbi-wireless > #wifi_assoclist_table, +[data-page^="admin-system-admin"]:not(.login) .cbi-map:not(#cbi-dropbear), +[data-page="admin-system-opkg"] #maincontent > .container { + font-family: inherit; + font-weight: normal; + font-style: normal; + line-height: normal; + min-width: inherit; + margin: 1rem 0 0 0; + padding: 2rem; + border-radius: 20px; + background-color: #fff; +} + +fieldset { + border: none; +} + +.cbi-map-descr + fieldset { + margin-top: 1rem; + border: none; +} + +.cbi-section > legend { + display: none !important; +} + +fieldset > fieldset, +.cbi-section > .cbi-section { + margin: 0; + padding: 0; + border: 0; + box-shadow: none; +} + +.cbi-section > h3:first-child, .panel-title { - width: 100%; - display: block; - line-height: 1; - color: #354057; - font-size: 1.4rem; - padding-bottom: 1rem; - margin: 0; + font-size: 1.4rem; + line-height: 1; + display: block; + width: 100%; + margin: 0; + margin-bottom: .5rem; + color: #354057; } -.table { - width: 100%; - border-radius: 20px; -} -.table>.tbody>.tr>.td, -.table>.tbody>.tr>.th, -.table>.tfoot>.tr>.td, -.table>.tfoot>.tr>.th, -.table>.thead>.tr>.td, -.table>.thead>.tr>.th { - padding: .5rem; - border-top: 1px solid #ddd; - white-space: nowrap; + +/* btn 按钮 */ +.cbi-button-up, +.cbi-button-down, +.cbi-value-helpicon, +.showSide { + font-family: "icomoon" !important; + font-weight: normal; + font-style: normal; + font-variant: normal; + line-height: 1; + text-transform: none; + -webkit-font-smoothing: antialiased; + speak: none; } -.cbi-section-table-cell { - white-space: nowrap; - align-self: flex-end; - flex: 1 1 auto; + +* { + box-sizing: border-box; + margin: 0; + padding: 0; } -.cbi-section-table { - border: none; + +.btn, +button, +select, +input, +.cbi-dropdown { + height: 1.8rem; + padding: 0; + color: rgba(0, 0, 0, .87); + border: 0; + border-bottom: 2px solid rgba(0, 0, 0, .26); + border-radius: 0; + outline: 0; + background-color: transparent; + background-image: none; + box-shadow: none; + vertical-align: bottom; } -.cbi-section-table-row { - text-align: center; - margin-bottom: 1rem; - background: #f4f4f4; + +select, +.cbi-dropdown { + width: inherit; } -.cbi-section-table-row:last-child { - margin-bottom: 0; + +select:not([multiple="multiple"]):focus, +input:not(.cbi-button):focus, +.cbi-dropdown:focus, +.cbi-dynlist > .item:focus { + border-color: #09c; } -.cbi-section-table-row>.cbi-value-field .cbi-input-select, -.cbi-section-table-row>.cbi-value-field .cbi-input-text, -.cbi-section-table-row>.cbi-value-field .cbi-input-password, -.cbi-section-table-row>.cbi-value-field .cbi-dropdown { - width: 100%; + +select[multiple="multiple"] { + height: auto; } -.cbi-section-table-row>.cbi-value-field [data-dynlist]>input, -.cbi-section-table-row>.cbi-value-field input.cbi-input-password { - width: calc(100% - 1.5rem); + +/* footer 尾部 */ +footer { + font-size: .8rem; + overflow: hidden; + padding: 1rem; + text-align: right; + color: #aaa; + width: 100%; + float: right; } -div>table>tbody>tr:nth-of-type(2n), -div>.table>.tbody>.tr:nth-of-type(2n) { - background-color: #f9f9f9; + +footer > a { + text-decoration: none; + color: #aaa; } -div>table>tbody>tr:nth-of-type(2n), -div>.table>.tbody>.tr:nth-of-type(2n) { - background-color: #f9f9f9; + +/* Main interface 主界面 */ +.loading { + position: fixed; + z-index: 3000; + top: 0; + display: block; + width: 100%; + height: 100%; + pointer-events: none; + background-color: #354057; } -.cbi-section .table .tr.table-titles { - background-color: #eee; + +.loading > span { + font-family: monospace; + font-size: 2.0rem; + font-size-adjust: .35; + position: relative; + top: 12.5%; + display: block; + text-align: center; + color: #888; } -.table .tr:first-child .td:first-child, -.table .tr:first-child::before, -.table .tr:first-child .th:first-child { - border-top-left-radius: 10px; + +.loading > span > .loading-img { + font-family: "icomoon" !important; + font-size: 1.0rem; + display: inline-block; + margin-right: 1rem; + animation: anim-rotate 2s infinite linear; + vertical-align: middle; } -.table .tr:first-child .td:last-child, -.table .tr:first-child .th:last-child { - border-top-right-radius: 10px; + +@keyframes anim-rotate { + 0% { + -webkit-transform: rotate(0); + -ms-transform: rotate(0); + transform: rotate(0); + } + + 100% { + -webkit-transform: rotate(360deg); + -ms-transform: rotate(360deg); + transform: rotate(360deg); + } } -.table .tr:last-child .td:first-child, -.table .tr:last-child::before { - border-bottom-left-radius: 10px; + +.Processes #maincontent > .container { + margin-right: 0; } -.table .tr:last-child .td:last-child { - border-bottom-right-radius: 10px; + +/* Main interface left 左主界面 */ +.main-left { + position: fixed; + top: 10px; + bottom: 10px; + left: 10px; + width: 15%; + border-radius: 20px; + background-color: #7f8ba5; + z-index: 2000; + min-width: 210px; +} + +.main-left .nav-container { + position: absolute; + top: 10px; + left: 10px; + bottom: 10px; + background-color: #354057; + width: 100%; + border-radius: 20px; +} + +.main-left .nav-container .navbar-container { + position: absolute; + overflow: hidden; + bottom: 10px; + top: 82px; + width: 100%; + height: calc(100% - 92px); } -.table .tr.placeholder:last-child { - background-color: transparent; + +.main-left .nav-container .brand { + color: #fff; + text-decoration: none; + font-size: 18px; + display: block; + text-align: center; + padding: 36px 0 24px; + border-bottom: 1px solid #fff; + margin: 0 15px; } -.cbi-section .table .cbi-section-table-titles { - background-color: #e0e0e0; + +.main-left .nav { + margin-top: .5rem; } -/* fix progress bar */ -.cbi-progressbar { - background-color: #9bc1cc; - border-radius: 20px; - overflow: hidden; - position: relative; + +.main-left .nav > li { + padding: .5rem 1rem; + cursor: pointer; } -.cbi-progressbar div { - background-color: #468ea4; - height: 20px; - border-radius: 20px; + +.main-left .nav > li a { + display: block; + color: #fff; } -.cbi-progressbar::after { - content: attr(title); - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - text-align: center; - line-height: 1.2rem; - color: #fff; + +.main-left .nav > .slide { + padding: 0; } + +.main-left .nav > .slide > ul { + display: none; +} + +.main-left .nav > .slide > .menu { + font-size: 1.15rem; + display: block; + padding: .5rem 1rem; + text-decoration: none; + color: #fff; + width: 90%; + border-radius: 0 25px 25px 0; +} + +.main-left .nav > .slide > .menu.active { + background: #485267; +} + +.main-left .nav > li:hover, +.main-left .nav > .slide > .menu:hover, +.main-left .nav > .slide > .slide-menu > li:hover { + background: #485267; +} + +.main-left .nav > .slide:hover { + background: none; +} + +.main-left .nav > .slide > .slide-menu > li { + margin: 5px 0; + padding: 10px 2rem; + width: 90%; + border-radius: 0 25px 25px 0; +} + +.main-left .nav > .slide > .slide-menu > .active { + background-color: #f24c7c !important; + width: 80%; + border-radius: 0 25px 25px 0; +} + +.main-left .nav > .slide > .slide-menu > li > a { + white-space: nowrap; + text-decoration: none; +} + +.main-left .nav > .slide > .slide-menu > .active > a { + color: #fff; +} + +.main-left .nav > .slide > .slide-menu > .active:hover { + cursor: hand; +} + +/* Main interface right 右主界面 */ +.main-right .container .alert, +.main-right .container .alert-message { + margin-top: 1rem; +} + +.main-right .container .alert-message { + padding: 1rem; + margin-top: 1rem; + border-radius: 20px; + background-color: #fff !important; +} + +.main-right .container .alert-message h4 { + margin-top: 1rem; + background: url(./no-pwd.png) no-repeat left 1px / 28px; + padding: 7px 0 0 32px; +} + +.main-right .container .alert-message .btn { + margin-top: .8rem; + padding: 7px 6px; + background-color: #468ea4; + border-radius: 20px; + color: #fff; +} + +/* table 表格 */ +table { + border-spacing: 0; + border-collapse: collapse; +} + +table, +.table { + overflow: hidden; + width: 100%; + border: 1px solid #ddd; + border-radius: 10px; +} + +table > tbody > tr > td, +table > tbody > tr > th, +table > tfoot > tr > td, +table > tfoot > tr > th, +table > thead > tr > td, +table > thead > tr > th, +.table > .tbody > .tr > .td, +.table > .tbody > .tr > .th, +.table > .tfoot > .tr > .td, +.table > .tfoot > .tr > .th, +.table > .thead > .tr > .td, +.table > .thead > .tr > .th, +.table > .tr > .td.cbi-value-field, +.table > .tr > .th.cbi-section-table-cell { + padding: .5rem; +} + +.container > .cbi-section:first-of-type > .table[width="100%"] > .tr > .td { + padding: .6rem; +} + +.cbi-section-table-cell { + line-height: 1.1; + align-self: flex-end; + flex: 1 1 auto; +} + +tr > td, +tr > th, +.tr > .td, +.tr > .th, +.cbi-section-table-row::before, +#cbi-wireless > #wifi_assoclist_table > .tr:nth-child(2) { + border-top: thin solid #ddd; +} + +tr:first-child > td .tr:first-child > .td, +#cbi-wireless .td, +#cbi-network .tr:first-child > .td, +.table[width="100%"] > .tr:first-child > .td, +[data-page="admin-network-diagnostics"] .tr > .td, +.tr.table-titles > .th, +.tr.cbi-section-table-titles > .th { + border-top: 0 !important; +} + +.cbi-section-table-row { + margin-bottom: 1rem; + text-align: center !important; + background: #f4f4f4; +} + +.cbi-section-table-row:last-child { + margin-bottom: 0; +} + +.cbi-section-table-row > .cbi-value-field .cbi-input-select, +.cbi-section-table-row > .cbi-value-field .cbi-input-text, +.cbi-section-table-row > .cbi-value-field .cbi-input-password, +.cbi-section-table-row > .cbi-value-field .cbi-dropdown { + width: 100%; +} + +.cbi-section-table-row > .cbi-value-field [data-dynlist] > input, +.cbi-section-table-row > .cbi-value-field input.cbi-input-password { + width: calc(100% - 1.5rem); +} + +.cbi-section-table-row .td { + text-align: center !important; +} + +div > table > tbody > tr:nth-of-type(2n), +div > .table > .tr:nth-of-type(2n) { + background-color: #f9f9f9; +} + /* fix multiple table */ table table, .table .table { - border: none; + border: 0; } + .cbi-value-field table, .cbi-value-field .table { - border: none; + border: 0; } -td>table>tbody>tr>td, -.td>.table>.tbody>.tr>.td { - border: none; + +td > table > tbody > tr > td, +.td > .table > .tbody > .tr > .td { + border: 0; } -.cbi-value-field>table>tbody>tr>td, -.cbi-value-field>.table>.tbody>.tr>.td { - border: none; + +.cbi-value-field > table > tbody > tr > td, +.cbi-value-field > .table > .tbody > .tr > .td { + border: 0; } + /* button style */ .btn, -.cbi-button { - margin: 0 .8rem .5rem 0; - -webkit-appearance: none; - color: #354057; - background-color: transparent; - transition: all 0.2s ease-in-out; - display: inline-block; - padding: .5rem .8rem; - border: 1px solid; - border-radius: 25px; - cursor: pointer; - -ms-touch-action: manipulation; - touch-action: manipulation; - background-image: none; - text-align: center; - vertical-align: middle; - white-space: nowrap; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - font-size: 0.8rem; - width: auto; - display: inline-block; - text-decoration: none; +.cbi-button, +.item::after { + font-size: .8rem; + display: inline-block; + width: auto !important; + padding: 0 .8rem; + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + transition: all .2s ease-in-out; + text-align: center; + vertical-align: middle; + white-space: nowrap; + text-decoration: none; + color: rgba(0, 0, 0, .87); + border: 0; + border-radius: 20px; + background-color: #f0f0f0; + background-image: none; + -webkit-appearance: none; + -ms-touch-action: manipulation; + touch-action: manipulation; +} + +.cbi-button:not(select) { + -webkit-appearance: none !important; +} + +form[method="post"] + form[method="post"], +.cbi-button + .cbi-button { + margin-left: .6rem; +} + +.btn:hover, +.btn:focus, +.btn:active, +.cbi-button:hover, +.cbi-button:focus, +.cbi-button:active, +.item:hover::after, +.item:focus::after, +.item:active::after, +.cbi-page-actions .cbi-button-apply + .cbi-button-save:hover, +.cbi-page-actions .cbi-button-apply + .cbi-button-save:focus, +.cbi-page-actions .cbi-button-apply + .cbi-button-save:active { + text-decoration: none; + outline: 0; } + .btn:disabled, .cbi-button:disabled { - cursor: not-allowed; - pointer-events: none; - opacity: 0.60; - box-shadow: none; -} -.cbi-page-actions .cbi-button-apply, -.cbi-section-actions .cbi-button-edit, -.cbi-button-edit.important, -.cbi-button-apply.important, -.cbi-button-reload.important, -.cbi-button-apply, -.cbi-page-actions .cbi-button-save { - color: #fff; - background-color: #337ab7; - border: none; -} -.cbi-button-add.important, -.cbi-button-save.important, -.cbi-button-positive.important, -.cbi-button-action.important, -.cbi-section-actions .cbi-button-edit { - color: #337ab7; - background-color: transparent; - border: 1px solid #337ab7; -} -.cbi-button-remove.important, -.cbi-button-reset.important, -.cbi-button-negative.important { - color: #fff; - background-color: #d9534f; - border: none; + cursor: not-allowed; + pointer-events: none; + opacity: .5; + box-shadow: none; } + +/* gray */ +.modal div[class="btn"], .cbi-button-find, .cbi-button-link, .cbi-button-up, .cbi-button-down, -.cbi-button-neutral { - color: #468ea4; - background-color: transparent; - border: 1px solid #468ea4; -} -.cbi-button-edit, -.cbi-button-reload, -.cbi-button-action { - color: #468ea4; - background-color: transparent; - border: 1px solid #468ea4; +.cbi-button-neutral, +.cbi-button[name="zero"], +.cbi-button[name="restart"], +.cbi-button[onclick="hide_empty(this)"] { + border: 1px solid; } -.cbi-page-actions .cbi-button-apply+.cbi-button-save, + +/* dark blue */ +.btn.primary, +.cbi-page-actions .cbi-button-save, +.cbi-page-actions .cbi-button-apply + .cbi-button-save, .cbi-button-add, .cbi-button-save, -.cbi-button-positive { - color: #354057; - background-color: transparent; - border: 1px solid #354057; +.cbi-button-positive, +.cbi-button-link, +.cbi-button[value="Enable"], +.cbi-button[value="Scan"], +.cbi-button[value^="Back"], +.cbi-button-neutral[onclick="handleConfig(event)"] { + font-weight: normal; + color: #2e6da4; + border: thin solid #2e6da4; + background-color: transparent; } -.cbi-section-remove>.cbi-button, + +/* light blue */ +.cbi-page-actions .cbi-button-apply, +.cbi-section-actions .cbi-button-edit, +.cbi-button-edit, +.cbi-button-apply, +.cbi-button-reload, +.cbi-button-action, +.cbi-button[value="Submit"], +.cbi-button[value$="Apply"], +.cbi-button[onclick="addKey(event)"] { + font-weight: normal; + color: #fff; + border: 1px solid #468ea4; + background-color: #468ea4; +} + +/* red */ +.btn.danger, +.cbi-section-remove > .cbi-button, .cbi-button-remove, .cbi-button-reset, -.cbi-button-negative { - color: #F24C7C; - background-color: transparent; - border: 1px solid #F24C7C; +.cbi-button-negative, +.cbi-button[value="Stop"], +.cbi-button[value="Kill"], +.cbi-button[onclick="reboot(this)"], +.cbi-button-neutral[value="Restart"] { + padding: 5px .8rem; + font-weight: 100; + color: #f24b7c; + background-color: transparent; + border: 1px solid #f24b7c; +} + +/* yellow */ +.btn[value="Dismiss"], +.cbi-button[value="Terminate"], +.cbi-button[value="Reset"], +.cbi-button[value="Disabled"], +.cbi-button[onclick^="iface_reconnect"], +.cbi-button[onclick="handleReset(event)"], +.cbi-button-neutral[value="Disable"] { + font-weight: normal; + color: #9a4569; + border: 1px solid #9a4569; + background-color: transparent; +} + +/* green */ +.cbi-button-success, +.cbi-button-download, +.cbi-button[name="backup"], +.cbi-button[value="Upload"], +.cbi-button[value="Save mtdblock"] { + font-weight: normal; + color: #468ea4; + border: thin solid #468ea4; + background-color: transparent; } + .cbi-page-actions .cbi-button-link:first-child { - float: left; + float: left; } + .a-to-btn { - text-decoration: none; -} -/* table */ -.container>.tabs, -.container>.tabs>li[class~="active"], -.container>.tabs>li:hover, -.container>.cbi-tabmenu, -.container>.cbi-tabmenu>li[class~="cbi-tab"], -.container>.cbi-tabmenu>li:hover { - border-radius: 20px; -} -.container .cbi-map .cbi-tabmenu, -.container .cbi-map .cbi-tabmenu>li[class~="cbi-tab"], -.container .cbi-map .cbi-tabmenu>li:hover { - border-top-left-radius: 10px; - border-top-right-radius: 10px; -} -.container .cbi-map .cbi-tabmenu, -.container>.tabs, -.container>.cbi-tabmenu { - overflow: hidden; -} -.container .cbi-map .cbi-tabmenu+div { - border-radius: 0; - border-bottom-left-radius: 10px; - border-bottom-right-radius: 10px; + text-decoration: none; +} + +.cbi-value-field .cbi-button-add { + padding: 1px 6px; +} + +.cbi-value-field .cbi-button-neutral { + padding: 1px 8px; } + +/* tabs & menu 选项卡 & 菜单栏 */ .tabs { - background-color: #FFFFFF; - margin-top: 1rem; -} -.cbi-tabmenu>li, -.tabs>li { - margin-right: .4rem; - display: inline-block; - padding: 0.6rem 0rem; -} -.cbi-tabmenu>li>a, -.tabs>li>a { - text-decoration: none; - color: #404040; - padding: 0.5rem 0.8rem; -} -.tabs>li[class~="active"], -.tabs>li:hover { - cursor: pointer; - background-color: #337ab7; -} -.tabs>li[class~="active"]>a, -.tabs>li:hover>a { - color: #fff; + margin-top: 1rem; + background-color: #fff; + border-radius: 20px; +} + +.tabs > li { + margin-right: .8rem; + padding: 6px 10px; + position: relative; + display: inline-block; + text-align: center; +} + +.tabs > li a { + color: #468EA4; + font-size: 14px; + text-decoration: none; + position: relative; + z-index: 1; +} +.tabs > li::after { + content: ''; + background-color: #cccccc82; + position: absolute; + width: 0; + height: 100%; + bottom: 0; + border-radius: 20px; + left: 50%; + transform: translateX(-50%); +} + +.tabs > li:hover::after { + transition: width .35s; + width: calc(100% + 4px); } + +.tabs > li.active::after { + width: calc(100% + 4px); + background-color: #468ea473; +} + +.cbi-tabmenu > li { + display: inline-block; + padding: .6rem 0; +} + +.cbi-tabmenu > li > a { + padding: .5rem .8rem; + text-decoration: none; + color: #404040; +} + .cbi-tabmenu { - border-top: 1px solid #D4D4D4; - border-left: 1px solid #D4D4D4; - border-right: 1px solid #D4D4D4; + border: thin solid #d4d4d4; + border-bottom: 0; } -.cbi-tabmenu>li:hover { - background-color: #F1F1F1; + +.cbi-tabmenu > li:hover { + background-color: #f1f1f1; + border-radius: 10px 10px 0 0; } -.cbi-tabmenu>li[class~="cbi-tab"] { - background-color: #fff; + +.cbi-tabmenu > li[class~="cbi-tab"] { + background-color: #fff; + border-radius: 10px 10px 0 0; } + .cbi-tabmenu { - background-color: #D4D4D4; + background-color: #d4d4d4; + border-radius: 10px 10px 0 0; + overflow: hidden; +} + +.cbi-section .cbi-section-remove:nth-of-type(2n), +.container > .cbi-section .cbi-section-node:nth-of-type(2n) { + background-color: #f9f9f9; +} + +.cbi-tabmenu + div { + border-radius: 0 0 10px 10px; +} + +.cbi-tabmenu + div.controls { + margin: 0; + padding: .5em 0 1em 0; + background: #fff; + border: 1px solid #d4d4d4; + border-top: none; + border-bottom: none; + border-radius: 0; +} + +.cbi-tabmenu + div.controls + .table { + border-radius: 0 0 25px 25px; + background: #fff; } [data-tab-title] { @@ -582,1907 +991,2172 @@ td>table>tbody>tr>td, transition: opacity .25s ease-in; } -.cbi-section-remove:nth-of-type(2n) { - background-color: #f9f9f9; +.cbi-section[id] .cbi-section-remove:nth-of-type(4n + 3), +.cbi-section[id] .cbi-section-node:nth-of-type(4n + 4) { + background-color: #f9f9f9; } + .cbi-section-node-tabbed { - padding: 0; - margin-top: 0; - border-bottom: 1px solid #D4D4D4; - border-left: 1px solid #D4D4D4; - border-right: 1px solid #D4D4D4; + margin-top: 0; + padding: 0; + border: thin solid #d4d4d4; + border-top: 0; } -.cbi-tabcontainer>.cbi-value:nth-of-type(2n) { - background-color: #f9f9f9; + +.cbi-tabcontainer > .cbi-value:nth-of-type(2n) { + background-color: #f9f9f9; } + .cbi-value-field, .cbi-value-description { - display: table-cell; - line-height: 1.25; + line-height: 1.25; + display: table-cell; +} + +.cbi-input-invalid { + color: #f00; + border-color: #f00; +} + +.cbi-section-error { + font-weight: bold; + line-height: 1.42857143; + margin: 18px; + padding: 6px; + border: 1px solid #f24b7c; + border-radius: 3px; + background-color: #fce6e6; +} + +.cbi-section-error ul { + margin: 0 0 0 20px; } -.cbi-value-helpicon>img { - display: none; + +.cbi-section-error ul li { + font-weight: bold; + color: #f24b7c; +} + +.cbi-value-helpicon > img { + display: none; } + .cbi-value-helpicon:before { - content: "\f059"; + content: "\f059"; } + .cbi-value-description { - font-size: small; - opacity: 0.5; - padding: 0.5rem 0 0 0; + font-size: small; + padding: .5rem 0 0 0; + opacity: .5; } .cbi-value-title { - word-wrap: break-word; - padding: 0.6rem 2rem .6rem 0; - width: 23rem; - float: left; - text-align: right; - display: table-cell; + display: table-cell; + float: left; + width: 23rem; + padding-top: .4rem; + padding-right: 2rem; + text-align: right; + word-wrap: break-word; } .cbi-value { - padding: 6px 0; - display: inline-block; - width: 100%; + display: inline-block; + width: 100%; + padding: .3rem 1rem; } -.cbi-section-table-descr>.cbi-section-table-cell, -.cbi-section-table-titles>.cbi-section-table-cell { - border: none; +.cbi-value ul { + line-height: 1.25; } .td[data-title]::before { - content: attr(data-title) ":\20"; - font-weight: bold; - text-align: left; - display: none; - padding: .25rem 0; - white-space: nowrap; + font-weight: bold; + display: none; + padding: .25rem 0; + content: attr(data-title) ":\20"; + text-align: left; + white-space: nowrap; } .tr.placeholder .td[data-title]::before { - display: none; + display: none; } .tr[data-title]::before, .tr.cbi-section-table-titles.named::before { - content: attr(data-title) "\20"; - font-weight: bold; - text-align: center; - display: table-cell; - align-self: center; - flex: 1 1 5%; - padding: .25rem; - white-space: normal; - word-wrap: break-word; - vertical-align: middle; + font-weight: bold; + display: table-cell; + align-self: center; + flex: 1 1 5%; + padding: .25rem; + content: attr(data-title) "\20"; + text-align: center; + vertical-align: middle; + white-space: normal; + word-wrap: break-word; } .cbi-rowstyle-1 { - background-color: #f9f9f9; + background-color: #f9f9f9; } .cbi-rowstyle-2 { - background-color: #eee; + background-color: #eee; +} + +.cbi-rowstyle-2 .cbi-button-up, +.cbi-rowstyle-2 .cbi-button-down { + background-color: #fff !important; } .cbi-section-table .cbi-section-table-titles .cbi-section-table-cell { - width: auto !important; + width: auto !important; } .td.cbi-section-actions { - text-align: right; - vertical-align: middle; + text-align: right !important; + vertical-align: middle; } -.td.cbi-section-actions>* { - display: flex; +.td.cbi-section-actions > * { + display: inline-flex; } -.td.cbi-section-actions>*>*, -.td.cbi-section-actions>*>form>* { - flex: 1 1 4em; - margin: 0 1px; +.td.cbi-section-actions > * > *, +.td.cbi-section-actions > * > form > * { + margin: 0 5px; } -.td.cbi-section-actions>*>form { - display: inline-flex; - margin: 0; +.td.cbi-section-actions > * > form { + display: inline-flex; + margin: 0; } /* desc */ - .cbi-section-descr, .cbi-map-descr { - padding: 0.5rem; - color: #999; - font-size: small; + font-size: small; + line-height: 1.42857143; + color: #999; } -.cbi-dropdown { - display: inline-flex; - cursor: pointer; - position: relative; - padding: 0; - height: auto; +.cbi-dynlist { + line-height: 1.3; + flex-direction: column; + min-height: 30px; +} + +.cbi-dynlist > .item { + position: relative; + max-width: 24.9rem; + margin: 0 2em 4px 0; + padding: 2px 4px; + cursor: default; + pointer-events: none; + color: #666; + border-bottom: 2px solid rgba(0, 0, 0, .26); +} + +.cbi-dynlist[name="sshkeys"] > .item { + max-width: none; +} + +.cbi-dynlist > .item::after { + position: absolute; + right: -2em; + bottom: 0; + display: inline-flex; + min-height: 17px; + padding: 0 6px; + content: "\00D7"; + pointer-events: auto; + color: #f24b7c; + border: thin solid #f24b7c; + background-color: transparent; } -.cbi-dropdown:focus { - outline: 2px solid #4b6e9b; +.cbi-dynlist > .item > span { + white-space: normal; + word-break: break-word; } -.cbi-dropdown>ul { - margin: 0 !important; - padding: 0; - list-style: none; - overflow-x: hidden; - overflow-y: auto; - display: flex; - width: 100%; +.cbi-dynlist, +.cbi-dropdown { + position: relative; + display: inline-flex; + height: auto; + padding: 0; + cursor: default; } -.cbi-dropdown>ul.preview { - display: none; +.cbi-dropdown > ul { + display: flex; + overflow-x: hidden; + overflow-y: auto; + width: 100%; + margin: 0 !important; + padding: 0; + list-style: none; } -.cbi-dropdown>.open { - border: 2px outset #eee; - flex-basis: 15px; - background: #eee; +.cbi-dropdown > ul.preview { + display: none; } -.cbi-dropdown>.open, -.cbi-dropdown>.more { - flex-grow: 0; - flex-shrink: 0; - display: flex; - flex-direction: column; - justify-content: center; - text-align: center; - line-height: 2em; - padding: 0 .25em; +.cbi-dropdown > .open { + flex-basis: 15px; } -.cbi-dropdown>.more, -.cbi-dropdown>ul>li[placeholder] { - color: #777; - font-weight: bold; - text-shadow: 1px 1px 0px #fff; - display: none; +.cbi-dropdown > .open, +.cbi-dropdown > .more { + font-size: 1rem; + font-weight: 900; + line-height: 2; + display: flex; + flex-direction: column; + flex-grow: 0; + flex-shrink: 0; + justify-content: center; + padding: 0 .25em; + text-align: center; + background: #d4d4d4; + border-radius: 5px; + margin-bottom: 1px; } -.cbi-dropdown>ul>li { - display: none; - padding: .25em; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - flex-shrink: 1; - flex-grow: 1; - align-items: center; - align-self: center; - min-height: 20px; +.cbi-dropdown > .more, +.cbi-dropdown > ul > li[placeholder] { + font-weight: bold; + display: none; + color: #777; + text-shadow: 1px 1px 0 #fff; } -.cbi-dropdown>ul>li .hide-open { - display: initial; +.cbi-dropdown > ul > li { + display: none; + overflow: hidden; + align-items: center; + align-self: center; + flex-grow: 1; + flex-shrink: 1; + min-height: 20px; + padding: .25em; + white-space: nowrap; + text-overflow: ellipsis; } -.cbi-dropdown>ul>li .hide-close { - display: none; +.cbi-dropdown > ul > li .hide-open { + display: initial; } -.cbi-dropdown>ul>li[display]:not([display="0"]) { - border-left: 1px solid #ccc; +.cbi-dropdown > ul > li .hide-close { + display: none; } -.cbi-dropdown[empty]>ul { - max-width: 1px; +.cbi-dropdown > ul > li[display]:not([display="0"]) { + border-left: thin solid #ccc; } -.cbi-dropdown>ul>li>form { - display: none; - margin: 0; - padding: 0; - pointer-events: none; +.cbi-dropdown[empty] > ul { + max-width: 1px; } -.cbi-dropdown>ul>li img { - vertical-align: middle; - margin-right: .25em; +.cbi-dropdown > ul > li > form { + display: none; + margin: 0; + padding: 0; + pointer-events: none; } -.cbi-dropdown>ul>li>form>input[type="checkbox"] { - margin: 0; - height: auto; +.cbi-dropdown > ul > li img { + margin-right: .25em; + vertical-align: middle; +} + +.cbi-dropdown > ul > li > form > input[type="checkbox"] { + height: auto; + margin: 0; } -.cbi-dropdown>ul>li input[type="text"] { - height: 20px; +.cbi-dropdown > ul > li input[type="text"] { + height: 20px; } .cbi-dropdown[open] { - position: relative; + position: relative; } -.cbi-dropdown[open]>ul.dropdown { - display: block; - background: #f6f6f5; - border: 1px solid #918e8c; - position: absolute; - z-index: 1000; - max-width: none; - min-width: 100%; - width: auto; +.cbi-dropdown[open] > ul.dropdown { + position: absolute; + z-index: 1100; + display: block; + width: auto; + min-width: 100%; + max-width: none; + max-height: 200px !important; + border: thin solid #918e8c; + background: #f6f6f6; } -.cbi-dropdown>ul>li[display], -.cbi-dropdown[open]>ul.preview, -.cbi-dropdown[open]>ul.dropdown>li, -.cbi-dropdown[multiple]>ul>li>label, -.cbi-dropdown[multiple][open]>ul.dropdown>li, -.cbi-dropdown[multiple][more]>.more, -.cbi-dropdown[multiple][empty]>.more { - flex-grow: 1; - display: flex; - align-items: center; +.cbi-dropdown > ul > li[display], +.cbi-dropdown[open] > ul.preview, +.cbi-dropdown[open] > ul.dropdown > li, +.cbi-dropdown[multiple] > ul > li > label, +.cbi-dropdown[multiple][open] > ul.dropdown > li, +.cbi-dropdown[multiple][more] > .more, +.cbi-dropdown[multiple][empty] > .more { + display: flex; + align-items: center; + flex-grow: 1; } -.cbi-dropdown[empty]>ul>li, -.cbi-dropdown[optional][open]>ul.dropdown>li[placeholder], -.cbi-dropdown[multiple][open]>ul.dropdown>li>form { - display: block; +.cbi-dropdown[empty] > ul > li, +.cbi-dropdown[optional][open] > ul.dropdown > li[placeholder], +.cbi-dropdown[multiple][open] > ul.dropdown > li > form { + display: block; } -.cbi-dropdown[open]>ul.dropdown>li .hide-open { - display: none; +.cbi-dropdown[open] > ul.dropdown > li .hide-open { + display: none; } -.cbi-dropdown[open]>ul.dropdown>li .hide-close { - display: initial; +.cbi-dropdown[open] > ul.dropdown > li .hide-close { + display: initial; } -.cbi-dropdown[open]>ul.dropdown>li { - border-bottom: 1px solid #ccc; +.cbi-dropdown[open] > ul.dropdown > li { + border-bottom: thin solid #ccc; } -.cbi-dropdown[open]>ul.dropdown>li[selected] { - background: #b0d0f0; +.cbi-dropdown[open] > ul.dropdown > li[selected] { + background: #b0d0f0; } -.cbi-dropdown[open]>ul.dropdown>li.focus { - background: linear-gradient(90deg, #a3c2e8 0%, #84aad9 100%); +.cbi-dropdown[open] > ul.dropdown > li.focus { + background: linear-gradient(90deg, #a3c2e8 0%, #84aad9 100%); } -.cbi-dropdown[open]>ul.dropdown>li:last-child { - margin-bottom: 0; - border-bottom: none; +.cbi-dropdown[open] > ul.dropdown > li:last-child { + margin-bottom: 0; + border-bottom: 0; +} + +.cbi-dropdown[open] > ul.dropdown > li[unselectable] { + opacity: .7; +} + +.cbi-dropdown[open] > ul.dropdown > li > input.create-item-input:first-child:last-child { + width: 100%; } .cbi-dropdown[disabled] { - pointer-events: none; - opacity: .6; + pointer-events: none; + opacity: .6; } .cbi-dropdown .zonebadge { - width: 100%; - border-radius: 20px; - background-color: #468ea4 !important; + width: 100%; } .cbi-dropdown[open] .zonebadge { - width: auto; + width: auto; +} + +#modal_overlay { + position: fixed; + z-index: 3000; + top: 0; + right: 10000px; + bottom: 0; + left: -10000px; + overflow-y: scroll; + transition: opacity .125s ease-in; + opacity: 0; + background: rgba(0, 0, 0, .7); + -webkit-overflow-scrolling: touch; } -/* luci */ +.modal { + display: flex; + align-items: center; + flex-wrap: wrap; + width: 90%; + min-width: 270px; + max-width: 600px; + min-height: 80px; + max-height: 2400px; + margin: 5em auto; + padding: 1em; + border-radius: 20px !important; + background: #fff; +} + +.modal > * { + line-height: normal; + flex-basis: 100%; +} + +.modal > pre, +.modal > textarea { + font-size: 1rem; + font-size-adjust: .35; + overflow: auto; + margin-bottom: .5em; + padding: 8.5px; + white-space: pre-wrap; + color: #fff; + outline: 0; + background-color: #354057; +} + +.modal > h4 { + margin: .5em 0; +} + +.modal ul { + margin-left: 2.2em; +} + +.modal li { + list-style-type: square; + color: #808080; +} + +.modal p { + padding-left: .25rem; + word-break: break-word; +} + +.modal .label { + font-size: .6rem; + font-weight: normal; + padding: .1rem .3rem; + padding-bottom: 0; + cursor: default; + border-radius: 0; +} + +.modal .label.warning { + background-color: #f0ad4e !important; +} + +.modal .btn { + padding: .3rem .6rem; +} + +.modal .spinning { + margin-bottom: 2em; +} + +body.modal-overlay-active { + overflow: hidden; + height: 100vh; +} + +#modal_overlay .alert-message.warning { + background-color: #fff !important; + margin-bottom: 10px; +} + +body.modal-overlay-active #modal_overlay { + right: 0; + left: 0; + opacity: 1; +} +.spinning { + position: relative; + padding-left: 32px !important; +} + +.spinning::before { + position: absolute; + top: 0; + bottom: 0; + left: .2em; + width: 32px; + content: " "; + background: url(../resources/icons/loading.gif) no-repeat center; + background-size: 16px; +} + +/* luci */ .hidden { - display: none + display: none; } .left, .left::before { - text-align: left !important; + text-align: left !important; } .right, .right::before { - text-align: right !important; + text-align: right !important; } .center, .center::before { - text-align: center !important; + text-align: center !important; } .top { - align-self: flex-start !important; - vertical-align: top !important; + align-self: flex-start !important; + vertical-align: top !important; } .bottom { - align-self: flex-end !important; - vertical-align: bottom !important; + align-self: flex-end !important; + vertical-align: bottom !important; } .inline { - display: inline; + display: inline; } .cbi-page-actions { - border-top: 1px solid #eee; - padding-top: 1rem; - text-align: right; + padding-top: 1rem; + text-align: right; } -/* select */ +.cbi-page-actions > form[method="post"] { + display: inline-block; +} -.cbi-value-field .cbi-dropdown { - min-width: 15rem; +/* input */ +.cbi-value input[type="password"], +.cbi-value input[type="text"] { + min-width: 15rem; } +/* select */ +.cbi-value-field .cbi-dropdown, .cbi-value-field .cbi-input-select { - width: 15rem; + min-width: 15rem; +} + +.cbi-value-field .cbi-input-invalid { + color: #f00; + border-bottom-color: #f00; +} + +/* progressbar */ +.cbi-progressbar { + position: relative; + min-width: 170px; + height: 20px; + margin: 4px 0; + background: #a9cad4; + color: #fff; + border-radius: 20px; + overflow: hidden; +} + +.cbi-progressbar > div { + width: 0; + height: 100%; + background: #468ea4; + border-radius: 20px; +} + +.cbi-progressbar::after { + font-family: monospace; + font-size: 10px; + font-size-adjust: .38; + line-height: normal; + position: absolute; + top: 50%; + right: 0; + bottom: 2px; + left: 0; + content: attr(title); + text-align: center; + white-space: pre; + transform: translateY(-50%); } .th[data-type="button"], .td[data-type="button"], .th[data-type="fvalue"], .td[data-type="fvalue"] { - flex: 1 1 2em; - text-align: center; + flex: 1 1 2em; + text-align: center; } .ifacebadge { - display: inline-flex; - border: 1px solid #CCCCCC; - padding: 0.5rem 1rem; - background: #fff; - border-radius: 20px; + display: inline-flex; + padding: .5rem .8rem; + background: #eee; + border-radius: 20px; } -td>.ifacebadge, -.td>.ifacebadge { - background-color: #F0F0F0; - font-size: 0.9rem; +td > .ifacebadge, +.td > .ifacebadge { + font-size: .8rem; + background-color: #d4d4d4; + border-radius: 20px; } -.ifacebadge>em, -.ifacebadge>img { - display: inline-block; - margin: 0 .2rem; - align-self: flex-start; +.ifacebadge > em, +.ifacebadge > img { + display: inline-block; + align-self: flex-start; + margin: 0 .2rem; } -.ifacebadge>img+img { - margin: 0 .2rem 0 0; +.ifacebadge > img + img { + margin: 0 .2rem 0 0; } .network-status-table { - display: flex; - flex-wrap: wrap; + display: flex; + flex-wrap: wrap; } .network-status-table .ifacebox { - margin: .5em .8rem; - flex-grow: 1; + flex-grow: 1; + margin: .5em; + border-radius: 20px; + overflow: hidden; } .network-status-table .ifacebox-body { - display: flex; - flex-direction: column; - height: 100%; + display: flex; + flex-direction: column; + height: 100%; + background: #f5f5f5; } -.network-status-table .ifacebox-body>span { - flex: 10 10 auto; +.network-status-table .ifacebox-body > span { + flex: 10 10 auto; + font-size: 12px; } -.network-status-table .ifacebox-body>div { - display: flex; - flex-wrap: wrap; +.network-status-table .ifacebox-body > div { + display: flex; + flex-wrap: wrap; } .network-status-table .ifacebox-body .ifacebadge { - flex: 1 1 auto; - margin: .5em .25em 0 .25em; - padding: .5em; - min-width: 220px; - background-color: #fff; - align-items: center; + align-items: center; + flex: 1 1 auto; + min-width: 220px; + margin: .5em .25em 0 .25em; + padding: .5em; + background-color: #fff; + border-radius: 20px; } -/*textarea*/ - +/* textarea */ .cbi-input-textarea { - width: 100%; - min-height: 14rem; - padding: 0.8rem; - font-size: 0.8rem; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - color: black; - resize: unset; - border-radius: 20px; + font-family: monospace; + width: 100%; + min-height: 14rem; + padding: .8rem; + color: #000; } #syslog { - width: 100%; - min-height: 15rem; - padding: 1rem; - font-size: small; - color: #5F5F5F; - margin-bottom: 20px; - border-radius: 20px; - background-color: #FFF; - border: none; - resize: unset; + font-size: small; + width: 100%; + min-height: 15rem; + margin-bottom: 20px; + padding: 1rem; + resize: none; + color: #333; + border: 0; + border-radius: 20px; + background-color: #fff; } -/* change */ +#syslog:focus { + outline: 0; +} +/* config changes */ .uci-change-list { - font-family: monospace; + font-family: monospace; } .uci-change-list ins, .uci-change-legend-label ins { - text-decoration: none; - border: 1px solid #00FF00; - background-color: #CCFFCC; - display: block; - padding: 2px; + display: block; + padding: 2px; + text-decoration: none; + border: thin solid #0f0; + background-color: #cfc; } .uci-change-list del, .uci-change-legend-label del { - text-decoration: none; - border: 1px solid #FF0000; - background-color: #FFCCCC; - display: block; - font-style: normal; - padding: 2px; + font-style: normal; + display: block; + padding: 2px; + text-decoration: none; + border: thin solid #f00; + background-color: #fcc; } .uci-change-list var, .uci-change-legend-label var { - text-decoration: none; - border: 1px solid #CCCCCC; - background-color: #EEEEEE; - display: block; - font-style: normal; - padding: 2px; + font-style: normal; + display: block; + padding: 2px; + text-decoration: none; + border: thin solid #ccc; + background-color: #eee; } .uci-change-list var ins, .uci-change-list var del { - border: none; - white-space: pre; - font-style: normal; - padding: 0px; + font-style: normal; + padding: 0; + white-space: pre; + border: 0; } .uci-change-legend { - padding: 5px; + padding: 5px; } .uci-change-legend-label { - width: 150px; - float: left; + float: left; + width: 150px; } -.uci-change-legend-label>ins, -.uci-change-legend-label>del, -.uci-change-legend-label>var { - float: left; - margin-right: 4px; - width: 10px; - height: 10px; - display: block; +.uci-change-legend-label > ins, +.uci-change-legend-label > del, +.uci-change-legend-label > var { + display: block; + float: left; + width: 10px; + height: 10px; + margin-right: 4px; } .uci-change-legend-label var ins, .uci-change-legend-label var del { - line-height: 6px; - border: none; + line-height: .4; + border: 0; } .uci-change-list var, .uci-change-list del, .uci-change-list ins { - padding: 0.5rem; + padding: .5rem; } /* other fix */ - #iwsvg, #iwsvg2, #bwsvg { - border: 1px solid #D4D4D4 !important; - overflow: hidden; - border-radius: 20px; + border: 1px solid #d4d4d4 !important; + border-radius: 20px; +} + +.lang_enTraffic #bwsvg, +.lang_enWireless #iwsvg { + border: 1px solid #d4d4d4 !important; + border-radius: 0 0 20px 20px; } #iwsvg, -#bwsvg { - margin-top: 1rem; +[data-page="admin-status-realtime-bandwidth"] #bwsvg { + border-top: 0 !important; } .ifacebox { - background-color: #f9f9f9; - display: inline-flex; - flex-direction: column; - line-height: 1.2em; - min-width: 100px; - border-radius: 20px; - overflow: hidden; + line-height: 1.25; + display: inline-flex; + flex-direction: column; + min-width: 100px; + background-color: #f9f9f9; + border-radius: 10px; } .ifacebox-head { - padding: .5em .8em; - background: #eee; + padding: .5em; + background: #eee; + color: #333; + font-size: 14px; + border-radius: 10px 10px 0 0; +} + +strong { + font-weight: 100; } .ifacebox-head.active { - background: #eee; + background: #5bc0de; } .ifacebox-body { - padding: .5em .8em; + padding: .8em; + border-radius: 0 0 10px 10px; } .cbi-image-button { - margin-left: 0.5rem; + margin-left: .5rem; } .zonebadge { - padding: 0.2rem 0.5rem; - display: inline-block; - border-radius: 20px; + display: inline-block; + padding: .2rem .5rem; + border-radius: 20px; } .zonebadge .ifacebadge { - padding: .2rem .3rem; - margin: 0.1rem 0.2rem; - border: none; + margin: .1rem .2rem; + padding: .2rem .3rem; + border: thin solid #6c6c6c; + height: 26px; } -.zonebadge>input[type="text"] { - padding: 0.16rem 1rem; - min-width: 10rem; - margin-top: 0.3rem; +.zonebadge > input[type="text"] { + min-width: 10rem; + margin-top: .3rem; + padding: .16rem 1rem; } -.zonebadge>em, -.zonebadge>strong { - margin: 0 0.2rem; - display: inline-block; +.zonebadge > em, +.zonebadge > strong { + display: inline-block; + margin: 0 .2rem; } .cbi-value-field .cbi-input-checkbox, .cbi-value-field .cbi-input-radio { - margin-top: 0.5rem; - height: 1rem; + margin-top: .15rem; } -.td .cbi-input-checkbox, -.td .cbi-input-radio { - margin-top: 0; +.cbi-value-field > ul > li { + display: flex; } -.cbi-value-field>input+.cbi-value-description { - padding: 0; +.cbi-value-field > ul > li > label { + margin-top: .5rem; } -.cbi-value-field>ul>li { - display: flex; +.cbi-value-field > ul > li .ifacebadge { + margin-top: -.5rem; + margin-left: .4rem; + background-color: #eee; } -.cbi-value-field>ul>li>label { - margin-top: 0.5rem; -} - -.cbi-value-field>ul>li .ifacebadge { - background-color: #eee; - margin-left: 0.4rem; - margin-top: -0.5rem; -} - -.cbi-section-table-row>.cbi-value-field .cbi-dropdown { - min-width: 7rem; +.cbi-section-table-row > .cbi-value-field .cbi-dropdown { + min-width: 7rem; } .cbi-section-create { - margin: .5rem -3px; - display: inline-flex; - align-items: center; + display: inline-flex; + align-items: center; + margin: .5rem -3px; } -.cbi-section-create>* { - margin: 0.5rem; +.cbi-section-create > * { + margin: .5rem; } .cbi-section-remove { - padding: 0.5rem; + padding: .5rem; } div.cbi-value var, td.cbi-value-field var, .td.cbi-value-field var { - font-style: italic; - color: #0069D6; + font-style: italic; + color: #0069d6; } small { - font-size: 90%; - white-space: normal; - line-height: 1.42857143; + font-size: 90%; + line-height: 1.42857143; + white-space: normal; } .cbi-button-up, .cbi-button-down { - display: inline-block; - min-width: 0; - padding: 0.2rem 0.3rem; - font-size: 1.2rem; + font-size: 1.2rem; + display: inline-block; + min-width: 0; + padding: .2rem .3rem; } .cbi-optionals { - padding: 1rem 1rem 0 1rem; - border-top: 1px solid #CCC; + padding: 1rem 1rem 0 1rem; + border-top: thin solid #ccc; } .cbi-dropdown-container { - position: relative; + position: relative; } -.cbi-tooltip-container { - cursor: help; +.cbi-tooltip-container, +span[data-tooltip], +span[data-tooltip] .label { + cursor: help !important; } .cbi-tooltip { - position: absolute; - z-index: 1000; - left: -1000px; - opacity: 0; - transition: opacity .25s ease-out; - pointer-events: none; + position: absolute; + z-index: 1000; + left: -1000px; + padding: 2px 5px; + transition: opacity .25s ease-out; + white-space: pre; + pointer-events: none; + opacity: 0; + border-radius: 3px; + background: #fff; } .cbi-tooltip-container:hover .cbi-tooltip { - left: auto; - opacity: 1; - transition: opacity .25s ease-in; - border-radius: 20px; + left: auto; + transition: opacity .25s ease-in; + opacity: 1; + height: 38px; } .zonebadge .cbi-tooltip { - padding: .25rem; - background: inherit; - margin: -1.5rem 0 0 -.5rem; + margin: -1.5rem 0 0 -.5rem; + padding: .25rem; + background: inherit; } .zonebadge-empty { - background: repeating-linear-gradient(45deg, rgba(204, 204, 204, 0.5), rgba(204, 204, 204, 0.5) 5px, rgba(255, 255, 255, 0.5) 5px, rgba(255, 255, 255, 0.5) 10px); - color: #404040; + color: #404040; + background: repeating-linear-gradient( + 45deg, + rgba(204, 204, 204, .5), + rgba(204, 204, 204, .5) 5px, + rgba(255, 255, 255, .5) 5px, + rgba(255, 255, 255, .5) 10px + ); } .zone-forwards { - display: flex; - min-width: 10rem; + display: flex; + min-width: 10rem; } -.zone-forwards>* { - flex: 1 1 45%; +.zone-forwards > * { + flex: 1 1 45%; } -.zone-forwards>span { - flex-basis: 10%; - text-align: center; - padding: 0 .25rem; +.zone-forwards > span { + flex-basis: 10%; + padding: 0 .25rem; + text-align: center; } .zone-forwards .zone-src, .zone-forwards .zone-dest { - display: flex; - flex-direction: column; + display: flex; + flex-direction: column; } -#diag-rc-output>pre { - background-color: #f5f5f5; - display: block; - padding: 8.5px; - margin: 0 0 18px; - line-height: 1.5rem; - -moz-border-radius: 3px; - white-space: pre-wrap; - word-wrap: break-word; - font-size: 1.4rem; - color: #404040; +.label { + font-size: .8rem; + padding: .3rem .8rem; + white-space: nowrap; + text-decoration: none; + color: #fff !important; + -moz-border-radius: 3px; + border-radius: 20px; + background-color: #bfbfbf; } -input[name="ping"], -input[name="traceroute"], -input[name="nslookup"] { - width: 80%; +label > input[type="checkbox"], +label > input[type="radio"] { + position: relative; + top: .4rem; + right: .2rem; + margin: 0; + vertical-align: bottom; } -header>.container>.pull-right>* { - position: relative; - top: 0.45rem; - cursor: pointer; +.showSide { + display: none; } -#xhr_poll_status>.label.success { - background-color: #F24C7C; +.darkMask { + position: fixed; + z-index: 99; + display: none; + width: 100%; + height: 100%; + content: ""; + background-color: rgba(0, 0, 0, .56); } -.label { - padding: 0.3rem 0.8rem; - font-size: 0.8rem; - font-weight: bold; - color: #ffffff !important; - white-space: nowrap; - background-color: #bfbfbf; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 50px; - text-shadow: none; - text-decoration: none; +/* diagnostics */ +#diag-rc-output > pre, +#command-rc-output > pre { + font-size: 1.2rem; + font-size-adjust: .35; + line-height: normal; + display: block; + width: 100%; + padding: 8.5px; + white-space: pre; + color: #eee; + background-color: #101010; } -.notice { - background-color: #468EA4; +[data-page="admin-network-diagnostics"] .table { + box-shadow: none; } -.showSide { - background: url(./menu-logo.png) no-repeat center center / 100%; - display: none; - height: 26px; - width: 26px; +input[name="ping"], +input[name="traceroute"], +input[name="nslookup"] { + width: 80%; } -.darkMask { - width: 100%; - height: 100%; - position: fixed; - background-color: rgba(0, 0, 0, 0.56); - content: ""; - z-index: 99; - display: none; +/* fix Main Login 登录界面*/ +.login .main-right { + background: url(./loginBG.png) no-repeat center center / cover; + text-align: center; } -/* fix status processes */ +.login header { + margin-top: 10px; +} -.node-status-processes>.main .table .tr .td:nth-child(3) { - white-space: normal; +.login > .main { + position: relative; + height: 100%; } -.node-status-iptables>.main div>.cbi-map>form { - margin: 2rem 2rem 0 0; +.login > .main .main-left { + display: none; } -.node-status-iptables>.main div>.cbi-map>form input { - padding: .8em; - border-radius: 20px; +.login .brand { + display: block; + color: #fff; + font-size: 24px; + text-decoration: none; } -.node-status-processes .cbi-section { - overflow-x: scroll; +.login > .main .cbi-value-title { + display: none; } -.node-status-iptables #iptables .table-titles, -.node-system-opkg #packages .cbi-section-table-titles { - background-color: #eee; + +.login > .main #maincontent { + margin-top: 5rem; + padding-bottom: 20px; + display: inline-block; + background-color: transparent; + width: 39%; + color: #fff; + max-width: 493px; } -/* fix status realtime traffic and wireless */ +.login > .main .container { + display: block; + margin-top: 2rem !important; +} -.node-status-realtime.lang_enTraffic .cbi-tabmenu, -.node-status-realtime.lang_enWireless .cbi-tabmenu { - background-color: #d4d4d4; +.login .alert, +.login .main-right .container .alert-message { + margin-bottom: 1em; + padding: 1rem; + background-color: #4a5368 !important; + border: 1px solid #3e4a62; + border-radius: 20px; } -.node-status-realtime.lang_enTraffic .cbi-tabmenu>li[class~="cbi-tab"], -.node-status-realtime.lang_enTraffic .cbi-tabmenu>li:hover, -.node-status-realtime.lang_enWireless .cbi-tabmenu>li[class~="cbi-tab"], -.node-status-realtime.lang_enWireless .cbi-tabmenu>li:hover { - background-color: #F1F1F1; +.login .alert-message > h4 { + padding: 7px 0 0 32px; + font-size: 18px; + background: url(./no-pwd.png) no-repeat left 0 / 28px; + display: inline-block; } -.node-status-realtime.lang_enTraffic #bwsvg, -.node-status-realtime.lang_enWireless #iwsvg, -.node-system-packages .cbi-map>.cbi-section, -.node-system-packages form .cbi-section { - border-top-right-radius: 0; - border-top-left-radius: 0; +.login .alert-message > p { + line-height: 25px; + font-size: 14px; } -/* fix system system */ +.login .alert-message > * { + margin: .5rem 0; +} -.node-system-system .cbi-tabmenu { - background-color: #d4d4d4; +.login .main-right .container .alert-message .btn { + border: 1px solid #fff; + background-color: transparent; + color: #fff; + border-radius: 20px; + padding: .6rem; + height: auto; } -.node-system-system .cbi-tabmenu>li[class~="cbi-tab"] { - background-color: #fff; +.login > .main form h2 { + font-size: 1.8rem; + margin: 17px 0; + padding-bottom: 0; + color: #fff; } -/* fix system reboot */ +.login > .main form .cbi-map-descr { + margin-bottom: 17px; + display: block; +} -.node-system-reboot>.main>.main-right p, -.node-system-reboot>.main>.main-right h3 { - padding-left: 2rem; +.login > .main form > .cbi-page-actions { + padding: 0; + display: block; } -/* fix Services Network Shares*/ -.node-services-samba.lang_enNetwork #cbi-samba-sambashare .table-container { - overflow-x: scroll; +.login > .main form > .cbi-page-actions .cbi-button { + margin: 0; + width: 50% !important; + height: 42px; + float: left; } -.node-services-samba>.main .cbi-tabcontainer:nth-child(3) .cbi-value-title { - margin-bottom: 1rem; - width: auto; + +.login > .main form > .cbi-page-actions .cbi-button-apply { + border-radius: 25px 0 0 25px; } -.node-services-samba>.main .cbi-tabcontainer:nth-child(3) .cbi-value-field { - display: list-item; +.login > .main form > .cbi-page-actions .cbi-button-reset { + border-radius: 0 25px 25px 0; } -.node-services-samba>.main .cbi-tabcontainer:nth-child(3) .cbi-value-description { - padding-top: 1rem; +.login > .main .cbi-value { + margin: 17px 0; + padding: 0; + display: block; } -/* fix System Software*/ +.login > .main .cbi-value > .cbi-value-field { + display: block; + position: relative; +} -.node-system-packages #swfreespace { - background-color: #468ea4 !important; - border: none !important; - border-radius: 20px +.login > .main .cbi-value-last .cbi-value-field > div { + height: 24px; + width: 24px; + display: inline-block; + background: url(./op-eye.png) no-repeat center center / cover; + position: absolute; + top: 8px; + right: 12px; } -.node-system-packages #swfreespace>div { - background-color: #f24c7c !important; - border: none !important; - border-radius: 20px +.login > .main .cbi-value-last .cbi-value-field.op-eye > div { + background-image: url(./cl-eye.png); } -.node-system-packages>.main table tr td:nth-child(1) { - width: auto !important; +.login > .main .cbi-value .cbi-input-text { + margin: 0 0 16px; + padding-left: 36px; + width: 100%; + height: 42px; + border: 1px solid #556270; + border-radius: 20px; + background: #fff no-repeat 11px center / 19px; } -.node-system-packages>.main table tr td:nth-last-child(1) { - white-space: normal; - font-size: small; - color: #404040; +.login > .main .cbi-value .cbi-input-text { + background-image: url(./user.png); } -.node-system-packages>.main .cbi-tabmenu>li>a, -.tabs>li>a { - padding: 0.5rem 0.8rem; +.login > .main .cbi-value-last .cbi-input-text { + background-image: url(./pwd.png); } -.node-system-packages>.main .cbi-value>pre { - background-color: #eee; - padding: 0.5rem; - overflow: auto; +.login .cbi-section { + padding: 0; + box-shadow: none; + background-color: transparent; } -.node-system-packages .cbi-section .cbi-section-node-tabbed { - border: none; +.login .cbi-page-actions .cbi-button-apply, +.login .cbi-button-apply { + border: 1px solid #f24b7c; + background-color: #f24b7c; } -.node-system-packages form .cbi-section { - margin: 0; +.login .cbi-button[value="Reset"] { + color: #fff; + border: 1px solid #9a4569; + background-color: #9a4569; } -.cbi-tabmenu+.cbi-section { - margin-top: 0; +.login footer { + padding: 0; } -.node-status-iptables .cbi-tabmenu, -.node-system-flashops .cbi-tabmenu { - border: none; +@media screen and (min-height: 585px) { + .login footer { + position: absolute; + bottom: 0; + width: 100%; + } } -.node-system-flashops form.inline+form.inline { - margin-left: 0; +/* logged 已登录界面 */ +/* header 头部 */ +.logged-in { + min-height: 100%; + background-color: #ebf1f6; } -.lang_zh-cnBackup .cbi-tabmenu { - margin-bottom: 1rem; +.logged-in header { + display: block; + position: fixed; + top: 1rem; + right: 1rem; + border: 1px solid #ddd; + background-color: #fff; + border-radius: 20px; + width: calc(85% - 20px - 2rem); } -#cbi-firewall-redirect table *, -#cbi-network-switch_vlan table *, -#cbi-firewall-zone table * { - font-size: small; +.logged-in .main { + overflow: hidden; } -#cbi-firewall-redirect table input[type="text"], -#cbi-network-switch_vlan table input[type="text"], -#cbi-firewall-zone table input[type="text"] { - width: 5rem; +.logged-in header .container { + height: 100%; } -#cbi-firewall-redirect table select, -#cbi-network-switch_vlan table select, -#cbi-firewall-zone table select { - min-width: 3.5rem; +.logged-in header .container .btn-con { + height: 3rem; + line-height: 3rem; } -#cbi-network-switch_vlan .th, -#cbi-network-switch_vlan .td { - flex-basis: 12%; +.logged-in header .container .btn-con #xhr_poll_status { + display: inline-block; } -/* fix Network Network*/ +.logged-in header .container .btn-con .logout { + background-color: #354057; +} -.node-network-network .cbi-rowstyle-2 .ifacebox-body { - background-color: #fff; +.logged-in header .container .btn-con .logout a { + color: #fff; + text-decoration: none; } -.lang_zh-cnInterfaces .container .cbi-map .cbi-tabmenu+div { - overflow: inherit; +.logged-in .logoImg, +.login-info .logoImg { + display: none; } -/* fix Network Wireless*/ +.logged-in .main-right { + float: right; + width: 84%; + height: 100%; +} -.node-network-wireless .cbi-section-node { - margin-bottom: 1rem; +.logged-in .main-right .container { + margin: 5rem 1rem 1rem; } -/* applyreboot fix */ +/* rosy file server */ +.login-info.node-main-login{ + background-color: #ebf1f6; +} -#maincontainer { - text-align: center; +.login-info.node-main-login header .container, +.login-info.node-main-login .main { + width: 1170px; } -#maincontainer>#maincontent { - padding: 1rem; - margin: 0 auto; - border-radius: 10px; - display: inline-block; - max-width: 800px; - width: 40%; +.login-info.node-main-login .main { + padding: 0 15px; } -#applyreboot-container { - margin-bottom: 1rem; +.login-info.node-main-login header { + display: block; } -#applyreboot-section { - text-align: left; - background: #fff; - padding: 1rem; - border-radius: 10px; +.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; } -#applyreboot-section>div { - margin: 1rem 0; - line-height: 1.5rem; +.login-info.node-main-login .label.logout { + background-color: #f24b7c; } -#applyreboot-container { - margin: 90px 2rem 2rem 2rem; +.login-info.node-main-login .label.logout a { + color: #fff; + text-decoration: none; } -#applyreboot-section { - margin: 2rem; - line-height: 300%; +/* node main login */ +.login-info .main { + margin: 0 auto; + width: 80%; + max-width: 1170px; } -/* Shared style */ +.login-info .main-left { + display: none; +} -header { - height: 0; - position: fixed; - top: 0; - left: 0; - right: 0; - z-index: 100; - overflow: hidden; +.login-info .main-right { + width: 100%; } -header { - padding-right: 1rem; - background: #fff; - color: white; - border-bottom: 1px solid #dadada; +/* fix status overview */ +.node-status-overview > .main fieldset:nth-child(4) .td:nth-child(2) { + white-space: normal; } -header .fill, -header .container { - height: 100%; +/* fix status processes */ +.node-status-processes > .main .table .tr .td:nth-child(3) { + white-space: normal; } -header .brand { - padding-left: .8rem; - color: #354057; - font-size: 24px; - text-decoration: none; - display: inline-block; - height: 100%; - line-height: 70px; - width: 10%; - text-align: center; +.node-admin-status form { + margin: 2rem 2rem 0 0; } -header .btn-con { - line-height: 70px; +/* fix system reboot */ +[data-page="admin-system-reboot"] p { + padding-left: 2rem; } -header .logout { - background-color: #354057; +/* fix network diagnostics */ +.lang_enDiagnostics .tr .td, +.lang_enLoad .tr .td, +.lang_enTraffic.node-admin-status .tr .td, +.lang_enWireless .tr .td, +.lang_enConnections .tr .td { + border: none; } -header .logout a { - text-decoration: none; - color: #fff; +[data-page="admin-system-reboot"] p > span { + position: relative; + top: .1rem; + left: 1rem; } -.main { - height: auto; - min-height: 100%; +.lang_enInterfaces .ifacebox-body { + border-width: 1px; + border-style: solid; } -.main-right { - height: auto; +/* samba */ +#cbi-samba .cbi-value-last .cbi-value-field { + display: block; } -.main-left { - top: 10px; - bottom: 10px; - left: 10px; - width: 15%; - background-color: #636569; - position: fixed; - z-index: 1000; - border-radius: 20px; - min-width: 170px; +#cbi-samba .cbi-value-last .cbi-value-title { + width: auto; + padding-bottom: .6rem; +} + +/* software */ +.controls > * > .btn:not([aria-label$="page"]) { + flex-grow: initial !important; + margin-top: .1rem; } -.main>.main-left .navbar-container { - margin-top: 0.5rem; - float: right; - width: calc(100% + 10px); - height: calc(100% - 110px); - overflow-y: scroll; - overflow-x: hidden; +.controls > #pager > .btn[aria-label$="page"] { + font-size: 1.4rem; } -.main>.main-left .nav { - height: auto; +.controls > * > label { + margin-bottom: .2rem; } -.main>.main-left .nav>li a { - color: #fff; - display: block; +[data-page="admin-system-opkg"] div.btn { + line-height: 3; + display: inline; + padding: .3rem .6rem; } -.main>.main-left .nav>li { - padding: 0.5rem 1.7rem; - cursor: pointer; +[data-page^="admin-system-admin"]:not(.login) .cbi-map:not(#cbi-dropbear), +[data-page="admin-system-opkg"] #maincontent > .container { + margin-top: 2rem; + padding-top: .1rem; } -.main>.main-left .nav>.slide { - padding: 0 15px 0 0; - margin-bottom: 8px; - overflow: hidden; +[data-page="admin-system-opkg"] #maincontent > .container { + margin: 2rem; + margin-bottom: 1rem; } -.main>.main-left .nav>.slide>ul { - display: none; - float: right; - width: calc(100% - 10px); +.td.version, +.td.size { + white-space: normal !important; + word-break: break-word; } -.main>.main-left .nav>.slide>.menu { - display: block; - padding: 0.5rem 1.7rem; - text-decoration: none; - cursor: default; - font-size: 1.15rem; - width: 100%; - float: right; +.cbi-tabmenu + .cbi-section { + margin-top: 0; + border: 1px solid #d4d4d4; + border-top: none; } -.main>.main-left .nav>li>a.active, -.main>.main-left .nav>.slide>.menu:hover, -.main>.main-left .nav>.slide>.menu.active { - background: #485267; - float: right; - border-top-right-radius: 50px; - border-bottom-right-radius: 50px; +/* wireless overview */ +#cbi-wireless > #wifi_assoclist_table > .tr { } -.main>.main-left .nav>.slide:hover { - background: none; +#cbi-wireless > #wifi_assoclist_table > .tr.placeholder > .td { + right: 33px; + bottom: 33px; + left: 33px; + border-top: thin solid #ddd !important; } -.main>.main-left .nav>.slide>.slide-menu>li { - padding: 0.6rem 2rem; - margin: 8px 0; +#cbi-wireless > #wifi_assoclist_table > .tr.table-titles { + border-radius: 20px 20px 0 0; } -.main>.main-left .nav>.slide>.slide-menu>.active { - background-color: #F24C7C; - border-top-right-radius: 50px; - border-bottom-right-radius: 50px; +#cbi-wireless > #wifi_assoclist_table > .tr.placeholder, +#cbi-wireless > #wifi_assoclist_table > .tr.placeholder .td { + border-radius: 0 0 20px 20px; + overflow: hidden; } -.main>.main-left .nav>.slide>.slide-menu>li>a { - text-decoration: none; - white-space: nowrap; +#cbi-wireless > #wifi_assoclist_table > .tr.table-titles .th:first-child { + border-top-left-radius: 20px; } -.main>.main-left .nav>.slide>.slide-menu>.active>a { - color: white; +#cbi-wireless > #wifi_assoclist_table > .tr.table-titles .th:last-child { + border-top-right-radius: 20px; } -.main>.main-left .nav>.slide>.slide-menu>li:hover { - background: #F24C7C; - border-top-right-radius: 50px; - border-bottom-right-radius: 50px; +#cbi-wireless > #wifi_assoclist_table > .tr.table-titles > .th { + border-bottom: thin solid #ddd; } -.main>.main-left .nav>.slide>.slide-menu>.active:hover { - background-color: #F24C7C; - cursor: hand; +#wifi_assoclist_table > .tr > .td[data-title="RX Rate / TX Rate"] { + width: 23rem; } -/* The scroll bar of the navigation bar is compatible with each browser. */ +/* firewall */ +#iptables { + font-family: inherit; + font-weight: normal; + font-style: normal; + line-height: 1; + min-width: inherit; + margin: 0 0 2rem 0; + padding: 2rem; + border: 1px solid #d4d4d4; + border-radius: 0; + background-color: #fff; + border-top: none; +} -/* Google */ +#cbi-firewall-redirect table *, +#cbi-network-switch_vlan table *, +#cbi-firewall-zone table * { + font-size: small; +} -.main>.main-left .navbar-container::-webkit-scrollbar { - width: 6px; - background: transparent; +#cbi-firewall-redirect table input[type="text"], +#cbi-network-switch_vlan table input[type="text"], +#cbi-firewall-zone table input[type="text"] { + width: 5rem; } -.main>.main-left .navbar-container::-webkit-scrollbar-button { - display: none; +#cbi-firewall-redirect table select, +#cbi-network-switch_vlan table select, +#cbi-firewall-zone table select { + min-width: 3.5rem; } -.main>.main-left .navbar-container::-webkit-scrollbar-thumb { - background-color: #ffffff61; - border-radius: 10px; +#cbi-network-switch_vlan .th, +#cbi-network-switch_vlan .td { + flex-basis: 12%; } -.main>.main-left .navbar-container::-webkit-scrollbar-thumb { - background-color: #839dd67a; - border-radius: 10px; +#cbi-firewall-zone .table { + display: table; } -.main>.main-left .navbar-container:hover::-webkit-scrollbar-thumb { - background-color: #839dd67a; +#cbi-network-switch_vlan #vlan_table { + overflow-x: auto; } -/* IE */ +#cbi-firewall-zone .td.cbi-section-actions { + width: 100%; +} -.main>.main-left .navbar-container { - scrollbar-track-color: transparent; - scrollbar-face-color: #839dd67a; - scrollbar-arrow-color: transparent; - scrollbar-3dlight-color: transparent; - scrollbar-highlight-color: transparent; - scrollbar-shadow-color: transparent; - scrollbar-darkshadow-color: transparent; - scrollbar-base-color: transparent; +/* applyreboot fix */ +#applyreboot-container { + margin: 2rem; } -.main>.main-left .navbar-container:hover { - scrollbar-face-color: #839dd67a; +#applyreboot-section { + line-height: 300%; + margin: 2rem; } -footer { - text-align: right; - padding-right: 1rem; - color: #aaa; - font-size: 0.8rem; - text-shadow: 0px 0px 2px #BBB; - position: absolute; - bottom: 0; - right: 0; +/* openvpn bug fix */ +.OpenVPN a { + line-height: initial !important; } -/* The style of the prompt message */ +/* custom commands */ +.commandbox { + width: 24% !important; + padding: .5rem 1rem; + border-bottom: thin solid #ccc; + background: #eee; +} -.alert-message { - padding: 13px 11%; - border-radius: 10px; - background-color: #FFF; +.commandbox h3 { + line-height: normal !important; + overflow: hidden; + margin: 6px 0 !important; + white-space: nowrap; + text-overflow: ellipsis; } -.danger { - background-color: #FA8072; - color: black; +.commandbox div { + left: auto !important; } -.success { - background-color: #90EE90; - color: black; +.commandbox code { + position: absolute; + overflow-x: hidden; + overflow-y: auto; + max-width: 60%; + max-height: 55px; + margin-top: -3px; + margin-left: 4px; + padding: 2px 3px; + text-overflow: ellipsis; } -.error { - color: red; -} - -.alert-message>h4 { - padding: 7px 0 7px 36px; - margin: 0; - font-weight: normal; - font-size: 18px; - background: url(./no-pwd.png) no-repeat left 43%/ 28px; - display: inline-block; -} - -.alert-message>p { - font-size: 14px; - line-height: 1.5rem; -} - -.alert-message a { - padding: 4px 0; - margin-top: 12px; - width: 100%; - background-color: transparent; - color: #fff; - font-size: 16px; - border: 1px solid #fff; - border-radius: 50px; -} - -/* All styles of the login interface */ -.node-main-login { - height: auto; - min-height: 100%; - background: #fff url(./loginBG.png) no-repeat center center / cover; -} -.node-main-login header { - display: none; -} -.node-main-login .main { - height: auto; -} -.node-main-login>.main>.main-left { - display: none; -} -.node-main-login>.main>.main-right { - width: 100%; - height: auto; - min-height: 100%; -} -.node-main-login>.main #maincontent { - position: absolute; - min-width: 492px; - width: 100%; - top: 47%; - left: 50%; - transform: translateX(-50%) translateY(-50%); - height: auto; - text-align: center; -} -.node-main-login>.main .container { - padding: 0; - width: 30%; - max-width: 492px; - display: inline-block; -} -.node-main-login>.main .logoImg a { - margin: 0 0 18px 0; - display: block; - font-size: 30px; - color: #fff; - text-decoration: none; -} -.node-main-login>.main .logoImg img:first-child { - width: 72px; -} -.node-main-login .warning { - background-color: #3E4A62; - color: #fff; -} -.node-main-login>.main form h2 { - margin: 17px 0; - padding: 0; - font-size: 24px; - color: #fff; - font-weight: normal; - border: 0; -} -.node-main-login>.main form .cbi-map-descr { - margin: 0 0 12px; - padding: 0; - font-size: 12px; - color: #B1B6BB; -} -.node-main-login>.main form .cbi-section { - margin: 0; - padding: 0; - background-color: transparent; - box-shadow: none; -} -.node-main-login>.main form .cbi-value { - display: block; -} -.node-main-login>.main form .cbi-value-title { - margin: 0; - padding: 0; - display: none; -} -.node-main-login>.main form .cbi-value-field { - margin-bottom: 16px; - display: block; - width: 100%; - position: relative; -} -.node-main-login>.main form .cbi-value-field input { - padding-left: 48px; - width: 100%; - border: 1px solid #556270; - height: 42px; - border-radius: 50px; - font-size: 20px; - color: #9c9fa1; -} -.node-main-login form .cbi-value-field .iconpwd, -.node-main-login form .cbi-value-field .iconuser, -.node-main-login form .cbi-value-field .iconeye { - height: 24px; - width: 20px; - position: absolute; - top: 50%; - left: 16px; - transform: translateY(-50%); -} -.node-main-login form .cbi-value-field .iconpwd { - background: transparent url(./pwd.png) no-repeat center center / 100%; -} -.node-main-login form .cbi-value-field .iconuser { - background: transparent url(./user.png) no-repeat center center / 100%; -} -.node-main-login form .cbi-value-field .iconeye { - left: auto; - right: 16px; - background: transparent url(./op-eye.png) no-repeat center center / 100%; -} -.node-main-login form .cbi-value-field .cleye { - background-image: url(./cl-eye.png); -} -.node-main-login form .cbi-value-field .opeye { - background-image: url(./op-eye.png); -} -.node-main-login form .cbi-page-actions { - padding: 0; - border: 0; - text-align: center; -} -.node-main-login form .cbi-page-actions input { - margin: 0 0 0 -4px; - padding: 9px 0; - border: 0; - display: inline-block; - border-radius: 0; - width: 50%; - font-size: 18px; -} -.node-main-login form .cbi-page-actions .cbi-button-apply { - background-color: #F24C7C; - border-top-left-radius: 50px; - border-bottom-left-radius: 50px; -} -.node-main-login form .cbi-page-actions .cbi-button-reset { - background-color: #8a4568; - color: #fff; - border-top-right-radius: 50px; - border-bottom-right-radius: 50px; -} -.node-main-login input.cbi-input-text { - box-shadow: 0 0 0 1000px white inset; -} -/* Interface after login */ -.logged-in { - background-color: #EBF1F6; +.commandbox p:first-of-type { + margin-top: -6px; } -.logged-in header { - height: 70px; + +.commandbox p:nth-of-type(2) { + margin-top: 2px; } -.logged-in .main { - overflow: hidden; + +[data-page^="admin-system-commands"] .panel-title, +[data-page^="command-cfg"] .mobile-hide, +[data-page^="command-cfg"] header .container > #logo { + display: none; } -.logged-in .main-right { - padding: 0 1rem 3rem 0; - margin-top: 90px; - float: right; -} -.logged-in .main .logoImg { - display: none; -} -.logged-in .main .main-left .nav-container { - background-color: #354057; - border-radius: 20px; - position: absolute; - top: 10px; - left: 10px; - right: -10px; - bottom: 10px; -} -.logged-in .main .main-left .brand { - margin: 0 auto; - padding: 44px 0 23px; - width: 85%; - color: #fff; - display: block; - font-size: 18px; - text-align: center; - text-decoration: none; - border-bottom: 2px solid #ffffff42; - /* Single line text omitted */ - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - -webkit-text-overflow: ellipsis; - -o-text-overflow: ellipsis; -} -.logged-in .alert-message { - padding: 20px 2rem; - border: none; - background-color: #fff; -} -.logged-in .alert-message a { - padding: 8px 2rem; - width: auto; - border: none; - background-color: #468EA4; - color: #fff; + +.PC-hide { + display: none; } + @media screen and (max-width: 1600px) { - .main-left { - width: calc(0% + 13rem); - } - .btn, - .cbi-button { - padding: 0.3rem 0.6rem; - font-size: 0.8rem; - } - header>.container>.pull-right>* { - top: 0.35rem; - } - .label { - padding: 0.2rem 0.6rem; - } - .cbi-value-title { - width: 15rem; - padding-right: 0.6rem; - } - .cbi-input-textarea { - font-size: small; - } -} -@media screen and (max-width: 1280px) { - .node-main-login>.main .container { - width: 50%; - } - .cbi-tabmenu>li>a, - .tabs>li>a { - padding: 0.2rem 0.5rem; - } - .panel-title { - font-size: 1.1rem; - padding-bottom: 1rem; - } - table { - font-size: 0.7rem !important; - width: 100% !important; - } - .main>.main-left .nav>li, - .main>.main-left .nav>li a, - .main>.main-left .nav>.slide>.menu { - font-size: 0.9rem; - } - .main>.main-left .nav>.slide>.slide-menu>li>a { - font-size: 0.7rem; - } + header .container > #logo { + margin: 0 2.5rem 0 .5rem; + } + + .cbi-dynlist > .item { + max-width: 21.9rem; + } + + .btn:not(button), + .cbi-button { + font-size: .8rem; + padding: .3rem .6rem; + } + + .label { + padding: .2rem .6rem; + } + + .cbi-value-title { + width: 15rem; + padding-right: .6rem; + } + + fieldset, + .cbi-section { + padding: 1rem; + } + + .cbi-input-textarea { + font-size: small; + } + + .node-admin-status > .main fieldset li > a { + padding: .3rem .6rem; + } + + #cbi-firewall-zone > .table { + display: block; + } +} + +@media screen and (max-width: 1400px) { + .logged-in header { + width: calc(100% - 230px - 2rem); + } + .logged-in .main-right { + width: calc(100% - 230px); + } + + .cbi-dynlist > .item { + max-width: 19.9rem; + } + + .cbi-tabmenu > li > a, + .tabs > li > a { + padding: .2rem .5rem; + } + + .panel-title { + font-size: 1.1rem; + padding-bottom: 1rem; + } + + table { + font-size: .7rem !important; + width: 100% !important; + } + + .table .cbi-input-text { + width: 100%; + } + + .main .main-left > .nav > li, + .main .main-left > .nav > li a, + .main .main-left > .nav > .slide > .menu { + font-size: .9rem; + } + + .main .main-left > .nav > .slide > .slide-menu > li > a { + font-size: .7rem; + } + + [data-page="admin-network-firewall-forwards"] .table:not(.cbi-section-table) { + display: block; + } + + [data-page="admin-network-firewall-forwards"] .table:not(.cbi-section-table), + [data-page="admin-network-firewall-rules"] .table:not(.cbi-section-table), + [data-page="admin-network-hosts"] .table { + overflow-y: visible; + } + + .commandbox { + width: 32% !important; + } +} + +@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) { - .logged-in header { - padding: 0 .8rem; - height: 45px; - } - header .brand { - display: none; - } - header .btn-con { - line-height: 45px; - } - .main-left { - width: auto; - height: auto; - position: fixed; - z-index: 100; - right: 100%; - left: 0; - top: 0; - bottom: 0; - background: #0000007d; - border-radius: 0; - min-width: 0; - overflow: hidden; - } - .main>.main-left .nav>.slide>.slide-menu>li { - width: 90%; - } - header .container { - line-height: 43px; - } - .main-right { - width: 100%; - } - .node-main-login>.main .container { - width: 60%; - } - .showSide { - padding: 0.1rem; - display: inline-block; - vertical-align: middle; - } - .cbi-value-title { - width: 9rem; - padding-right: 1rem; - } - #diag-rc-output>pre { - font-size: 1rem; - } - .tr { - display: flex; - flex-direction: row; - flex-wrap: wrap; - } - .th, - .td { - flex: 2 2 25%; - align-self: flex-start; - text-overflow: ellipsis; - word-wrap: break-word; - display: inline-block; - } - .td select, - .td input[type="text"] { - word-wrap: normal; - width: 100%; - } - .td [data-dynlist]>input, - .td input.cbi-input-password { - width: calc(100% - 1.5rem); - } - .td[data-type="button"], - .td[data-type="fvalue"] { - flex: 1 1 12.5%; - text-align: left; - } - .th.cbi-value-field, - .td.cbi-value-field, - .th.cbi-section-table-cell, - .td.cbi-section-table-cell { - flex-basis: auto; - } - .cbi-section-table-row { - display: flex; - flex-wrap: wrap; - flex-direction: row; - justify-content: space-between; - } - .td.cbi-value-field, - .cbi-section-table-cell { - text-align: center; - display: inline-block; - flex: 10 10 auto; - } - .td.cbi-section-actions { - text-align: right; - align-self: flex-end; - vertical-align: bottom; - } - .tr.table-titles, - .tr.cbi-section-table-titles, - .tr.cbi-section-table-descr { - display: none; - } - .tr[data-title]::before, - .tr.cbi-section-table-titles.named::before { - display: block; - flex: 1 1 100%; - background: #eef; - font-size: .9rem; - border-bottom: 1px solid rgba(0, 0, 0, .26); - } - .td[data-title] { - text-align: left; - font-size: 12px; - } - .td[data-title]::before { - display: block; - } - .hide-sm, - .hide-xs { - display: none; - } - /* All styles of the login interface */ - .node-main-login .showSide { - display: none !important; - } - .logged-in .main { - padding-bottom: .8rem; - } - .logged-in .main .main-left .nav-container { - background-color: #354057; - border-radius: 0; - position: absolute; - top: 0; - left: 0; - right: 20%; - bottom: 0; - } - .logged-in .main-right { - padding: 0 .8rem; - margin-top: calc(45px + .8rem); - width: 100%; - max-width: unset; - float: unset; - } - .logged-in .alert-message { - padding: 8px .8rem; - } - .cbi-section { - margin: .8rem 0 0 0; - padding: .8rem; - } - small { - font-size: 10px; - line-height: 0; - } - .cbi-section>h3:first-child, - .panel-title { - font-size: 1rem; - } - .network-status-table .ifacebox-body>span { - font-size: 12px; - } - .cbi-section .ifacebox-body .ifacebadge>span { - font-size: 12px; - } - .table .tr.cbi-rowstyle-1:nth-child(n), - .table .tr:nth-child(n) { - font-size: 12px; - } - .node-network-firewall .table .tr.cbi-rowstyle-1:nth-child(n), - .node-network-firewall .table .tr:nth-child(n) { - border-radius: 20px; - overflow: hidden; - } - h2 { - margin: 1rem 0 0 0; - font-size: 1.4rem; - padding-bottom: 0; - border-bottom: none; - } - h4 { - font-size: 1rem; - } - .cbi-section-node-tabbed { - padding: 0 .5rem; - } - .cbi-button, - .cbi-button-action.important { - margin-right: .3rem; - } - select { - border-bottom: 1px solid rgba(0, 0, 0, .26); - } - .node-status-processes .table .tr.cbi-rowstyle-1:nth-child(n), - .node-status-processes .table .tr:nth-child(n) { - border-radius: 20px; - } + .login .main-right { + background: #354057; + } + + .login > .main #maincontent { + width: 90%; + } + + .logged-in header { + width: calc(100% - 2rem); + } + + .showSide, + .logged-in header .container .btn-con { + height: 3rem; + line-height: 3rem; + } + + .logged-in .main-left { + display: none; + z-index: 1000; + position: fixed; + top: 0; + bottom: 0; + left: 0; + right: 0; + border-radius: 0; + background-color: rgba(0, 0, 0, .3); + } + + .logged-in .main-left .nav-container { + top: 0; + left: 0; + width: 50%; + border-radius: 0; + bottom: 0; + height: 100%; + } + + .logged-in .main-left .nav-container .navbar-container { + overflow-y: scroll; + } + + .logged-in .main-right { + width: 100%; + } + + [data-page^="command-cfg"] header .container > .brand { + display: block; + margin-top: -1.75rem; + } + + .cbi-dynlist > .item { + max-width: 14.9rem; + } + + .showSide { + display: inline-block; + cursor: pointer; + width: 30px; + } + + .login-info.node-main-login header .showSide { + display: none; + } + + .showSide::before { + content: ''; + display: inline-block; + height: 24px; + width: 30px; + background: url(./menu-logo.png) no-repeat center center / 100%; + vertical-align: middle; + } + + .login > .main .cbi-value-title { + text-align: left; + } + + .cbi-value-title { + width: 9rem; + padding-right: 1rem; + } + + #diag-rc-output > pre, + #command-rc-output > pre { + font-size: 1rem; + } + + .table { + display: block; + } + + #packages.table { + display: grid; + } + + .tr { + display: flex; + flex-direction: row; + flex-wrap: wrap; + } + + .Overview .table[width="100%"] > .tr { + flex-wrap: nowrap; + } + + .tr.placeholder { + border-bottom: thin solid #ddd; + } + + .tr.placeholder > .td, + #cbi-firewall .tr > .td, + #iptables .tr:nth-child(2) > .td, + #cbi-network .tr:nth-child(2) > .td, + .cbi-section #wifi_assoclist_table .tr > .td { + border-top: 0; + } + + .th, + .td { + display: inline-block; + align-self: flex-start; + flex: 2 2 25%; + text-overflow: ellipsis; + word-wrap: break-word; + } + + .td select, + .td input[type="text"] { + width: 100%; + word-wrap: normal; + } + + .td [data-dynlist] > input, + .td input.cbi-input-password { + width: calc(100% - 1.5rem); + } + + .td[data-type="button"], + .td[data-type="fvalue"] { + flex: 1 1 12.5%; + text-align: left; + } + + .th.cbi-value-field, + .td.cbi-value-field, + .th.cbi-section-table-cell, + .td.cbi-section-table-cell { + flex-basis: auto; + padding-top: 1rem; + } + + .cbi-section-table-row { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; + } + + .td.cbi-value-field, + .cbi-section-table-cell { + display: inline-block; + flex: 10 10 auto; + flex-basis: 50%; + text-align: center; + } + + .td.cbi-section-actions { + vertical-align: bottom; + } + + .tr.table-titles, + .tr.cbi-section-table-titles, + .tr.cbi-section-table-descr { + display: none; + } + + .tr[data-title]::before, + .tr.cbi-section-table-titles.named::before { + font-size: .9rem; + display: block; + flex: 1 1 100%; + border-bottom: thin solid rgba(0, 0, 0, .26); + background: #90c0e0; + } + + .td[data-title], + [data-page^="admin-status-realtime"] .td[id] { + text-align: left; + } + + .td[data-title]::before { + display: block; + } + + .cbi-button + .cbi-button { + margin-left: 0; + } + + .td.cbi-section-actions > * > *, + .td.cbi-section-actions > * > form > * { + margin: 2.1px 3px; + } + + .Firewall form { + font-family: inherit; + font-weight: normal; + font-style: normal; + line-height: normal; + position: static !important; + min-width: inherit; + margin: 0 0 2rem 0; + padding: 2rem; + border: 0; + border-radius: 0; + background-color: #fff; + } + + .Firewall form input { + width: 100% !important; + margin: 0; + margin-top: 1rem; + } + + .Firewall .center, + .Firewall .center::before { + text-align: left !important; + } + + .commandbox { + width: 100% !important; + } + + /* The scroll bar of the navigation bar is compatible with each browser. */ + /* Google */ + .logged-in .main-left .navbar-container::-webkit-scrollbar { + width: 6px; + background: transparent; + } + + .logged-in .main-left .navbar-container::-webkit-scrollbar-button { + display: none; + } + + .logged-in .main-left .navbar-container::-webkit-scrollbar-thumb { + background-color: #ffffff61; + border-radius: 10px; + } + + .logged-in .main-left .navbar-container::-webkit-scrollbar-thumb { + background-color: #839dd67a; + border-radius: 10px; + } + + .logged-in .main-left .navbar-container:hover::-webkit-scrollbar-thumb { + background-color: #839dd67a; + } + + /* IE */ + .logged-in .main-left .navbar-container { + scrollbar-track-color: transparent; + scrollbar-face-color: #839dd67a; + scrollbar-arrow-color: transparent; + scrollbar-3dlight-color: transparent; + scrollbar-highlight-color: transparent; + scrollbar-shadow-color: transparent; + scrollbar-darkshadow-color: transparent; + scrollbar-base-color: transparent; + } + + .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) { - .node-main-login { - background: none; - } - .node-main-login>.main .logoImg a { - font-size: 30px; - margin: 12px 0 22px 0; - color: #354057; - } - .node-main-login>.main #maincontent { - padding-top: 0; - padding-bottom: 1rem; - min-width: 100%; - top: 0; - transform: translateY(0) translateX(-50%); - } - .alert-message { - padding: 8px 15%; - } - .alert-message>h4 { - font-size: 14px; - } - .alert-message>p, - .alert-message a { - font-size: 12px; - } - .a lert-message>h4 { - padding: 8px 0 8px 36px; - } - .alert-message a { - padding: 8px 0; - margin-top: 8px; - } - .node-main-login .warning { - background-color: #F5F5F6; - color: #354057; - } - .alert-message a { - color: #f24c7c; - background: #fff; - } - .node-main-login>.main form h2 { - font-size: 16px; - margin: 20px 0 16px; - color: #354057; - } - .node-main-login>.main form .cbi-value-field input { - padding-left: 34px; - height: 36px; - background-size: 16px; - font-size: 16px; - } - .node-main-login>.main form .cbi-value-field { - margin-bottom: 20px; - } - .node-main-login form .cbi-page-actions input { - padding: 6px 0; - font-size: 16px; - } - .node-main-login form .cbi-value-field .iconpwd, - .node-main-login form .cbi-value-field .iconuser, - .node-main-login form .cbi-value-field .iconeye { - height: 20px; - width: 16px; - left: 12px; - } - .node-main-login form .cbi-value-field .iconeye { - left: auto; - right: 12px; - } - .mobile-hide { - display: none; - } - .PC-hide { - display: inline-block; - } -} -@media screen and (max-width: 480px) { - body { - font-size: 1rem; - } - .cbi-value-title { - width: 100%; - min-width: 0rem !important; - display: block; - margin-top: 1rem; - margin-bottom: 0.5rem; - text-align: left; - } - .cbi-value-field, - .cbi-value-description { - width: 100%; - } - .cbi-value>.cbi-value-field { - display: inline-block; - } - .cbi-tabmenu>li, - .tabs>li { - padding: 0.6rem 0rem; - } - .cbi-tabmenu>li>a, - .tabs>li>a { - padding: 0.2rem 0.3rem; - font-size: 0.9rem; - } - .cbi-page-actions>div>input { - display: none; - } - .tabs>li>a { - font-size: 0.9rem; - } - select, - input { - font-size: 10px; - } - .panel-title { - font-size: 1.4rem; - padding-bottom: 1rem; - } - .node-system-packages>.main .cbi-value.cbi-value-last>div { - width: 100% !important; - } - .node-system-packages>.main .cbi-value .cbi-value-field input { - width: 100%; - } - .node-status-iptables>.main div>.cbi-map>form { - position: static !important; - margin: 0 0 2rem 0; - padding: 2rem; - border: 0; - font-weight: normal; - font-style: normal; - line-height: 1; - font-family: inherit; - min-width: inherit; - background-color: #FFF; - border-radius: 20px; - -webkit-overflow-scrolling: touch; - } - .node-status-iptables>.main div>.cbi-map>form input[type="submit"] { - width: 100% !important; - margin: 0; - } - .node-status-iptables>.main div>.cbi-map>form input[type="submit"]+input[type="submit"] { - margin-top: 1rem; - } - .node-main-login>.main .container { - min-width: 90%; - } - .th, - .td { - flex-basis: 50%; - } - .td.cbi-value-field { - flex-basis: 100%; - } - .td.cbi-value-field[data-type="dvalue"] { - flex-basis: 50%; - } - .td.cbi-value-field[data-type="button"], - .td.cbi-value-field[data-type="fvalue"] { - flex-basis: 25%; - text-align: left; - } - .tr[data-title]::before, - .tr.cbi-section-table-titles.named::before { - font-size: 1rem; - } - .hide-xs { - display: none; - } - /* All styles of the login interface */ - .node-main-login>.main .cbi-value { - padding: 0; - } - .alert-message { - padding: 8px 10%; - } -} -@media screen and (min-width: 992px) { - .cbi-value-field .cbi-input-select { - width: 20rem; - } - .cbi-value-field .cbi-dropdown { - min-width: 20rem; - } -} -@media screen and (min-width: 1280px) { - .cbi-value-field .cbi-input-select { - width: 22rem; - } - .cbi-value-field .cbi-dropdown { - min-width: 22rem; - } + .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) { + body { + font-size: .8rem; + } + + .cbi-progressbar::after { + font-size: .95em; + line-height: 1.5; + } + + fieldset, + .cbi-section { + margin: 1rem 0 0 0; + padding: 1rem; + } + + .main-left .nav-container { + width: 70%; + } + + .main .main-left > .nav > .slide > .menu { + font-size: 1.2rem; + } + + .main .main-left > .nav > .slide > .slide-menu > li > a { + font-size: 1rem; + } + + .cbi-value-title { + display: block; + width: 100%; + min-width: 0 !important; + margin-top: 1rem; + margin-bottom: .5rem; + text-align: left; + } + + .cbi-value-field, + .cbi-value-description { + width: 100%; + } + + .cbi-value > .cbi-value-field { + display: inline-block; + } + + .cbi-tabmenu > li, + .tabs > li { + padding: .6rem 0; + } + + .cbi-tabmenu > li > a, + .tabs > li > a { + font-size: .9rem; + padding: .2rem .3rem; + } + + .cbi-page-actions > div > input { + display: none; + } + + .cbi-page-actions > .cbi-button { + margin-top: .2rem; + } + + .login > .main .cbi-value { + padding: 0; + } + + .login > .main form > div:nth-last-child(1) { + margin-top: 2rem; + } + + .login > .main .cbi-value-title { + font-size: 1.2rem; + width: 100% !important; + } + + .login > .main fieldset { + margin: 0; + padding: .5rem; + } + + .commandbox p:first-of-type { + margin-top: -8px; + } + + #diag-rc-output > pre, + #command-rc-output > pre { + font-size: .8rem; + } + + h2 { + font-size: 2rem; + } + + .tabs > li > a { + font-size: .9rem; + } + + select, + input { + font-size: .9rem; + } + + code { + font-size: .8rem; + } + + .panel-title { + font-size: 1.4rem; + padding-bottom: 1rem; + } + + .node-system-packages > .main .cbi-value.cbi-value-last > div { + width: 100% !important; + } + + .node-system-packages > .main .cbi-value .cbi-value-field input { + width: 100%; + } + + .th, + .td { + flex-basis: 50%; + } + + .td.cbi-value-field { + flex-basis: 100%; + } + + .td.cbi-value-field[data-type="button"], + .td.cbi-value-field[data-type="fvalue"] { + flex-basis: 25%; + text-align: left; + } + + .tr[data-title]::before, + .tr.cbi-section-table-titles.named::before { + font-size: 1rem; + } + + td > .ifacebadge, + .td > .ifacebadge { + font-size: .62rem; + } + + #cbi-wireless .td { + overflow: hidden; + } + + .hide-sm, + .hide-xs:not([data-title="MAC-Address"]) { + display: none; + } + + .mobile-hide { + display: none; + } +} + +@media screen and (min-width: 1152px) { + .cbi-value input[type="password"], + .cbi-value input[type="text"] { + min-width: 20rem; + } + + .cbi-value-field .cbi-input-select { + width: 20rem; + } + + .cbi-value-field .cbi-dropdown { + min-width: 20rem; + } + + .cbi-section-node .tr { + overflow: hidden; + } +} + +@media screen and (min-width: 1366px) { + .cbi-value input[type="password"], + .cbi-value input[type="text"] { + min-width: 22rem; + } + + .cbi-value-field .cbi-input-select { + width: 22rem; + } + + .cbi-value-field .cbi-dropdown { + min-width: 22rem; + } } + @media screen and (min-width: 1600px) { - .cbi-value-field .cbi-input-select { - width: 25rem; - } - .cbi-value-field .cbi-dropdown { - min-width: 25rem; - } + .cbi-value input[type="password"], + .cbi-value input[type="text"] { + min-width: 25rem; + } + + .cbi-value-field .cbi-input-select { + width: 25rem; + } + + .cbi-value-field .cbi-dropdown { + min-width: 25rem; + } } diff --git a/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/ScrollY.js b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/ScrollY.js new file mode 100644 index 0000000000..38d82d103e --- /dev/null +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/ScrollY.js @@ -0,0 +1 @@ +!function(win,dom){function MyScrollBar(o){this.init(o)}function getStyle(obj,name){return win.getComputedStyle?getComputedStyle(obj,null)[name]:obj.currentStyle[name]}function setStyle(obj,oStyle){for(var i in oStyle)obj.style[i]=oStyle[i]}function getOffsetSize(obj){var sDisplay=getStyle(obj,"display"),res={};if("none"!=sDisplay)res.width=obj.offsetWidth,res.height=obj.offsetHeight;else{var oldStyle={position:getStyle(obj,"position"),visibility:getStyle(obj,"visibility"),display:sDisplay},newStyle;setStyle(obj,{position:"absolute",visibility:"hidden",display:"inline-block"}),res.width=obj.offsetWidth,res.height=obj.offsetHeight,setStyle(obj,oldStyle)}return res}function getClientSize(obj){var iTopW=parseInt(getStyle(obj,"borderTopWidth")),iRightW=parseInt(getStyle(obj,"borderRightWidth")),iBottomW=parseInt(getStyle(obj,"borderBottomWidth")),iLeftW=parseInt(getStyle(obj,"borderLeftWidth")),oOffset=getOffsetSize(obj);return{width:oOffset.width<=0?oOffset.width:oOffset.width-iLeftW-iRightW,height:oOffset.height<=0?oOffset.height:oOffset.height-iTopW-iBottomW}}function canSelectText(bCan){bCan?(dom.body.style.mozUserSelect="text",dom.body.style.webkitUserSelect="text",dom.body.style.msUserSelect="text",dom.body.style.khtmlUserSelect="text",dom.body.style.userSelect="text"):(dom.body.style.mozUserSelect="none",dom.body.style.webkitUserSelect="none",dom.body.style.msUserSelect="none",dom.body.style.khtmlUserSelect="none",dom.body.style.userSelect="none")}function getPosition(obj,goal){var oPos={top:obj.offsetTop,left:obj.offsetLeft};if(obj.parentNode==goal)return oPos;var obj=getPosition(obj.parentNode,goal);oPos.top+=obj.top,oPos.left+=obj.left}MyScrollBar.prototype.init=function(o){this.bYBar=!1,this.iScrollTop=0,this.iScrollLeft=0,this.bYShow=!1,this.oWrapper=dom.getElementById(o.selId),this.oScroll=this.oWrapper.firstElementChild,this.setParam(o),this.addScrollBar(),this.initState(),this.initEvent()},MyScrollBar.prototype.initState=function(){var sWPosition;"static"==getStyle(this.oWrapper,"position")&&setStyle(this.oWrapper,{position:"relative"}),setStyle(this.oScroll,{position:"relative"}),this.bYBar&&(setStyle(this.oYBox,{display:this.enterShow?"none":"block",position:"absolute",top:0,right:0,zIndex:10,width:this.width+"px",height:"100%",backgroundColor:this.bgColor}),setStyle(this.oYBar,{position:"absolute",top:0,left:0,width:"100%",backgroundColor:this.barColor,borderRadius:this.borderRadius+"px",transition:"all "+this.time+"ms"})),this.setSize()},MyScrollBar.prototype.initEvent=function(){var _this=this,sUserAgent;-1!=win.navigator.userAgent.toLowerCase().indexOf("firefox")?this.oWrapper.addEventListener("DOMMouseScroll",function(e){_this.bYBar&&_this.bYShow&&(e.preventDefault(),_this.iScrollTop+=e.detail>0?60:-60,_this.iScrollTop=_this.iScrollTop<=0?0:_this.iScrollTop>=_this.iScrollH-_this.iWrapperH?_this.iScrollH-_this.iWrapperH:_this.iScrollTop,_this.setTransLate(),_this.setYTop(_this.iScrollTop/_this.iScrollH*_this.iYBoxH))}):this.oWrapper.onmousewheel=function(evt){if(_this.bYBar&&_this.bYShow){var e=evt||win.event;evt?e.preventDefault():e.returnValue=!1,_this.iScrollTop+=e.wheelDelta<0?60:-60,_this.iScrollTop=_this.iScrollTop<=0?0:_this.iScrollTop>=_this.iScrollH-_this.iWrapperH?_this.iScrollH-_this.iWrapperH:_this.iScrollTop,_this.setTransLate(),_this.setYTop(_this.iScrollTop/_this.iScrollH*_this.iYBoxH)}};var isInWrapper=!1;this.oWrapper.onmouseenter=function(){isInWrapper=!0,_this.enterShow&&_this.bYBar&&_this.bYShow&&setStyle(_this.oYBox,{display:"block"})},this.oWrapper.onmouseleave=function(){isInWrapper=!1,_this.enterShow&&_this.bYBar&&!bYDown&&_this.bYShow&&setStyle(_this.oYBox,{display:"none"})};var bYDown=!1,bYLeave=!0,iDownPageY=0,iYBarTop=0;this.bYBar&&(this.enterColor&&(this.oYBar.onmouseenter=function(){bYLeave=!1,setStyle(this,{backgroundColor:_this.enterColor})},this.oYBar.onmouseleave=function(){bYLeave=!0,bYDown||setStyle(this,{backgroundColor:_this.barColor})}),this.oYBar.onmousedown=function(e){_this.bYShow&&(bYDown=!0,iDownPageY=e.clientY+dom.documentElement.scrollTop||dom.body.scrollTop,iYBarTop=parseInt(getStyle(this,"top")),_this.setYTime(0),canSelectText(!1))},dom.addEventListener("mouseup",function(){bYDown&&_this.bYShow&&(bYDown=!1,_this.setYTime(_this.time),canSelectText(!0),!isInWrapper&&_this.enterShow&&setStyle(_this.oYBox,{display:"none"})),!bYDown&&bYLeave&&setStyle(_this.oYBar,{backgroundColor:_this.barColor})}),dom.addEventListener("mousemove",function(e){if(bYDown&&_this.bYShow){var iNowPageY=e.clientY+dom.documentElement.scrollTop||dom.body.scrollTop,iNowTop=iYBarTop+iNowPageY-iDownPageY;iNowTop=iNowTop<=0?0:iNowTop>=_this.iYBoxH-_this.iYBarH?_this.iYBoxH-_this.iYBarH:iNowTop,_this.iScrollTop=iNowTop/_this.iYBoxH*_this.iScrollH,_this.setTransLate(),_this.setYTop(iNowTop)}}),this.oYBar.ondrag=function(e){var e=evt||win.event;evt?e.preventDefault():e.returnValue=!1})},MyScrollBar.prototype.setParam=function(o){this.width=o.width?o.width:10,this.bgColor=o.bgColor?o.bgColor:"#eaeaea",this.barColor=o.barColor?o.barColor:"#ccc",this.enterColor=o.enterColor||!1,this.enterShow=!1!==o.enterShow,this.hasY=!1!==o.hasY,this.borderRadius=o.borderRadius>=0?o.borderRadius:this.width/2,this.time=o.time||0},MyScrollBar.prototype.addScrollBar=function(){this.getSize(),this.hasY&&(this.bYBar=!0,this.oYBox=dom.createElement("div"),this.oYBar=dom.createElement("div"),this.oYBox.appendChild(this.oYBar),this.oWrapper.insertBefore(this.oYBox,this.oScroll))},MyScrollBar.prototype.getSize=function(){var oWrapperSize=getClientSize(this.oWrapper),oScrollSize=getClientSize(this.oScroll);this.iWrapperClientH=oWrapperSize.height,this.iPaddingT=parseInt(getStyle(this.oWrapper,"paddingTop")),this.iPaddingR=parseInt(getStyle(this.oWrapper,"paddingRight")),this.iPaddingB=parseInt(getStyle(this.oWrapper,"paddingBottom")),this.iPaddingL=parseInt(getStyle(this.oWrapper,"paddingLeft")),this.iWrapperH=oWrapperSize.height-this.iPaddingT-this.iPaddingB,this.iScrollH=oScrollSize.height,this.bYBar&&(this.iYBoxH=oWrapperSize.height,this.iYBarH=this.iWrapperH/this.iScrollH*this.iYBoxH)},MyScrollBar.prototype.setSize=function(time){var _this=this;time=time||100,setTimeout(function(){_this.getSize(),_this.iScrollTop>=_this.iScrollH-_this.iWrapperH&&(_this.iScrollTop=_this.iScrollH-_this.iWrapperH),_this.bYBar&&(_this.iWrapperH>=_this.iScrollH?(setStyle(_this.oYBox,{display:"none"}),_this.bYShow=!1):(_this.enterShow||setStyle(_this.oYBox,{display:"block"}),setStyle(_this.oYBar,{height:_this.iYBarH+"px",top:_this.iScrollTop/_this.iScrollH*_this.iYBoxH+"px"},0),_this.bYShow=!0))},time)},MyScrollBar.prototype.setTransLate=function(iTime){var sTranslate="translate(-"+this.iScrollLeft+"px, -"+this.iScrollTop+"px)";setStyle(this.oScroll,{transition:"all "+(iTime>=0?iTime:this.time)+"ms",transform:sTranslate,msTransform:sTranslate,mozTransform:sTranslate,webkitTransform:sTranslate,oTransform:sTranslate})},MyScrollBar.prototype.setYTime=function(iTime){setStyle(this.oYBar,{transition:"all "+(iTime>=0?iTime:this.time)+"ms"})},MyScrollBar.prototype.setYTop=function(iTop){setStyle(this.oYBar,{top:iTop+"px"})},MyScrollBar.prototype.jump=function(o){o=o||{};var oPos={top:0,left:0},iTop=0,iBottome=this.iScrollH-this.iWrapperClientH+this.iPaddingT+this.iPaddingB>0?this.iScrollH-this.iWrapperClientH+this.iPaddingT+this.iPaddingB:0,iLeft=0,iRight=this.iScrollW-this.iWrapperClientW+this.iPaddingL+this.iPaddingR>0?this.iScrollW-this.iWrapperClientW+this.iPaddingL+this.iPaddingR:0,obj;if(o.id)oPos=getPosition(document.getElementById(o.id),this.oScroll),this.bYBar&&(oPos.top+=this.iPaddingT);else if(o.pos)if("string"==typeof o.pos)switch(o.pos){case"top":oPos.top=0;break;case"bottom":oPos.top=iBottome;break;case"left":oPos.left=0;break;case"right":oPos.left=iRight}else"object"==typeof o.pos&&(oPos=o.pos);oPos.top=oPos.top>iBottome?iBottome:oPos.top>=0?oPos.top:0,this.iScrollTop=oPos.top,this.setTransLate(o.time),this.bYBar&&(this.setYTime(o.time),this.setYTop(this.iScrollTop/this.iScrollH*this.iYBoxH))},"function"==typeof define&&define.amd&&define([],function(){return MyScrollBar}),win.MyScrollBar=MyScrollBar}(window,document);
\ No newline at end of file diff --git a/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js index 76ee383ccb..bef272760a 100755 --- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js @@ -16,8 +16,8 @@ * Licensed to the public under the Apache License 2.0 */ -(function ($) { - $(".main > .loading").fadeOut(); +(function (win, $) { + $(".loading").fadeOut(); /** * trim text, Remove spaces, wrap @@ -33,16 +33,17 @@ var mainNodeName = undefined; var nodeUrl = ""; - (function(node){ - if (node[0] == "admin"){ + (function (node) { + var luciLocation; + if (node[0] == "admin") { luciLocation = [node[1], node[2]]; - }else{ + } else { luciLocation = node; } - for(var i in luciLocation){ + for (var i in luciLocation) { nodeUrl += luciLocation[i]; - if (i != luciLocation.length - 1){ + if (i != luciLocation.length - 1) { nodeUrl += "/"; } } @@ -59,7 +60,7 @@ return true; } - $(".main > .main-left .nav > .slide > .menu").each(function () { + $(".main-left .nav > .slide > .menu").each(function () { var ulNode = $(this); ulNode.next().find("a").each(function () { var that = $(this); @@ -81,7 +82,17 @@ /** * menu click */ - $(".main > .main-left .nav > .slide > .menu").click(function () { + if ($('.nav').length > 0 && $(window).width() > 992) { + var oScroll = new MyScrollBar({ + selId: 'navBox', + time: 100, + bgColor: 'transprent', + barColor: '#839dd67a', + enterColor: '#839dd6cc', + enterShow: false + }); + } + $(".main-left .nav > .slide > .menu").click(function () { var ul = $(this).next(".slide-menu"); var menu = $(this); if (!ul.is(":visible")) { @@ -94,28 +105,35 @@ ul.removeClass("active"); }); } + if ($('.nav').length > 0 && $(window).width() > 992) { + oScroll.setSize(200); + } + setInterval(function () { + if ($('.nav').height() < $('.navbar-container').height()) { + $('.nav').css('transform', 'translate(0px, 0px)'); + } + }, 300); return false; }); - /** * hook menu click and add the hash */ - $(".main > .main-left .nav > .slide > .slide-menu > li > a").click(function () { + $(".main-left .nav > .slide > .slide-menu > li > a").click(function () { if (lastNode != undefined) lastNode.removeClass("active"); $(this).parent().addClass("active"); - $(".main > .loading").fadeIn("fast"); + $(".loading").fadeIn("fast"); return true; }); /** * fix menu click */ - $(".main > .main-left .nav > .slide > .slide-menu > li").click(function () { + $(".main-left .nav > .slide > .slide-menu > li").click(function () { if (lastNode != undefined) lastNode.removeClass("active"); $(this).addClass("active"); - $(".main > .loading").fadeIn("fast"); - window.location = $($(this).find("a")[0]).attr("href"); + $(".loading").fadeIn("fast"); + win.location = $($(this).find("a")[0]).attr("href"); return false; }); @@ -141,7 +159,7 @@ that.click(function () { var href = that.attr("href"); if (href.indexOf("#") == -1) { - $(".main > .loading").fadeIn("fast"); + $(".loading").fadeIn("fast"); return true; } }); @@ -154,52 +172,49 @@ var showSide = false; $(".showSide").click(function () { if (showSide) { - $(".main-left").stop(true).animate({ - right: '100%' - }, "fast"); - $(".main-right").css("overflow-y", "auto"); + $(".darkMask").stop(true).fadeOut("fast"); + $(".main-left").stop(true).fadeOut("fast"); + $(".main-right").css("overflow-y", "visible"); showSide = false; } else { + $(".darkMask").stop(true).fadeIn("fast"); $(".main-left").stop(true).animate({ - right: '0' - }, "fast"); + width: "100%" + }, "fast").fadeIn("fast"); $(".main-right").css("overflow-y", "hidden"); showSide = true; } }); + if($(win).width() <= 992){ + $(".main-left").click(function(e) { + e.preventDefault(); + $(".main-left").stop(true).fadeOut("fast"); + showSide = false; + }); + } - $(".logged-in .main-left").click(function () { + $(".darkMask").click(function () { if (showSide) { showSide = false; - - $(this).stop(true).fadeOut("fast"); + $(".darkMask").stop(true).fadeOut("fast"); $(".main-left").stop(true).animate({ - right: '100%' + width: "0" }, "fast"); - $(".main-right").css("overflow-y", "auto"); - } - }); - - $(".logged-in .main-left > *").click(function () { - event.stopPropagation(); - if ((navigator.userAgent.indexOf('MSIE') >= 0)&& (navigator.userAgent.indexOf('Opera') < 0)){ - event.cancelBubble = true; - }else{ - event.stopPropagation(); + $(".main-right").css("overflow-y", "visible"); } }); - $(window).resize(function () { - if ($(window).width() > 921) { + $('.login .main-right').css('min-height', $(win).height()); + $(win).resize(function () { + if ($(win).width() > 921) { $(".main-left").css("width", ""); $(".darkMask").stop(true); $(".darkMask").css("display", "none"); showSide = false; } - if( $(window).width() > 992 ){ - $('.logged-in .main-right').width( $(window).width() - $('.logged-in .main-left').width() - 50 ); - } + + $('.login .main-right').css('min-height', $(win).height()); }); /** @@ -212,7 +227,7 @@ $(".cbi-section-table-titles, .cbi-section-table-descr, .cbi-section-descr").each(function () { var that = $(this); - if (that.text().trim() == ""){ + if (that.text().trim() == "") { that.css("display", "none"); } }); @@ -244,48 +259,23 @@ } } - $('<div class="iconpwd"></div>').appendTo($('.node-main-login form .cbi-value input[type="password"]').parent()[0]); - - $('<div class="iconuser"></div>').appendTo($('.node-main-login form .cbi-value input[type="text"]').parent()[0]); - - $('<div class="iconeye"></div>').appendTo($('.node-main-login form .cbi-value input[type="password"]').parent()[0]); + $('.lang_enInterfaces .ifacebox-head').each(function () { + $(this).next().css('border-color', $(this).css('background-color')); + }); - var num = true; - $('.cbi-value-field .iconeye').click(function(){ - if(num){ - $('.node-main-login form .cbi-value-last input[type="password"]').prop('type', 'text'); - $('.node-main-login form .cbi-value-field .iconeye').removeClass('opeye').addClass('cleye'); - num = false; + $('<div>').appendTo('.login > .main .cbi-value-last .cbi-value-field'); + $('.login > .main .cbi-value-last .cbi-value-field > div').click(function(){ + var thisParent = $(this).parent(); + if( thisParent.attr('class').indexOf('op-eye') == (-1) ){ + thisParent.addClass('op-eye'); + $(this).prev().attr('type', 'text'); }else { - $('.node-main-login form .cbi-value-last input[type="text"]').prop('type', 'password'); - $('.node-main-login form .cbi-value-field .iconeye').removeClass('cleye').addClass('opeye'); - num = true - } - - }) - - $('body.logged-in').css('min-height', $(window).height()); - - $(function(){ - if( $(window).width() > 992 ){ - $('.logged-in .main-right').outerWidth( $(window).width() - $('.logged-in .main-left').width() - 50 ); + thisParent.removeClass('op-eye'); + $(this).prev().attr('type', 'password'); } - $('.cbi-section .table').each(function(){ - var thisTr = $(this).children('.tr').get(0); - var td = $(thisTr).children('.td').get(0); - var th = $(thisTr).children('.th').get(0) - var a = window.getComputedStyle(thisTr, ':before').getPropertyValue('content'); - console.log(td, th); - - if( th && a != 'none' ){ - $(th).css('border-top-left-radius', '0'); - }else if( td && a != 'none' ){ - $(td).css('border-top-left-radius', '0'); - } - }); }); - $('.lang_enNetwork #cbi-samba-sambashare .table').wrap('<div class="table-container"></div>'); - -})(jQuery); + $('#cbi-network-switch_vlan .table').wrap('<div id="vlan_table"></div>'); + +})(window, jQuery); diff --git a/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm b/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm index f0cbe4e968..25997d145e 100755 --- a/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm +++ b/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 %> @@ -43,8 +43,8 @@ <script> var luciLocation = <%= luci.http.write_json(luci.dispatcher.context.path) %>; </script> -<script src="<%=media%>/js/jquery.min.js?v=git-18.247.71242-9541751"></script> -<script src="<%=media%>/js/script.js?v=git-18.247.71242-9541751"></script> +<script src="<%=media%>/js/jquery.min.js"></script> +<script src="<%=media%>/js/script.js"></script> </body> </html> diff --git a/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm b/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm index 21fa78e3c6..c10dea9dd5 100644 --- a/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm +++ b/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm @@ -1,4 +1,4 @@ -<%# +<%# Rosy is a theme for LuCI. It is based on luci-theme-bootstrap luci-theme-rosy Copyright 2018 Rosy Song <rosysong@rosinson.com> @@ -123,7 +123,7 @@ local function render_topmenu() local childs = disp.node_childs(cattree) if #childs > 0 then - write('<ul class="nav">') + write('<ul class="nav scroll">') for i, r in ipairs(childs) do local nnode = cattree.nodes[r] @@ -192,6 +192,26 @@ end end end + + local function auth_level() + local childs = disp.node_childs(cattree) + if #childs > 0 then + for i, r in ipairs(childs) do + local nnode = cattree.nodes[r] + local grandchildren = disp.node_childs(nnode) + + if #grandchildren > 0 then + -- If this value is returned, the current interface is the logged-in data output interface + return "auth" + else + -- If this value is returned, it indicates that the current interface is a data output interface that does not require login. + return "noauth" + end + end + end + -- If this value is returned, the current interface is the login interface + return "login" + end -%> <!DOCTYPE html> <html lang="<%=luci.i18n.context.lang%>"> @@ -231,40 +251,41 @@ <% end -%> <script src="<%=resource%>/cbi.js"></script> <script src="<%=resource%>/xhr.js"></script> + <script src="<%=media%>/js/ScrollY.js"></script> </head> -<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>"> +<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <%- if auth_level() == "auth" then %> logged-in<%- end %> <%- if auth_level() == "noauth" then %> login-info<%- end %> <%- if auth_level() == "login" then %> login<%- end %>"> <header> - <div class="fill"> - <div class="container"> - <span class="showSide"></span> - <a class="brand" href="#"><%=boardinfo.hostname or "?"%></a> - <div class="btn-con pull-right"> - <% render_changes() %> - <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()"> - <span class="label success" id="xhr_poll_status_on"><span class="mobile-hide"> - <%:Auto Refresh%></span> - <%:on%></span> - <span class="label" id="xhr_poll_status_off" style="display:none"><span class="mobile-hide"> - <%:Auto Refresh%></span> - <%:off%></span> - </span> - <% render_logout() %> - </div> + <div class="container"> + <span class="showSide"></span> + <a class="brand PC-hide" href="#"><%=boardinfo.hostname or "?"%></a> + <div class="btn-con pull-right"> + <% render_changes() %> + <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()"> + <span class="label success" id="xhr_poll_status_on"><span class="mobile-hide"> + <%:Auto Refresh%></span> + <%:on%></span> + <span class="label" id="xhr_poll_status_off" style="display:none"><span class="mobile-hide"> + <%:Auto Refresh%></span> + <%:off%></span> + </span> + <% render_logout() %> </div> </div> </header> + <div style="" class="loading"> + <span> + <div class="loading-img"> + <img src="<%=media%>/loading.svg"> + </div>Loading... + </span> + </div> <div class="main"> - <div style="" class="loading"><span> - <div class="loading-img"> - <img src="<%=media%>/loading.svg"> - </div>Loading... - </span></div> <div class="main-left"> <div class="nav-container"> <a class="brand" href="#"> <%=boardinfo.hostname or "?"%></a> - <div class="navbar-container"> + <div class="navbar-container" id="navBox"> <% render_topmenu() %> </div> </div> |
