Skip to content

Commit

Permalink
Merge pull request #268 from ciar4n/variables
Browse files Browse the repository at this point in the history 
General SCSS cleanup
  • Loading branch information
@C-Lodder
C-Lodder committed Dec 5, 2016
2 parents 305b291 + def0893 commit ecaaabc
Show file tree
Hide file tree
Showing 19 changed files with 127 additions and 99 deletions.
59 changes: 32 additions & 27 deletions administrator/templates/atum/css/template.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3171,7 +3171,7 @@ tbody.collapse.in {
margin-bottom: 0.75rem;
background-color: #fff;
border-radius: 0.25rem;
border: 1px solid rgba(0, 0, 0, 0.17); }
border: 1px solid #cecece; }

.card-block {
padding: 1.25rem; }
Expand Down Expand Up @@ -3208,7 +3208,7 @@ tbody.collapse.in {
padding: 0.75rem 1.25rem;
margin-bottom: 0;
background-color: #f5f5f5;
border-bottom: 1px solid rgba(0, 0, 0, 0.17); }
border-bottom: 1px solid #cecece; }
.card-header::after {
content: "";
display: table;
Expand All @@ -3219,7 +3219,7 @@ tbody.collapse.in {
.card-footer {
padding: 0.75rem 1.25rem;
background-color: #f5f5f5;
border-top: 1px solid rgba(0, 0, 0, 0.17); }
border-top: 1px solid #cecece; }
.card-footer::after {
content: "";
display: table;
Expand Down Expand Up @@ -7712,7 +7712,7 @@ legend {
z-index: 1;
height: 50px;
background: #fcfcfc;
border-bottom: 1px solid rgba(0, 0, 0, 0.17); }
border-bottom: 1px solid #cecece; }
.header .page-title {
display: inline-block;
margin: 0 0 0 25px;
Expand Down Expand Up @@ -7745,7 +7745,7 @@ legend {
width: 55px;
padding: 0;
line-height: 50px;
border-left: 1px solid rgba(0, 0, 0, 0.125);
border-left: 1px solid #cecece;
box-shadow: 1px 0 #fcfcfc inset; }
.header .nav-link .fa {
font-size: 1.4rem;
Expand Down Expand Up @@ -8190,9 +8190,11 @@ iframe {
text-align: center;
vertical-align: middle; }
.main-nav .collapse-level-1 {
background: rgba(0, 0, 0, 0.4); }
.main-nav .collapse-level-2 > li > a {
text-indent: 30px; }
background: #1b1b28; }
.main-nav .collapse-level-2 {
background: #171722; }
.main-nav .collapse-level-2 > li > a {
text-indent: 30px; }
.main-nav > .parent .collapse-arrow::after {
display: inline-block;
float: right;
Expand Down Expand Up @@ -8236,7 +8238,7 @@ iframe {
left: 100%;
width: 220px;
padding: 0 13px;
font-size: 0.9286rem;
font-size: 0.9rem;
font-weight: bold;
background-color: #27283a;
border-radius: 0 0.25rem 0.25rem 0; }
Expand Down Expand Up @@ -8269,11 +8271,10 @@ iframe {
padding: 5px 0 10px;
margin-top: -1px;
text-indent: 0;
background-color: #313349;
border-bottom-right-radius: 0.25rem; }
.closed .main-nav .collapse-level-1 li {
position: relative;
font-size: 0.9286rem;
font-size: 0.9rem;
line-height: 30px;
text-indent: 15px; }
.closed .main-nav .collapse-level-1 a {
Expand All @@ -8300,8 +8301,7 @@ iframe {
content: "\f111";
opacity: .5; }
.closed .main-nav .collapse-level-2 {
padding-bottom: 5px;
background-color: #35374f; }
padding-bottom: 5px; }
.closed .main-nav .collapse-level-2 .sidebar-item-title::before {
content: "\f10c";
opacity: .75; }
Expand Down Expand Up @@ -8423,7 +8423,7 @@ iframe {
padding: 11px 0 10px;
color: #0c192e;
background: #f5f5f5;
border-bottom: 1px solid rgba(0, 0, 0, 0.17); }
border-bottom: 1px solid #cecece; }
.subhead .btn-toolbar {
margin-bottom: 0; }
.subhead .btn-toolbar > * {
Expand All @@ -8439,24 +8439,24 @@ iframe {
line-height: 24px; }
.subhead .btn-toolbar .btn-sm, .subhead .btn-toolbar .btn-group-sm > .btn {
padding: 0 10px;
line-height: 2em;
line-height: 1.8rem;
color: #373a3c;
background-color: #fcfcfc;
border-color: #ccc; }
border-color: #cecece; }
.subhead .btn-toolbar .btn-sm [class^="icon-"], .subhead .btn-toolbar .btn-group-sm > .btn [class^="icon-"], .subhead .btn-toolbar .btn-sm [class*=" icon-"], .subhead .btn-toolbar .btn-group-sm > .btn [class*=" icon-"] {
z-index: -1;
display: inline-block;
width: 28px;
height: auto;
margin: 0 6px 0 -10px;
line-height: 2em;
line-height: 1.8rem;
color: inherit;
background-color: #eceeef;
border-right: 1px solid #ccc;
border-right: 1px solid #cecece;
border-radius: 3px 0 0 3px; }
.subhead .btn-toolbar .btn-sm:hover, .subhead .btn-toolbar .btn-group-sm > .btn:hover {
background-color: #eceeef;
border-color: #ccc; }
border-color: #cecece; }
.subhead .btn-toolbar .btn-primary [class^="icon-"], .subhead .btn-toolbar .btn-primary [class*=" icon-"], .subhead .btn-toolbar .btn-outline-primary [class^="icon-"], .subhead .btn-toolbar .btn-outline-primary [class*=" icon-"] {
color: #0275d8; }
.subhead .btn-toolbar .btn-success [class^="icon-"], .subhead .btn-toolbar .btn-success [class*=" icon-"], .subhead .btn-toolbar .btn-outline-success [class^="icon-"], .subhead .btn-toolbar .btn-outline-success [class*=" icon-"] {
Expand Down Expand Up @@ -8578,7 +8578,8 @@ iframe {
.dropdown-menu {
padding: .2rem 0;
margin-top: .5rem;
background-color: #fcfcfc; }
background-color: #fcfcfc;
border-color: #cecece; }
.dropdown-menu::after {
position: absolute;
top: -1.5rem;
Expand Down Expand Up @@ -8677,11 +8678,12 @@ iframe {

.nav.nav-tabs {
padding: 0;
margin-bottom: 0;
margin: 0;
background-color: #f5f5f5;
border-bottom: 1px solid rgba(0, 0, 0, 0.125);
border: 1px solid #cecece;
border-bottom: 0;
border-radius: 0.25rem 0.25rem 0 0;
box-shadow: 0 1px #fff inset, 0 2px 3px -3px rgba(0, 0, 0, 0.15), 0 -1px 0 rgba(0, 0, 0, 0.03), 0 -4px 0 rgba(0, 0, 0, 0.05) inset, 0 0 3px rgba(0, 0, 0, 0.075); }
box-shadow: 0 1px #fff inset, 0 2px 3px -3px rgba(0, 0, 0, 0.15), 0 -4px 0 rgba(0, 0, 0, 0.05) inset, 0 0 3px rgba(0, 0, 0, 0.075); }
.nav.nav-tabs .nav-item {
margin-bottom: 0;
margin-left: 0; }
Expand Down Expand Up @@ -8721,6 +8723,8 @@ iframe {
.tab-content {
padding: 15px;
background: #fcfcfc;
border: 1px solid;
border-color: #cecece;
border-radius: 0 0 0.25rem 0.25rem;
box-shadow: 0 0 3px rgba(0, 0, 0, 0.075); }

Expand Down Expand Up @@ -8807,7 +8811,7 @@ iframe {
margin-top: 1rem; }

.editor .mce-tinymce {
border: 1px solid rgba(0, 0, 0, 0.17);
border: 1px solid #cecece;
border-radius: 0.25rem; }

.editor .mce-btn, .editor .mce-panel {
Expand Down Expand Up @@ -8893,12 +8897,13 @@ iframe {
line-height: 2.95em;
color: #55595c;
text-align: center;
border-left: 1px solid rgba(0, 0, 0, 0.125);
background-color: #f5f5f5;
border-left: 1px solid #cecece;
border-top-right-radius: 0.25rem;
box-shadow: 1px 0 #fcfcfc inset; }
.com_cpanel .module-dropdown > a:hover, .com_cpanel .module-dropdown > a[aria-expanded*="true"] {
background-color: #f0f0f0;
border-left-color: transparent;
box-shadow: 1px 0 rgba(0, 0, 0, 0.1) inset; }
box-shadow: none; }

.admin.com_modules .js-stools-container-bar .btn-toolbar {
float: left; }
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/atum/css/template.css.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions administrator/templates/atum/css/template.min.css
View file

Large diffs are not rendered by default.

38 changes: 29 additions & 9 deletions administrator/templates/atum/scss/_variables.scss
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
// Global
$enable-flex: true;
$atum-template-color: #27283a;
$atum-gradient-inner: #163f46;
$atum-gradient-outer: $atum-template-color;
$atum-container-main-bg: #eee;
$white: #fcfcfc;
$atum-template-color: #27283a !default;
$atum-container-main-bg: #eee !default;
$atum-border-color: #cecece !default;
$atum-box-shadow: 0 0 3px rgba(0,0,0,.075) !default;
$atum-block-header-bg: #f5f5f5 !default;
$white-offset: #fcfcfc;
$grey: #aaa;

$brand-primary: #0275d8;
$brand-success: #5cb85c;
$brand-info: #5bc0de;
$brand-warning: #f0ad4e;
$brand-danger: #d9534f;

// Header
$header-height: 50px;

// Toolbar
$atum-toolbar-line-height: 1.8rem;

// Menu Toggle
$atum-button-width: 40px;
$atum-button-height: 50px;
Expand All @@ -20,8 +30,11 @@ $atum-button-transistion-duration: .3s;

// Sidebar
$atum-sidebar-bg: $atum-template-color;
$atum-sidebar-item-title: .9rem;
$atum-sidebar-hover: #5b8dca;
$atum-sidebar-active: lighten($atum-template-color, 17%);
$atum-level-1-bg: darken($atum-template-color, 6%);
$atum-level-2-bg: darken($atum-template-color, 8%);

// Fonts
$font-family-base: Arial, sans-serif;
Expand All @@ -40,22 +53,29 @@ $fa-font-path: "../../../../media/vendor/font-awesome/fonts"
$table-bg: transparent !default;
$table-bg-accent: rgba(0, 0, 0, .03) !default;

// Tabs
$atum-tabs-header-bg: $atum-block-header-bg;
$atum-tabs-active-bg: rgba(0,0,0,.03);
$atum-tabs-active-highlight: $brand-primary;

// Cards
$atum-card-title-bg: #f5f5f5;
$atum-card-title-bg: $atum-block-header-bg;
$atum-card-title-icon-bg: $atum-block-header-bg;
$atum-card-title-icon-bg-hover: darken($atum-card-title-bg, 2%);
$card-bg-color-light: #f8f8f8;
$card-bg-color-dark: $atum-template-color;
$card-border-color: rgba(0, 0, 0, .17);
$card-border-color: $atum-border-color;

// Switchers
$switcher-color-success: rgb(100, 189, 99);
$switcher-color-danger: rgb(188, 101, 100);
$switcher-color-primary: rgb(100, 143, 186);

// List
$list-group-bg: $white;
$list-group-bg: $white-offset;

// Custom form
$custom-select-bg: $white;
$custom-select-bg: $white-offset;

// BS4-alpha.5 | custom-select SVG override
// This was broken in alpha.5 so be sure to remove this when it's fixed again
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/atum/scss/blocks/_form.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.form-control {
max-width: 240px;
background-color: $white;
background-color: $white-offset;

&.input-xlarge {
max-width: 350px;
Expand Down
8 changes: 4 additions & 4 deletions administrator/templates/atum/scss/blocks/_header.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
position: relative;
z-index: 1;
height: $header-height;
background: $white;
border-bottom: 1px solid rgba(0, 0, 0, .17);
background: $white-offset;
border-bottom: 1px solid $atum-border-color;

.page-title {
display: inline-block;
Expand Down Expand Up @@ -52,8 +52,8 @@
width: 55px;
padding: 0;
line-height: $header-height;
border-left: 1px solid rgba(0, 0, 0, .125);
box-shadow: 1px 0 $white inset;
border-left: 1px solid $atum-border-color;
box-shadow: 1px 0 $white-offset inset;

.fa {
font-size: 1.4rem;
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/atum/scss/blocks/_icons.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
content: "\f125";
}
.icon-white {
color: $white;
color: $white-offset;
}
.icon-publish {
color: $brand-success;
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/atum/scss/blocks/_quickicons.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
padding: 25px 0;
margin-bottom: 15px;
overflow: hidden;
color: $white;
color: $white-offset;
text-align: center;
text-transform: uppercase;
background-color: $atum-template-color;
Expand Down
Loading

0 comments on commit ecaaabc

Please sign in to comment.