Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved css theming #915

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Improved css theming #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
87eeb3c
remove superfluous php tag
glaszig May 11, 2021
04a7ca4
load main css by default, override styles from theme
glaszig May 11, 2021
e8d29de
remove duplicate styles
glaszig May 11, 2021
8a7a831
improve css code style
glaszig May 11, 2021
19e8a32
remove superfluous font-size, font-weight declarations
glaszig May 11, 2021
897568b
fix getThemeOpt()
glaszig May 11, 2021
2fa850a
fix css link
glaszig May 11, 2021
9484e60
fix var name
glaszig May 11, 2021
0f57bf6
improved theme selection
glaszig May 11, 2021
1a5fa55
fix SelectorOptions selected and disabled handling
glaszig May 11, 2021
5adbd72
fix css selector string
glaszig May 11, 2021
51b1b83
persist selected theme in cookie
glaszig May 11, 2021
2ba3880
fix selected theme detection in theme ui
glaszig May 12, 2021
501bdce
improve cachability of custom.php css
glaszig May 13, 2021
cc94731
enable theme via js
glaszig May 13, 2021
fa0f83b
fix icon color in card-header in lightsout
glaszig May 29, 2021
d000719
fix service-status styles
glaszig May 29, 2021
2d07219
fix service-status layout
glaszig May 29, 2021
57a65de
fix service status icon color
glaszig May 29, 2021
8a45fcb
Merge branch 'master' into improved-css-theming
billz May 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 52 additions & 32 deletions app/css/custom.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
<?php header("Content-Type: text/css; charset=utf-8"); ?>
<?php
header("Content-Type: text/css; charset=utf-8");
$filemtime = filemtime(__FILE__);
header('Last-Modified: ' . gmdate('D, d M Y H:i:s T', $filemtime));
if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $filemtime)
{
header('HTTP/1.0 304 Not Modified');
exit;
}
require_once '../../includes/functions.php';
$color = getColorOpt();
?>
Expand All @@ -16,24 +23,41 @@
color: #212529;
}

.page-header {
margin: 20px 0 20px;
}

.navbar-logo {
margin-top: 0.5em;
margin-left: 0.5em;
}

/* Small devices (portrait phones, up to 576px) */
@media (max-width: 576px) {
.container-fluid, .card-body, .col-md-6 { padding-left: 0.5rem; padding-right: 0.5rem; }
.card .card-header { padding: .75rem .5rem; font-size: 1.0rem; }
.row { margin-left: 0rem; margin-right: 0rem; }
.col-lg-12 { padding-right: 0.25rem; padding-left: 0.25rem; }
.form-group.col-md-6 { margin-left: -0.5rem; }
.js-wifi-stations { margin-left: -0.5rem; margin-right: -0.5rem; }
h4.mt-3 { margin-left: 0.5rem; }
.container-fluid,
.card-body,
.col-md-6 {
padding-left: 0.5rem;
padding-right: 0.5rem;
}
.card .card-header {
padding: .75rem .5rem;
font-size: 1.0rem;
}
.row {
margin-left: 0rem;
margin-right: 0rem;
}
.col-lg-12 {
padding-right: 0.25rem;
padding-left: 0.25rem;
}
.form-group.col-md-6 {
margin-left: -0.5rem;
}
.js-wifi-stations {
margin-left: -0.5rem;
margin-right: -0.5rem;
}
h4.mt-3 {
margin-left: 0.5rem;
}
}

.sidebar {
Expand Down Expand Up @@ -90,7 +114,7 @@
}

.sidebar .nav-item .nav-link {
padding: 0.6rem 0.6rem 0.6rem 1.0rem;
padding: 0.6rem;
}

.alert-success {
Expand Down Expand Up @@ -140,27 +164,35 @@
}

.service-status {
border-width: 0;
display: flex;
align-items: stretch;
justify-content: center;
}
.service-status .icon,
.service-status .text {
display: flex;
font-size: 0.8rem;
align-items: center;
}

.service-status-up {
color: #a1ec38;
color: #a1ec38 !important;
}

.service-status-warn {
color: #f6f044;
color: #f6f044 !important;
}

.service-status-down {
color: #f80107;
color: #f80107 !important;
animation: flash 1s linear infinite;
}
@keyframes flash {
50% {
opacity: 0;
}
}

.logoutput {
width:100%;
height: 20rem;
Expand Down Expand Up @@ -196,7 +228,8 @@

.sidebar.toggled .nav-item .nav-link span {
display: none;
} .sidebar .nav-item .nav-link i,
}
.sidebar .nav-item .nav-link i,
.sidebar .nav-item .nav-link span {
font-size: 1.0rem;
}
Expand Down Expand Up @@ -235,16 +268,3 @@
opacity: 0;
color: #90ee90;
}

.check-progress {
color: #999;
}

.fa-check {
color: #90ee90;
}

.fa-times {
color: #ff4500;
}

