Skip to content

Commit

Permalink
Revert "add theme variables"
Browse files Browse the repository at this point in the history
This reverts commit 858b506.
  • Loading branch information
ninedev-i committed Aug 29, 2024
1 parent 858b506 commit ca41cd2
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 64 deletions.
1 change: 0 additions & 1 deletion app/scripts/app.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use strict';

// Import slylesheets
import '../styles/css/variables.css';
import '../styles/css/bootstrap.min.css';
import '../styles/css/font-awesome.min.css';
import '../styles/css/fontawesome.min.css';
Expand Down
4 changes: 2 additions & 2 deletions app/styles/css/bootstrap.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/styles/css/device-manager.css
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,15 @@
@media (min-width: 992px) {
.device-manager-page .nav-stacked li.active {
color: #fff;
background-color: var(--primary-color);
background-color: #3276b1;
}

.device-manager-page li:not(.active):not(:hover):not(:focus) .port-tab {
background-color: #f5f5f5;
}

.device-manager-page li.active .settings-tab {
border: 1px solid var(--primary-color);
border: 1px solid #3276b1;
}

.device-manager-page .group-editor {
Expand Down
4 changes: 2 additions & 2 deletions app/styles/css/network-connections.css
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
}

.network-connections-page .nav-tabs li.active {
box-shadow: 0 -2px 0 var(--primary-color);
box-shadow: 0 -2px 0 #3276b1;
border-top-width: 0 !important;
font-weight: 700;
border-left: 1px solid #ddd;
Expand Down Expand Up @@ -158,7 +158,7 @@
}
.network-connections-page .nav-stacked li.active {
color: #fff;
background-color: var(--primary-color);
background-color: #3276b1;
}
.network-connections-page .nav-stacked li > *:first-child {
padding: 10px 9px 10px;
Expand Down
12 changes: 4 additions & 8 deletions app/styles/css/new.css
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,6 @@ div[uib-datepicker-popup-wrap] {
padding: 7px 10px;
}

.navbar-brand img {
max-height: 42px;
}

.devices-panel-list .device-panel:not(:last-child) {
margin-bottom: 18px;
}
Expand All @@ -196,7 +192,7 @@ div[uib-datepicker-popup-wrap] {
}

.device-panel > .panel-heading {
background-color: var(--primary-color);
background-color: #3276b1;
color: white;
padding: 0;
border: none !important;
Expand All @@ -223,7 +219,7 @@ div[uib-datepicker-popup-wrap] {

.device-panel__header-wrapper {
position: relative;
background-color: var(--primary-color);
background-color: #3276b1;
color: white;
}

Expand Down Expand Up @@ -253,7 +249,7 @@ div[uib-datepicker-popup-wrap] {
}

.device-panel__body {
border: 1px solid var(--primary-color);
border: 1px solid #3276b1;
border-top: 0px;
padding: 10px;
}
Expand Down Expand Up @@ -292,7 +288,7 @@ div[uib-datepicker-popup-wrap] {
}

.navbar-inverse > * {
background-color: var(--bar-color);
background-color: black;
}

.navbar-collapse {
Expand Down
12 changes: 6 additions & 6 deletions app/styles/css/smartadmin-production.min.css
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@

.ui-buttonset .ui-state-active.ui-state-hover {
color: #fff;
background-color: var(--primary-color);
background-color: #3276b1;
border-color: #285e8e
}

Expand Down Expand Up @@ -613,7 +613,7 @@ time.icon strong {
time.icon em {
position: absolute;
bottom: 3px;
color: var(--primary-color)
color: #3276b1
}

time.icon span {
Expand Down Expand Up @@ -645,7 +645,7 @@ h2,
h3,
h4 {
margin: 0;
font-family: var(--font);
font-family: "Open Sans", Arial, Helvetica, Sans-Serif;
font-weight: 300
}

Expand Down Expand Up @@ -802,7 +802,7 @@ h6 {

nav ul li a {
line-height: normal;
font-size: var(--bar-font-size);
font-size: 14px;
padding: 10px 10px 10px 11px;
color: #c0bbb7;
display: block;
Expand All @@ -814,7 +814,7 @@ nav ul li a {
nav ul ul {
margin: 0;
display: none;
background: var(--bar-inside-color);
background: rgba(69, 69, 69, .6);
padding: 7px 0
}

Expand Down Expand Up @@ -1627,7 +1627,7 @@ img.away {
}

.progress-bar-success {
background-color: var(--success-color);
background-color: #739e73
}

.progress-striped .progress-bar-success {
Expand Down
21 changes: 0 additions & 21 deletions app/styles/css/variables.css

This file was deleted.

2 changes: 1 addition & 1 deletion app/styles/css/wb-switch.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
}

.wb-switch-input:checked ~ .wb-switch-label {
background: var(--primary-color);
background: #3276b1;
}

.wb-switch-input:checked ~ .wb-switch-label:before {
Expand Down
35 changes: 14 additions & 21 deletions app/styles/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ html, body {

body {
margin-top: 50px;
background: var(--bar-color);
background: #222;
}

@media(min-width:768px) {
Expand Down Expand Up @@ -135,7 +135,7 @@ ul.alert-dropdown {
border: none;
border-radius: 0;
overflow-y: auto;
background-color: var(--bar-color);
background-color: #222;
bottom:0;
overflow-x:hidden;
}
Expand All @@ -147,7 +147,7 @@ ul.alert-dropdown {
.side-nav li a:hover,
.side-nav li a:focus {
outline: none;
background-color: var(--bar-hover-color) !important;
background-color: #000 !important;
}
}

Expand All @@ -159,7 +159,7 @@ ul.alert-dropdown {
display: block;
padding: 10px 15px 10px 38px;
text-decoration: none;
color: var(--bar-inside-text-color);
color: #999;
}

.side-nav>li>ul>li>a:hover {
Expand Down Expand Up @@ -311,16 +311,7 @@ ul.alert-dropdown {
.navbar-nav .active > a,
.navbar-nav a.active{
color: #fff !important;
background-color: var(--bar-hover-color) !important;
}

.navbar-nav > li .glyphicon {
margin-right: 4px;
}

.navbar-text .label {
padding: 3px 6px;
display: inline-block;
background-color: #080808 !important;
}

/* Glyphicons */
Expand Down Expand Up @@ -370,12 +361,12 @@ footer{


.btn-primary {
background-color: var(--primary-color);
background-color: #337ab7;
color: #ffffff;
}

.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary {
background-color: var(--primary-color-hover);
background-color: #5393c8;
}

.btn-primary:active, .btn-primary.active {
Expand Down Expand Up @@ -785,7 +776,7 @@ button.show-console span {
}

.widgets-table .button-col button {
color: var(--primary-color);
color: #337ab7;
margin: 0;
padding: 2px;
}
Expand Down Expand Up @@ -843,12 +834,14 @@ svg:not(:root) {
background-color: #456b7b;
border-color: #456b7b;
}
.uib-datepicker-popup .btn-info,
.uib-datepicker-popup .btn-info {
background-color: #5b835b;
border-color: #5b835b;
}
.uib-daypicker .btn-info {
background-color: var(--success-color);
border-color: var(--success-color);
background-color: #5b835b;
border-color: #5b835b;
}

/*разъединяю btn-group */
.uib-datepicker-popup .btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle) {
border-bottom-right-radius: 2px;
Expand Down

0 comments on commit ca41cd2

Please sign in to comment.