Skip to content

O
OpnSense
Commit b50b4cd7 authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

themes: apply whitespace cleanups

parent 17568c17
Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 213 deletions
src/www/themes/opnsense/assets/javascripts/bootstrap.js
View file @ b50b4cd7
...@@ -2104,4 +2104,3 @@ ...@@ -2104,4 +2104,3 @@
} }
}(jQuery); }(jQuery);
src/www/themes/opnsense/assets/javascripts/jquery-sortable.js
View file @ b50b4cd7
...@@ -676,4 +676,4 @@ ...@@ -676,4 +676,4 @@
}); });
}; };
}(jQuery, window, 'sortable'); }(jQuery, window, 'sortable');
\ No newline at end of file
src/www/themes/opnsense/assets/javascripts/main.js
View file @ b50b4cd7
$(document).ready(function(){ $(document).ready(function(){
$('#btn-filter').click(function () { $('#btn-filter').click(function () {
var btn = $(this) var btn = $(this)
btn.button('loading') btn.button('loading')
/* /*
$.ajax(...).always(function () { $.ajax(...).always(function () {
btn.button('reset') btn.button('reset')
}); });
*/ */
}); });
$(' #system, $(' #system,
#interfaces, #interfaces,
#firewall, #firewall,
#services, #services,
#vpn, #vpn,
#status, #status,
#diagnostics, #diagnostics,
#help #help
').on('show.bs.collapse', function () { ').on('show.bs.collapse', function () {
// remove all actives // remove all actives
$("#mainmenu a.active-menu-title").removeClass('active-menu-title'); $("#mainmenu a.active-menu-title").removeClass('active-menu-title');
$("#mainmenu a + div.active-menu").removeClass('active-menu'); $("#mainmenu a + div.active-menu").removeClass('active-menu');
// remove all collaped // remove all collaped
$("#mainmenu .collapse.in").not(this).collapse('hide'); $("#mainmenu .collapse.in").not(this).collapse('hide');
$(this).prev('a').addClass('active-menu-title'); $(this).prev('a').addClass('active-menu-title');
$(this).addClass('active-menu'); $(this).addClass('active-menu');
}); });
}); });
\ No newline at end of file
src/www/themes/opnsense/assets/stylesheets/bootstrap/_buttons.scss
View file @ b50b4cd7
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
white-space: nowrap; white-space: nowrap;
@include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base); @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
@include user-select(none); @include user-select(none);
@include button-variant($btn-default-color, $btn-default-bg, $btn-default-border); @include button-variant($btn-default-color, $btn-default-bg, $btn-default-border);
&, &,
......
src/www/themes/opnsense/assets/stylesheets/bootstrap/_list-group.scss
View file @ b50b4cd7
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
a.list-group-item { a.list-group-item {
color: $list-group-link-color; color: $list-group-link-color;
border-radius: 0; border-radius: 0;
.list-group-item-heading { .list-group-item-heading {
color: $list-group-link-heading-color; color: $list-group-link-heading-color;
...@@ -63,16 +63,16 @@ a.list-group-item { ...@@ -63,16 +63,16 @@ a.list-group-item {
text-decoration: none; text-decoration: none;
color: $list-group-link-hover-color; color: $list-group-link-hover-color;
background-color: $list-group-hover-bg; background-color: $list-group-hover-bg;
&:before{ &:before{
background: $list-group-active-border; background: $list-group-active-border;
content: ""; content: "";
height: 42px; height: 42px;
left: 0; left: 0;
position: absolute; position: absolute;
top:0; top:0;
width: 3px; width: 3px;
} }
} }
} }
...@@ -98,17 +98,17 @@ a.list-group-item { ...@@ -98,17 +98,17 @@ a.list-group-item {
&.active:hover, &.active:hover,
&.active:focus { &.active:focus {
z-index: 2; // Place active items above their siblings for proper border styling z-index: 2; // Place active items above their siblings for proper border styling
&:before{ &:before{
background: $list-group-active-border; background: $list-group-active-border;
content: ""; content: "";
height: 42px; height: 42px;
left: 0; left: 0;
position: absolute; position: absolute;
top:0px; top:0px;
width: 3px; width: 3px;
} }
// Force color to inherit for custom content // Force color to inherit for custom content
.list-group-item-heading, .list-group-item-heading,
.list-group-item-heading > small, .list-group-item-heading > small,
...@@ -118,17 +118,17 @@ a.list-group-item { ...@@ -118,17 +118,17 @@ a.list-group-item {
.list-group-item-text { .list-group-item-text {
color: $list-group-active-text-color; color: $list-group-active-text-color;
} }
+.collapse > .list-group-item{ +.collapse > .list-group-item{
&:before{ &:before{
background: $list-group-active-border; background: $list-group-active-border;
content: ""; content: "";
height: 42px; height: 42px;
left: 0; left: 0;
position: absolute; position: absolute;
top:0px; top:0px;
width: 3px; width: 3px;
} }
} }
} }
} }
......
src/www/themes/opnsense/assets/stylesheets/bootstrap/_variables.scss
View file @ b50b4cd7
...@@ -850,5 +850,3 @@ $page-header-border-color: $gray-lighter !default; ...@@ -850,5 +850,3 @@ $page-header-border-color: $gray-lighter !default;
$dl-horizontal-offset: $component-offset-horizontal !default; $dl-horizontal-offset: $component-offset-horizontal !default;
//** Horizontal line color. //** Horizontal line color.
$hr-border: $gray-lighter !default; $hr-border: $gray-lighter !default;
src/www/themes/opnsense/assets/stylesheets/bootstrap/mixins/_labels.scss
View file @ b50b4cd7
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
@mixin label-variant($color) { @mixin label-variant($color) {
background-color: $color; background-color: $color;
&[href] { &[href] {
&:hover, &:hover,
&:focus { &:focus {
......
src/www/themes/opnsense/assets/stylesheets/main.scss
View file @ b50b4cd7
...@@ -15,20 +15,20 @@ $zindex: ( ...@@ -15,20 +15,20 @@ $zindex: (
@font-face { @font-face {
font-family: 'SourceSansProBold'; font-family: 'SourceSansProBold';
src: url('/themes/opnsense/build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.woff') format('woff'), src: url('/themes/opnsense/build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.woff') format('woff'),
url('/themes/opnsense/build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.ttf') format('truetype'); url('/themes/opnsense/build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'SourceSansProSemibold'; font-family: 'SourceSansProSemibold';
src: url('/themes/opnsense/build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.woff') format('woff'), src: url('/themes/opnsense/build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.woff') format('woff'),
url('/themes/opnsense/build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf') format('truetype'); url('/themes/opnsense/build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'SourceSansProRegular'; font-family: 'SourceSansProRegular';
src: url('/themes/opnsense/build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.woff') format('woff'), src: url('/themes/opnsense/build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.woff') format('woff'),
url('/themes/opnsense/build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf') format('truetype'); url('/themes/opnsense/build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf') format('truetype');
} }
// Core variables and mixins // Core variables and mixins
...@@ -104,12 +104,12 @@ body{ ...@@ -104,12 +104,12 @@ body{
z-index: map-get($zindex, header); z-index: map-get($zindex, header);
} }
.page-content{ .page-content{
height: calc(100% - 52px); height: calc(100% - 52px);
padding-top: 52px; padding-top: 52px;
position: relative; position: relative;
z-index: map-get($zindex, main); z-index: map-get($zindex, main);
> .row{ > .row{
height: 100%; height: 100%;
} }
...@@ -118,13 +118,13 @@ body{ ...@@ -118,13 +118,13 @@ body{
.page-content-head{ .page-content-head{
background: map-get($colors, lightergrey); background: map-get($colors, lightergrey);
border-bottom: 1px solid rgba(#D9D9D9, .50); border-bottom: 1px solid rgba(#D9D9D9, .50);
padding-bottom: 15px; padding-bottom: 15px;
padding-top: 20px; padding-top: 20px;
.navbar-nav{ .navbar-nav{
width: 100%; width: 100%;
} }
h1,h2,h3{ h1,h2,h3{
line-height: 1; line-height: 1;
margin: 0; margin: 0;
...@@ -148,12 +148,12 @@ body{ ...@@ -148,12 +148,12 @@ body{
position: fixed; position: fixed;
top: 0; top: 0;
z-index: map-get($zindex, sidebar); z-index: map-get($zindex, sidebar);
@extend .hidden-xs; @extend .hidden-xs;
} }
.page-side-nav { .page-side-nav {
&--active{ &--active{
background: map-get($colors, lightgrey); background: map-get($colors, lightgrey);
border-left: 3px solid map-get($colors, orange); border-left: 3px solid map-get($colors, orange);
...@@ -174,17 +174,17 @@ body{ ...@@ -174,17 +174,17 @@ body{
.content-box{ .content-box{
background: #FFF; background: #FFF;
border: 1px solid map-get($colors, bordergrey);; border: 1px solid map-get($colors, bordergrey);;
@extend .clearfix; @extend .clearfix;
&-head{ &-head{
@extend .page-content-head; @extend .page-content-head;
} }
&-main{ &-main{
//background: map-get($colors, lightgrey); //background: map-get($colors, lightgrey);
padding-bottom: 15px; padding-bottom: 15px;
padding-top: 15px; padding-top: 15px;
} }
} }
...@@ -192,14 +192,14 @@ body{ ...@@ -192,14 +192,14 @@ body{
border-top: 0px; border-top: 0px;
margin-bottom: 15px; margin-bottom: 15px;
padding: 15px 0; padding: 15px 0;
> .tab-content{ > .tab-content{
margin-bottom: 0; margin-bottom: 0;
padding: 0 15px; padding: 0 15px;
} }
.tab-content:last-child{ .tab-content:last-child{
margin-bottom: 0; margin-bottom: 0;
} }
} }
...@@ -209,17 +209,17 @@ body{ ...@@ -209,17 +209,17 @@ body{
.brand-logo{ .brand-logo{
display: none; display: none;
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
display: inline-block; display: inline-block;
} }
} }
.brand-icon{ .brand-icon{
display: inline-block; display: inline-block;
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
display: none; display: none;
} }
} }
...@@ -243,11 +243,11 @@ body{ ...@@ -243,11 +243,11 @@ body{
.page-login{ .page-login{
background: map-get($colors, lightgrey); background: map-get($colors, lightgrey);
.container{ .container{
min-height: 100%; min-height: 100%;
margin-bottom: -60px; margin-bottom: -60px;
&:after{ &:after{
height: 60px; height: 60px;
} }
...@@ -260,41 +260,41 @@ body{ ...@@ -260,41 +260,41 @@ body{
color:#9F9F9F; color:#9F9F9F;
font-size: 12px; font-size: 12px;
height: 60px; height: 60px;
p{ p{
padding-top: 21px; padding-top: 21px;
} }
} }
.login-modal{ .login-modal{
&-container{ &-container{
background: #FFF; background: #FFF;
border: 1px solid map-get($colors, bordergrey); border: 1px solid map-get($colors, bordergrey);
max-width: 400px; max-width: 400px;
margin: 100px auto 15px auto; margin: 100px auto 15px auto;
} }
&-head{ &-head{
background: map-get($colors, darkgrey); background: map-get($colors, darkgrey);
height: 75px; height: 75px;
padding: 0 20px; padding: 0 20px;
} }
&-content{ &-content{
padding: 40px 20px 30px 20px; padding: 40px 20px 30px 20px;
} }
&-foot{ &-foot{
background: map-get($colors, lightgrey); background: map-get($colors, lightgrey);
border-top: 1px solid map-get($colors, bordergrey); border-top: 1px solid map-get($colors, bordergrey);
height: 60px; height: 60px;
padding: 20px 20px 0 20px; padding: 20px 20px 0 20px;
a{ a{
color: #7D7D7D; color: #7D7D7D;
text-decoration: none; text-decoration: none;
&:hover{ &:hover{
color: darken(#7D7D7D, 10%); color: darken(#7D7D7D, 10%);
text-decoration: underline; text-decoration: underline;
...@@ -315,25 +315,25 @@ body{ ...@@ -315,25 +315,25 @@ body{
} }
.table-sort{ .table-sort{
> tbody > tr > th{ > tbody > tr > th{
border-top: 0; border-top: 0;
height: 50px; height: 50px;
&:hover{ &:hover{
background: #F2F2F2; background: #F2F2F2;
cursor: pointer; cursor: pointer;
} }
} }
> tbody > tr > td, > tbody > tr > th{ > tbody > tr > td, > tbody > tr > th{
vertical-align: middle; vertical-align: middle;
} }
&-icon{ &-icon{
font-size: 10px; font-size: 10px;
} }
.btn-group-table{ .btn-group-table{
padding-right: 15px; padding-right: 15px;
} }
...@@ -351,7 +351,7 @@ body{ ...@@ -351,7 +351,7 @@ body{
.list-group-item{ .list-group-item{
border-left: none; border-left: none;
border-right: none; border-right: none;
&.collapsed .caret{ &.collapsed .caret{
border-bottom: 4px solid green; border-bottom: 4px solid green;
border-top: 0; border-top: 0;
...@@ -362,14 +362,14 @@ body{ ...@@ -362,14 +362,14 @@ body{
display: block !important; display: block !important;
} }
.list-group-submenu .list-group-item:last-child, .list-group-submenu .list-group-item:last-child,
.collapse .list-group-item:last-child { .collapse .list-group-item:last-child {
border-bottom: none; border-bottom: none;
} }
.nav-tabs > li.active > a{ .nav-tabs > li.active > a{
background: #FFF !important; background: #FFF !important;
} }
.nav-tabs > li > a{ .nav-tabs > li > a{
border-radius: 0px; border-radius: 0px;
...@@ -378,7 +378,7 @@ body{ ...@@ -378,7 +378,7 @@ body{
.nav-tabs.nav-justified{ .nav-tabs.nav-justified{
border-right:1px solid map-get($colors, bordergrey); border-right:1px solid map-get($colors, bordergrey);
> li > a{ > li > a{
border-bottom:1px solid map-get($colors, bordergrey); border-bottom:1px solid map-get($colors, bordergrey);
border-top:1px solid map-get($colors, bordergrey); border-top:1px solid map-get($colors, bordergrey);
...@@ -387,30 +387,30 @@ body{ ...@@ -387,30 +387,30 @@ body{
background: map-get($colors, lightgrey); background: map-get($colors, lightgrey);
color: map-get($colors, darkgrey); color: map-get($colors, darkgrey);
font-family: 'SourceSansProSemibold'; font-family: 'SourceSansProSemibold';
@media (min-width:$screen-sm-min){ @media (min-width:$screen-sm-min){
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
} }
} }
> li.active a{ > li.active a{
@media (max-width:$screen-xs-max){ @media (max-width:$screen-xs-max){
border-right: 0 !important; border-right: 0 !important;
}
} }
}
> li.active + li > a{ > li.active + li > a{
@media (min-width:$screen-sm-min){ @media (min-width:$screen-sm-min){
border-left: 1px solid transparent; border-left: 1px solid transparent;
}
} }
}
> li:last-child > a{ > li:last-child > a{
border-right:1px solid transparent !important; border-right:1px solid transparent !important;
@media (max-width:$screen-xs-max){ @media (max-width:$screen-xs-max){
margin-bottom: 0; margin-bottom: 0;
} }
} }
} }
...@@ -471,15 +471,15 @@ table{ ...@@ -471,15 +471,15 @@ table{
.list-group-item{ .list-group-item{
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
+ div.collapse{ + div.collapse{
margin-bottom: -1px; margin-bottom: -1px;
} }
+ div > a{ + div > a{
padding-left: 44px; padding-left: 44px;
} }
&:before{ &:before{
background: #EA7105; background: #EA7105;
content: ""; content: "";
...@@ -489,7 +489,7 @@ table{ ...@@ -489,7 +489,7 @@ table{
position: absolute; position: absolute;
top: 0px; top: 0px;
width: 0; width: 0;
-webkit-transition: width .2s; -webkit-transition: width .2s;
-moz-transition: width .2s; -moz-transition: width .2s;
-o-transition: width .2s; -o-transition: width .2s;
...@@ -507,11 +507,11 @@ table{ ...@@ -507,11 +507,11 @@ table{
text-decoration: none; text-decoration: none;
position: relative; position: relative;
background-color: #F5F5F5; background-color: #F5F5F5;
&:before{ &:before{
width: 3px; width: 3px;
} }
&.active{ &.active{
background-color: #E8E8E8; background-color: #E8E8E8;
} }
...@@ -557,4 +557,4 @@ table{ ...@@ -557,4 +557,4 @@ table{
.widgetdiv { .widgetdiv {
padding-top:0px !important; padding-top:0px !important;
padding-bottom:20px; padding-bottom:20px;
} }
src/www/themes/sample/assets/javascripts/bootstrap.js
View file @ b50b4cd7
...@@ -2104,4 +2104,3 @@ ...@@ -2104,4 +2104,3 @@
} }
}(jQuery); }(jQuery);
src/www/themes/sample/assets/javascripts/jquery-sortable.js
View file @ b50b4cd7
...@@ -676,4 +676,4 @@ ...@@ -676,4 +676,4 @@
}); });
}; };
}(jQuery, window, 'sortable'); }(jQuery, window, 'sortable');
\ No newline at end of file
src/www/themes/sample/assets/javascripts/main.js
View file @ b50b4cd7
$(document).ready(function(){ $(document).ready(function(){
$('#btn-filter').click(function () { $('#btn-filter').click(function () {
var btn = $(this) var btn = $(this)
btn.button('loading') btn.button('loading')
/* /*
$.ajax(...).always(function () { $.ajax(...).always(function () {
btn.button('reset') btn.button('reset')
}); });
*/ */
}); });
$(' #system, $(' #system,
#interfaces, #interfaces,
#firewall, #firewall,
#services, #services,
#vpn, #vpn,
#status, #status,
#diagnostics, #diagnostics,
#help #help
').on('show.bs.collapse', function () { ').on('show.bs.collapse', function () {
// remove all actives // remove all actives
$("#mainmenu a.active-menu-title").removeClass('active-menu-title'); $("#mainmenu a.active-menu-title").removeClass('active-menu-title');
$("#mainmenu a + div.active-menu").removeClass('active-menu'); $("#mainmenu a + div.active-menu").removeClass('active-menu');
// remove all collaped // remove all collaped
$("#mainmenu .collapse.in").not(this).collapse('hide'); $("#mainmenu .collapse.in").not(this).collapse('hide');
$(this).prev('a').addClass('active-menu-title'); $(this).prev('a').addClass('active-menu-title');
$(this).addClass('active-menu'); $(this).addClass('active-menu');
}); });
}); });
\ No newline at end of file
src/www/themes/sample/assets/stylesheets/bootstrap/_buttons.scss
View file @ b50b4cd7
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
white-space: nowrap; white-space: nowrap;
@include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base); @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
@include user-select(none); @include user-select(none);
@include button-variant($btn-default-color, $btn-default-bg, $btn-default-border); @include button-variant($btn-default-color, $btn-default-bg, $btn-default-border);
&, &,
......
src/www/themes/sample/assets/stylesheets/bootstrap/_list-group.scss
View file @ b50b4cd7
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
a.list-group-item { a.list-group-item {
color: $list-group-link-color; color: $list-group-link-color;
border-radius: 0; border-radius: 0;
.list-group-item-heading { .list-group-item-heading {
color: $list-group-link-heading-color; color: $list-group-link-heading-color;
...@@ -63,16 +63,16 @@ a.list-group-item { ...@@ -63,16 +63,16 @@ a.list-group-item {
text-decoration: none; text-decoration: none;
color: $list-group-link-hover-color; color: $list-group-link-hover-color;
background-color: $list-group-hover-bg; background-color: $list-group-hover-bg;
&:before{ &:before{
background: $list-group-active-border; background: $list-group-active-border;
content: ""; content: "";
height: 42px; height: 42px;
left: 0; left: 0;
position: absolute; position: absolute;
top:0; top:0;
width: 3px; width: 3px;
} }
} }
} }
...@@ -98,17 +98,17 @@ a.list-group-item { ...@@ -98,17 +98,17 @@ a.list-group-item {
&.active:hover, &.active:hover,
&.active:focus { &.active:focus {
z-index: 2; // Place active items above their siblings for proper border styling z-index: 2; // Place active items above their siblings for proper border styling
&:before{ &:before{
background: $list-group-active-border; background: $list-group-active-border;
content: ""; content: "";
height: 42px; height: 42px;
left: 0; left: 0;
position: absolute; position: absolute;
top:0px; top:0px;
width: 3px; width: 3px;
} }
// Force color to inherit for custom content // Force color to inherit for custom content
.list-group-item-heading, .list-group-item-heading,
.list-group-item-heading > small, .list-group-item-heading > small,
...@@ -118,17 +118,17 @@ a.list-group-item { ...@@ -118,17 +118,17 @@ a.list-group-item {
.list-group-item-text { .list-group-item-text {
color: $list-group-active-text-color; color: $list-group-active-text-color;
} }
+.collapse > .list-group-item{ +.collapse > .list-group-item{
&:before{ &:before{
background: $list-group-active-border; background: $list-group-active-border;
content: ""; content: "";
height: 42px; height: 42px;
left: 0; left: 0;
position: absolute; position: absolute;
top:0px; top:0px;
width: 3px; width: 3px;
} }
} }
} }
} }
......
src/www/themes/sample/assets/stylesheets/bootstrap/_variables.scss
View file @ b50b4cd7
...@@ -850,5 +850,3 @@ $page-header-border-color: $gray-lighter !default; ...@@ -850,5 +850,3 @@ $page-header-border-color: $gray-lighter !default;
$dl-horizontal-offset: $component-offset-horizontal !default; $dl-horizontal-offset: $component-offset-horizontal !default;
//** Horizontal line color. //** Horizontal line color.
$hr-border: $gray-lighter !default; $hr-border: $gray-lighter !default;
src/www/themes/sample/assets/stylesheets/bootstrap/mixins/_labels.scss
View file @ b50b4cd7
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
@mixin label-variant($color) { @mixin label-variant($color) {
background-color: $color; background-color: $color;
&[href] { &[href] {
&:hover, &:hover,
&:focus { &:focus {
......
src/www/themes/sample/assets/stylesheets/config.codekit
View file @ b50b4cd7
...@@ -1950,4 +1950,4 @@ ...@@ -1950,4 +1950,4 @@
"websiteRelativeRoot": "" "websiteRelativeRoot": ""
}, },
"settingsFileVersion": "2" "settingsFileVersion": "2"
} }
\ No newline at end of file
src/www/themes/sample/assets/stylesheets/main.scss
View file @ b50b4cd7
...@@ -15,20 +15,20 @@ $zindex: ( ...@@ -15,20 +15,20 @@ $zindex: (
@font-face { @font-face {
font-family: 'SourceSansProBold'; font-family: 'SourceSansProBold';
src: url('../../build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.woff') format('woff'), src: url('../../build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.woff') format('woff'),
url('../../build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.ttf') format('truetype'); url('../../build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'SourceSansProSemibold'; font-family: 'SourceSansProSemibold';
src: url('../../build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.woff') format('woff'), src: url('../../build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.woff') format('woff'),
url('../../build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf') format('truetype'); url('../../build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'SourceSansProRegular'; font-family: 'SourceSansProRegular';
src: url('../../build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.woff') format('woff'), src: url('../../build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.woff') format('woff'),
url('../../build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf') format('truetype'); url('../../build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf') format('truetype');
} }
// Core variables and mixins // Core variables and mixins
...@@ -104,12 +104,12 @@ body{ ...@@ -104,12 +104,12 @@ body{
z-index: map-get($zindex, header); z-index: map-get($zindex, header);
} }
.page-content{ .page-content{
height: calc(100% - 52px); height: calc(100% - 52px);
padding-top: 52px; padding-top: 52px;
position: relative; position: relative;
z-index: map-get($zindex, main); z-index: map-get($zindex, main);
> .row{ > .row{
height: 100%; height: 100%;
} }
...@@ -118,13 +118,13 @@ body{ ...@@ -118,13 +118,13 @@ body{
.page-content-head{ .page-content-head{
background: map-get($colors, lightergrey); background: map-get($colors, lightergrey);
border-bottom: 1px solid rgba(#D9D9D9, .50); border-bottom: 1px solid rgba(#D9D9D9, .50);
padding-bottom: 15px; padding-bottom: 15px;
padding-top: 20px; padding-top: 20px;
.navbar-nav{ .navbar-nav{
width: 100%; width: 100%;
} }
h1,h2,h3{ h1,h2,h3{
line-height: 1; line-height: 1;
margin: 0; margin: 0;
...@@ -148,12 +148,12 @@ body{ ...@@ -148,12 +148,12 @@ body{
position: fixed; position: fixed;
top: 0; top: 0;
z-index: map-get($zindex, sidebar); z-index: map-get($zindex, sidebar);
@extend .hidden-xs; @extend .hidden-xs;
} }
.page-side-nav { .page-side-nav {
&--active{ &--active{
background: map-get($colors, lightgrey); background: map-get($colors, lightgrey);
border-left: 3px solid map-get($colors, orange); border-left: 3px solid map-get($colors, orange);
...@@ -174,17 +174,17 @@ body{ ...@@ -174,17 +174,17 @@ body{
.content-box{ .content-box{
background: #FFF; background: #FFF;
border: 1px solid map-get($colors, bordergrey);; border: 1px solid map-get($colors, bordergrey);;
@extend .clearfix; @extend .clearfix;
&-head{ &-head{
@extend .page-content-head; @extend .page-content-head;
} }
&-main{ &-main{
//background: map-get($colors, lightgrey); //background: map-get($colors, lightgrey);
padding-bottom: 15px; padding-bottom: 15px;
padding-top: 15px; padding-top: 15px;
} }
} }
...@@ -192,14 +192,14 @@ body{ ...@@ -192,14 +192,14 @@ body{
border-top: 0px; border-top: 0px;
margin-bottom: 15px; margin-bottom: 15px;
padding: 15px 0; padding: 15px 0;
> .tab-content{ > .tab-content{
margin-bottom: 0; margin-bottom: 0;
padding: 0 15px; padding: 0 15px;
} }
.tab-content:last-child{ .tab-content:last-child{
margin-bottom: 0; margin-bottom: 0;
} }
} }
...@@ -209,17 +209,17 @@ body{ ...@@ -209,17 +209,17 @@ body{
.brand-logo{ .brand-logo{
display: none; display: none;
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
display: inline-block; display: inline-block;
} }
} }
.brand-icon{ .brand-icon{
display: inline-block; display: inline-block;
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
display: none; display: none;
} }
} }
...@@ -243,11 +243,11 @@ body{ ...@@ -243,11 +243,11 @@ body{
.page-login{ .page-login{
background: map-get($colors, lightgrey); background: map-get($colors, lightgrey);
.container{ .container{
min-height: 100%; min-height: 100%;
margin-bottom: -60px; margin-bottom: -60px;
&:after{ &:after{
height: 60px; height: 60px;
} }
...@@ -260,41 +260,41 @@ body{ ...@@ -260,41 +260,41 @@ body{
color:#9F9F9F; color:#9F9F9F;
font-size: 12px; font-size: 12px;
height: 60px; height: 60px;
p{ p{
padding-top: 21px; padding-top: 21px;
} }
} }
.login-modal{ .login-modal{
&-container{ &-container{
background: #FFF; background: #FFF;
border: 1px solid map-get($colors, bordergrey); border: 1px solid map-get($colors, bordergrey);
max-width: 400px; max-width: 400px;
margin: 100px auto 15px auto; margin: 100px auto 15px auto;
} }
&-head{ &-head{
background: map-get($colors, darkgrey); background: map-get($colors, darkgrey);
height: 75px; height: 75px;
padding: 0 20px; padding: 0 20px;
} }
&-content{ &-content{
padding: 40px 20px 30px 20px; padding: 40px 20px 30px 20px;
} }
&-foot{ &-foot{
background: map-get($colors, lightgrey); background: map-get($colors, lightgrey);
border-top: 1px solid map-get($colors, bordergrey); border-top: 1px solid map-get($colors, bordergrey);
height: 60px; height: 60px;
padding: 20px 20px 0 20px; padding: 20px 20px 0 20px;
a{ a{
color: #7D7D7D; color: #7D7D7D;
text-decoration: none; text-decoration: none;
&:hover{ &:hover{
color: darken(#7D7D7D, 10%); color: darken(#7D7D7D, 10%);
text-decoration: underline; text-decoration: underline;
...@@ -315,25 +315,25 @@ body{ ...@@ -315,25 +315,25 @@ body{
} }
.table-sort{ .table-sort{
> tbody > tr > th{ > tbody > tr > th{
border-top: 0; border-top: 0;
height: 50px; height: 50px;
&:hover{ &:hover{
background: #F2F2F2; background: #F2F2F2;
cursor: pointer; cursor: pointer;
} }
} }
> tbody > tr > td, > tbody > tr > th{ > tbody > tr > td, > tbody > tr > th{
vertical-align: middle; vertical-align: middle;
} }
&-icon{ &-icon{
font-size: 10px; font-size: 10px;
} }
.btn-group-table{ .btn-group-table{
padding-right: 15px; padding-right: 15px;
} }
...@@ -351,7 +351,7 @@ body{ ...@@ -351,7 +351,7 @@ body{
.list-group-item{ .list-group-item{
border-left: none; border-left: none;
border-right: none; border-right: none;
&.collapsed .caret{ &.collapsed .caret{
border-bottom: 4px solid green; border-bottom: 4px solid green;
border-top: 0; border-top: 0;
...@@ -362,14 +362,14 @@ body{ ...@@ -362,14 +362,14 @@ body{
display: block !important; display: block !important;
} }
.list-group-submenu .list-group-item:last-child, .list-group-submenu .list-group-item:last-child,
.collapse .list-group-item:last-child { .collapse .list-group-item:last-child {
border-bottom: none; border-bottom: none;
} }
.nav-tabs > li.active > a{ .nav-tabs > li.active > a{
background: #FFF !important; background: #FFF !important;
} }
.nav-tabs > li > a{ .nav-tabs > li > a{
border-radius: 0px; border-radius: 0px;
...@@ -378,7 +378,7 @@ body{ ...@@ -378,7 +378,7 @@ body{
.nav-tabs.nav-justified{ .nav-tabs.nav-justified{
border-right:1px solid map-get($colors, bordergrey); border-right:1px solid map-get($colors, bordergrey);
> li > a{ > li > a{
border-bottom:1px solid map-get($colors, bordergrey); border-bottom:1px solid map-get($colors, bordergrey);
border-top:1px solid map-get($colors, bordergrey); border-top:1px solid map-get($colors, bordergrey);
...@@ -387,30 +387,30 @@ body{ ...@@ -387,30 +387,30 @@ body{
background: map-get($colors, lightgrey); background: map-get($colors, lightgrey);
color: map-get($colors, darkgrey); color: map-get($colors, darkgrey);
font-family: 'SourceSansProSemibold'; font-family: 'SourceSansProSemibold';
@media (min-width:$screen-sm-min){ @media (min-width:$screen-sm-min){
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
} }
} }
> li.active a{ > li.active a{
@media (max-width:$screen-xs-max){ @media (max-width:$screen-xs-max){
border-right: 0 !important; border-right: 0 !important;
}
} }
}
> li.active + li > a{ > li.active + li > a{
@media (min-width:$screen-sm-min){ @media (min-width:$screen-sm-min){
border-left: 1px solid transparent; border-left: 1px solid transparent;
}
} }
}
> li:last-child > a{ > li:last-child > a{
border-right:1px solid transparent !important; border-right:1px solid transparent !important;
@media (max-width:$screen-xs-max){ @media (max-width:$screen-xs-max){
margin-bottom: 0; margin-bottom: 0;
} }
} }
} }
...@@ -471,15 +471,15 @@ table{ ...@@ -471,15 +471,15 @@ table{
.list-group-item{ .list-group-item{
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
+ div.collapse{ + div.collapse{
margin-bottom: -1px; margin-bottom: -1px;
} }
+ div > a{ + div > a{
padding-left: 44px; padding-left: 44px;
} }
&:before{ &:before{
background: #EA7105; background: #EA7105;
content: ""; content: "";
...@@ -489,7 +489,7 @@ table{ ...@@ -489,7 +489,7 @@ table{
position: absolute; position: absolute;
top: 0px; top: 0px;
width: 0; width: 0;
-webkit-transition: width .2s; -webkit-transition: width .2s;
-moz-transition: width .2s; -moz-transition: width .2s;
-o-transition: width .2s; -o-transition: width .2s;
...@@ -507,11 +507,11 @@ table{ ...@@ -507,11 +507,11 @@ table{
text-decoration: none; text-decoration: none;
position: relative; position: relative;
background-color: #F5F5F5; background-color: #F5F5F5;
&:before{ &:before{
width: 3px; width: 3px;
} }
&.active{ &.active{
background-color: #E8E8E8; background-color: #E8E8E8;
} }
...@@ -552,4 +552,4 @@ table{ ...@@ -552,4 +552,4 @@ table{
} }
::-webkit-scrollbar-thumb:hover { ::-webkit-scrollbar-thumb:hover {
background:#e5e5e5; background:#e5e5e5;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023