Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2026-01-18 23:36:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

code reformat to follow the styles

Browse source
This commit is contained in:
nixa 2016-04-29 17:27:19 +03:00
parent 669b3df4b5
commit a8cd300ecc
26 changed files with 193 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/app/theme/sass/_buttons.scss
View file

@ -45,7 +45,7 @@ $hover: 24;
}
&.btn-default {
@include styleButton(transparent, $default);
&:focus, &:active:hover, &.active:hover, &:hover{
&:focus, &:active:hover, &.active:hover, &:hover {
background-color: rgba(0, 0, 0, 0.2);
color: $default;
}
@ -124,7 +124,6 @@ button.btn.btn-danger {
}
}
button.btn.btn-inverse {
@include buttonColor($help-text, $help-text);
color: $default;
@ -134,8 +133,6 @@ button.btn.btn-inverse {
}
}
.btn-with-icon {
i {
margin-right: 10px;

3
src/app/theme/sass/_icons.scss
View file

@ -22,7 +22,6 @@
@include svg-icon-class('person', 80, 80);
@include svg-icon-class('refresh', 80, 80);
@mixin png-icon($url, $width, $height) {
display: inline-block;
width: $width + px;
@ -37,4 +36,4 @@
}
}
//@include icon-png-class('arrival-icon', 11, 11);
//@include icon-png-class('arrival-icon', 11, 11);

19
src/app/theme/sass/_layout.scss
View file

@ -1,6 +1,6 @@
$left-space: 180px;
@include scrollbars(.5em, #d9d9d9, rgba(0,0,0,0));
@include scrollbars(.5em, #d9d9d9, rgba(0, 0, 0, 0));
html {
position: relative;
@ -18,14 +18,12 @@ body {
@include main-background();
}
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none)
{
html{
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
html {
overflow: hidden;
height: 100%;
}
body{
body {
overflow: auto;
height: 100%;
}
@ -36,9 +34,10 @@ a {
outline: 0 !important;
}
.body-bg{
.body-bg {
display: none;
}
.al-header {
display: block;
height: 49px;
@ -194,8 +193,8 @@ a {
}
.full-invisible {
visibility: hidden!important;
visibility: hidden !important;
* {
visibility: hidden!important;
visibility: hidden !important;
}
}
}

3
src/app/theme/sass/_preloader.scss
View file

@ -6,6 +6,7 @@
transform: rotate(360deg); /* Firefox 16+, IE 10+, Opera */
}
}
@-moz-keyframes spin {
0% {
-moz-transform: rotate(0deg); /* Firefox 16+*/
@ -74,4 +75,4 @@
animation: spin 1.5s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */
}
}
}
}

26
src/app/theme/sass/_table.scss
View file

@ -241,23 +241,23 @@ body.badmin-transparent {
background-color: rgba(0, 0, 0, 0.1);
}
.table > tbody > tr.primary > td {
background-color: rgba($primary,0.7);
background-color: rgba($primary, 0.7);
border: none;
}
.table > tbody > tr.success > td {
background-color: rgba($success,0.7);
background-color: rgba($success, 0.7);
border: none;
}
.table > tbody > tr.warning > td {
background-color: rgba($warning,0.7);
background-color: rgba($warning, 0.7);
border: none;
}
.table > tbody > tr.danger > td {
background-color: rgba($danger,0.7);
background-color: rgba($danger, 0.7);
border: none;
}
.table > tbody > tr.info > td {
background-color: rgba($info,0.7);
background-color: rgba($info, 0.7);
border: none;
}
@ -282,21 +282,21 @@ th {
.table-striped > tbody > tr > td {
border: none;
}
.pagination > li > a,
.pagination > li > span{
.pagination > li > span {
color: $default;
border-color: $default;
}
.pagination > li:first-of-type > a,
.pagination > li:first-of-type > span{
.pagination > li:first-of-type > span {
border-top-left-radius: 5px;
border-bottom-left-radius: 5px;
}
.pagination > li:last-of-type > a,
.pagination > li:last-of-type > span{
.pagination > li:last-of-type > span {
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
}
@ -314,11 +314,11 @@ th {
.pagination > li > a:hover,
.pagination > li > span:hover,
.pagination > li > a:focus,
.pagination > li > span:focus{
background-color: rgba(0,0,0,.2);
.pagination > li > span:focus {
background-color: rgba(0, 0, 0, .2);
color: $default;
}
.editable-buttons .btn-with-icon i {
margin-right: 0;
}
margin-right: 0;
}

15
src/app/theme/sass/bootstrap-overrides/_panel.scss
View file

@ -128,7 +128,7 @@ $panel-heading-font-size: 16px;
}
}
.panel.bootstrap-panel{
.panel.bootstrap-panel {
.panel-body, .panel-heading {
p, div, span {
color: $default-text;
@ -136,12 +136,12 @@ $panel-heading-font-size: 16px;
}
}
.accordion-panel.panel.bootstrap-panel{
.accordion-panel.panel.bootstrap-panel {
&.panel-primary,
&.panel-success,
&.panel-info,
&.panel-warning,
&.panel-danger{
&.panel-danger {
.panel-heading {
p, div, span {
color: rgba(255, 255, 255, 0.8);
@ -150,8 +150,8 @@ $panel-heading-font-size: 16px;
}
}
.panel-group .panel.accordion-panel{
.panel-heading{
.panel-group .panel.accordion-panel {
.panel-heading {
border-bottom: 0;
}
}
@ -170,15 +170,14 @@ $panel-heading-font-size: 16px;
height: 120px;
}
.footer-panel{
.footer-panel {
height: 142px;
}
.light-text{
.light-text {
font-weight: $font-light;
}
/*
.panel-group .panel {
border-radius: 0;

19
src/app/theme/sass/conf/_mixins.scss
View file

@ -41,6 +41,7 @@
@mixin bg-nr($relativeUrl) {
background: url($images-root + $relativeUrl) no-repeat 0 0;
}
@mixin bg($relativeUrl) {
background: url($images-root + $relativeUrl);
}
@ -93,22 +94,22 @@
@mixin overrideColors($color) {
p,
h1,h2,h3,h4,h5,h6,
h1, h2, h3, h4, h5, h6,
.pie-chart-item,
.panel-heading>.dropdown .dropdown-toggle,
.panel-heading > .dropdown .dropdown-toggle,
.panel-title,
ol.blur span,
ul.blur,
.popular-app-cost,
.popular-app-info,
.panel-title>.small,
.panel-title>.small>a,
.panel-title>a,
.panel-title>small,
.panel-title>small>a,
.panel-title > .small,
.panel-title > .small > a,
.panel-title > a,
.panel-title > small,
.panel-title > small > a,
.traffic-text span,
.form-group label,
.help-block{
.help-block {
color: $color;
}
.feed-message .message-time, .text-muted {
@ -125,4 +126,4 @@
.progress {
background: $color;
}
}
}

2
src/app/theme/sass/conf/_variables.scss
View file

@ -1,6 +1,6 @@
$font-family: 'Roboto', sans-serif;
$view-total :rgba(0,0,0,.4);
$view-total: rgba(0, 0, 0, .4);
$activelink: $primary;
$hoverlink: $primary-dark;