163 changes: 1 addition & 162 deletions app/css/hackernews.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,18 @@ License: GNU General Public License v3.0

html * {
font-family: Verdana, Geneva, sans-serif;
font-size: 0.9rem;
color: #828282;
}

body {
color: #212529;
}

a:focus, a:hover {
color: #666;
}

h2 {
font-size: 2rem !important;
}

h4 {
font-size: 1.3rem;
color: #212529;
}

h5.card-title {
font-size: 1.2rem;
color: #212529;
}

Expand All @@ -43,35 +32,26 @@ h5.card-title {
border-color: #ff6600;
background-color: #ff6600;
color: #000;
font-size: 1.0rem;
font-weight: bold;
border-radius: unset;
}

.card-header .col {
color: #212529;
font-size: 1.0rem;
}

.card-header [class^="fa"], .modal-header [class^="fa"] {
color: #fff;
font-size: 1.0rem;
}

.modal-title {
color: #000;
font-size: 1.0rem;
}

.modal-content {
border-radius: 0px;
}

.sidebar-brand-text {
text-transform: none;
color: #212529;
font-size: 2.0rem;
font-weight: 500;
font-family: Verdana, Geneva, sans-serif;
}

Expand All @@ -81,41 +61,16 @@ ul.nav-tabs, .nav-tabs .nav-link {
border-bottom: 1px solid #dddfeb;
}

.sidebar .nav-item .nav-link {
padding: 0.6rem;
}

.sidebar-light .nav-item.active .nav-link {
font-weight: 300;
}

.page-header {
font-size: 26pt;
margin: 10px 0 20px;
}

.navbar-logo {
margin-top: 0.5em;
margin-left: 0.5em;
}

#wrapper,#page-wrapper,
#wrapper #content-wrapper,
.nav>li>a,.nav {
background-color: #fff;
}

/* Small devices (portrait phones, up to 576px) */
@media (max-width: 576px) {
.container-fluid, .card-body, .col-md-6 { padding-left: 0.5rem; padding-right: 0.5rem; }
.card .card-header { padding: .75rem .5rem; font-size: 1.0rem; }
.row { margin-left: 0rem; margin-right: 0rem; }
.col-lg-12 { padding-right: 0.25rem; padding-left: 0.25rem; }
.form-group.col-md-6 { margin-left: -0.5rem; }
.js-wifi-stations { margin-left: -0.5rem; margin-right: -0.5rem; }
h4.mt-3 { margin-left: 0.5rem; }
}

.card-body {
background-color: #f6f6ef;
}
Expand Down Expand Up @@ -146,83 +101,13 @@ ul.nav-tabs, .nav-tabs .nav-link {
color: #eee;
}

.info-item {
text-transform: uppercase;
font-size: 0.7em;
color: #858796;
}

.info-value {
font-size: 0.7rem;
margin-left: 0.7rem;
}

.info-item-xs {
font-size: 0.7rem;
margin-left: 0.3rem;
}

.info-item-wifi {
width: 6rem;
float: left;
}

.logoutput {
width: 100%;
height: 20rem;
height: 300px;
border: 1px solid #d1d3e2;
border-radius: .35rem;
}

.service-status {
border-width: 0;
}

.service-status-up {
color: #a1ec38!important;
}

.service-status-warn {
color: #f6f044!important;
}

.service-status-down {
color: #f80107!important;
animation: flash 1s linear infinite;
}
@keyframes flash {
50% {
opacity: 0;
}
}

.logoutput {
width:100%;
height:300px;
}

pre.unstyled {
border-width: 0;
background-color: transparent;
padding: 0;
}

.dhcp-static-leases {
margin-top: 1em;
margin-bottom: 1em;
}

.dhcp-static-lease-row {
margin-top: 0.5em;
margin-bottom: 0.5em;
}

.loading-spinner {
background: url("../../app/img/loading-spinner.gif") no-repeat scroll center center transparent;
min-height: 150px;
width: 100%;
}

.js-reload-wifi-stations {
min-width: 10rem;
}
Expand All @@ -233,56 +118,10 @@ pre.unstyled {
width: 6.5rem;
}

.sidebar.toggled .nav-item .nav-link span {
display: none;
} .sidebar .nav-item .nav-link i,
.sidebar .nav-item .nav-link span {
font-size: 0.9rem;
}

.btn-warning:hover {
color: #000;
}

.toggle-off.btn {
padding-left: 0.9rem;
font-size: 0.9rem!important;
}

.toggle-on.btn {
font-size: 0.9rem!important;
}

canvas#divDBChartBandwidthhourly {
height: 350px!important;
}

.chart-container {
height: 150px;
width: 200px;
}
.table {
margin-bottom: 0rem;
}

.check-hidden {
visibility: hidden;
}

.check-updated {
opacity: 0;
color: #1cc88a;
}

.check-progress {
color: #999;
}

.fa-check {
color: #90ee90;
}

.fa-times {
color: #ff4500;
}

Loading