jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor(global): with mikolay rewview(little fixes)

pull/3/head
alex 2016-02-17 18:21:21 +03:00
parent 6e13e4b5a2
commit 69759990d4
10 changed files with 85 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js
View File

@ -83,7 +83,7 @@
id: 'g1', id: 'g1',
bullet: 'none', bullet: 'none',
useLineColorForBulletBorder: true, useLineColorForBulletBorder: true,
lineColor: 'rgba(0,0,0,0.6)', lineColor: 'rgba(0,0,0,0.4)',
lineThickness: 1, lineThickness: 1,
negativeLineColor: layoutColors.danger, negativeLineColor: layoutColors.danger,
type: 'smoothedLine', type: 'smoothedLine',

8
src/app/pages/ui/alerts/alerts.html
View File

@ -5,7 +5,7 @@
ba-panel ba-panel
ba-panel-title="Basic" ba-panel-title="Basic"
ba-panel-class="with-scroll"> ba-panel-class="with-scroll">
<div class="default-color"> <div >
<div class="alert bg-success"> <div class="alert bg-success">
<strong>Well done!</strong> You successfully read this important alert message. <strong>Well done!</strong> You successfully read this important alert message.
</div> </div>
@ -25,7 +25,7 @@
ba-panel ba-panel
ba-panel-title="Dismissible alerts" ba-panel-title="Dismissible alerts"
ba-panel-class="with-scroll"> ba-panel-class="with-scroll">
<div class="default-color"> <div >
<div class="alert bg-success closeable" role="alert"><button type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button> <div class="alert bg-success closeable" role="alert"><button type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<strong>Well done!</strong> You successfully read this important alert message. <strong>Well done!</strong> You successfully read this important alert message.
</div> </div>
@ -49,7 +49,7 @@
ba-panel ba-panel
ba-panel-title="Links in alerts" ba-panel-title="Links in alerts"
ba-panel-class="with-scroll"> ba-panel-class="with-scroll">
<div class="default-color"> <div >
<div class="alert bg-success"> <div class="alert bg-success">
<strong>Well done!</strong> You successfully read <a href class="alert-link">this important alert message</a>. <strong>Well done!</strong> You successfully read <a href class="alert-link">this important alert message</a>.
</div> </div>
@ -69,7 +69,7 @@
ba-panel ba-panel
ba-panel-title="Composite alerts" ba-panel-title="Composite alerts"
ba-panel-class="with-scroll"> ba-panel-class="with-scroll">
<div class="default-color"> <div >
<div class="alert bg-warning"> <div class="alert bg-warning">
<h4 class="default-color">Warning!</h4> <h4 class="default-color">Warning!</h4>
<strong>Pay attention.</strong> Change a few things up and try submitting again. <strong>Pay attention.</strong> Change a few things up and try submitting again.

1
src/app/theme/theme.module.js
View File

@ -9,6 +9,7 @@
'toastr', 'toastr',
'chart.js', 'chart.js',
'angular-chartist', 'angular-chartist',
'angular.morris-chart',
'textAngular', 'textAngular',
'BlurAdmin.theme.components' 'BlurAdmin.theme.components'
]); ]);

13
src/sass/app/_alerts.scss
View File

@ -23,3 +23,16 @@
color: $input-border; color: $input-border;
} }
} }
.bg-success {
background-color: $success;
}
.bg-info {
background-color: $info;
}
.bg-warning {
background-color: $warning;
}
.bg-danger {
background-color: $danger;
}

16
src/sass/app/_form.scss
View File

@ -45,7 +45,7 @@
box-shadow: none; box-shadow: none;
&:focus { &:focus {
box-shadow: none; box-shadow: none;
border-color: $input-border-focus; border-color: $primary-bg;
background: #ffffff; background: #ffffff;
} }
} }
@ -227,7 +227,7 @@ label.custom-checkbox {
font-family: fontAwesome; font-family: fontAwesome;
font-weight: $font-normal; font-weight: $font-normal;
font-size: 12px; font-size: 12px;
color: $input-border-focus; color: $default;
content: "\a0"; content: "\a0";
background-color: transparent; background-color: transparent;
border: 1px solid #c8c8c8; border: 1px solid #c8c8c8;
@ -245,7 +245,7 @@ label.custom-checkbox {
} }
&:hover { &:hover {
&:before { &:before {
border-color: $input-border-focus; border-color: $primary-bg;
} }
} }
} }
@ -350,15 +350,15 @@ label.custom-input-danger {
} }
.has-success { .has-success {
@include validationState($success, $success-dark); @include validationState($success-bg, $success);
} }
.has-warning { .has-warning {
@include validationState($warning-dark, #4f571a); @include validationState($warning-bg, $warning);
} }
.has-error { .has-error {
@include validationState($danger, $danger-dark); @include validationState($danger-bg, $danger);
} }
.has-feedback label ~ .form-control-feedback { .has-feedback label ~ .form-control-feedback {
@ -501,3 +501,7 @@ label.custom-input-danger {
.progress-bar-danger { .progress-bar-danger {
background-color: $danger; background-color: $danger;
} }
.has-success .input-group-addon {
border: none;
}

67
src/sass/theme/_table.scss
View File

@ -3,7 +3,7 @@
& > thead { & > thead {
& > tr { & > tr {
& > th { & > th {
border-bottom: 1px solid rgba(255,255,255,0.5); border-bottom: 1px solid rgba(255, 255, 255, 0.1);
white-space: nowrap; white-space: nowrap;
&:first-child { &:first-child {
text-align: center; text-align: center;
@ -22,7 +22,7 @@
& > td { & > td {
padding: 0px 8px; padding: 0px 8px;
line-height: 35px; line-height: 35px;
border-top: 1px solid rgba(255,255,255,0.5); border-top: 1px solid rgba(255, 255, 255, 0.1);
&:first-child { &:first-child {
text-align: center; text-align: center;
} }
@ -32,8 +32,11 @@
} }
} }
} }
&.table-bordered th { &.table-bordered {
border-color: rgba(255,255,255,0.5) !important; border-color: rgba(255, 255, 255, 0.2) !important;
th, td {
border-color: rgba(255, 255, 255, 0.2) !important;
}
} }
} }
@ -54,7 +57,6 @@
} }
} }
.editable-tr-wrap { .editable-tr-wrap {
.editable-wrap { .editable-wrap {
vertical-align: super; vertical-align: super;
@ -75,7 +77,7 @@
margin-bottom: 10px; margin-bottom: 10px;
} }
.select-page-size-wrap{ .select-page-size-wrap {
width: 150px; width: 150px;
} }
@ -174,28 +176,28 @@ input.search-input {
border-bottom-right-radius: 0px; border-bottom-right-radius: 0px;
} }
.status-button{ .status-button {
width: 60px; width: 60px;
} }
.table{ .table {
.editable-wrap .editable-controls, .editable-wrap .editable-error{ .editable-wrap .editable-controls, .editable-wrap .editable-error {
vertical-align: sub; vertical-align: sub;
.btn{ .btn {
&.dropdown-toggle{ &.dropdown-toggle {
padding: 3px 20px; padding: 3px 20px;
margin-top: 3px; margin-top: 3px;
} }
padding: 3px 8px; padding: 3px 8px;
} }
input{ input {
line-height: 1px; line-height: 1px;
height: 30px; height: 30px;
} }
} }
} }
.form-inline button[type="submit"].editable-table-button{ .form-inline button[type="submit"].editable-table-button {
margin-left: 0; margin-left: 0;
} }
@ -217,32 +219,32 @@ body.badmin-transparent {
} }
} }
.black-muted-bg{ .black-muted-bg {
background-color: rgba(0, 0, 0, 0.25); background-color: rgba(0, 0, 0, 0.1);
} }
.table-hover{ .table-hover {
tr:hover { tr:hover {
background-color: rgba(0, 0, 0, 0.25); background-color: rgba(0, 0, 0, 0.1);
} }
} }
.table-striped > tbody > tr:nth-of-type(odd){ .table-striped > tbody > tr:nth-of-type(odd) {
background-color: rgba(0, 0, 0, 0.25); background-color: rgba(0, 0, 0, 0.1);
} }
.table > tbody > tr.primary > td{ .table > tbody > tr.primary > td {
background-color: $primary; background-color: $primary;
} }
.table > tbody > tr.success > td{ .table > tbody > tr.success > td {
background-color: $success; background-color: $success;
} }
.table > tbody > tr.warning > td{ .table > tbody > tr.warning > td {
background-color: $warning; background-color: $warning;
} }
.table > tbody > tr.danger > td{ .table > tbody > tr.danger > td {
background-color: $danger; background-color: $danger;
} }
.table > tbody > tr.info > td{ .table > tbody > tr.info > td {
background-color: $info; background-color: $info;
} }
@ -251,3 +253,20 @@ body.badmin-transparent {
border-bottom: dashed 1px $default; border-bottom: dashed 1px $default;
} }
} }
th {
font-weight: $font-normal;
}
.editable-empty{
color: $danger-dark;
}
.table > thead > tr > th,
.table > tbody > tr > th,
.table > tfoot > tr > th,
.table > thead > tr > td,
.table > tbody > tr > td,
.table > tfoot > tr > td {
}

2
src/sass/theme/dashboard/_calendar.scss
View File

@ -744,7 +744,7 @@ body.badmin-transparent{
} }
.fc td{ .fc td{
border-color: rgba(255,255,255,0.3); border-color: rgba(255,255,255,0.1);
} }
.fc-today-button, .fc-month-button, .fc-agendaWeek-button, .fc-agendaDay-button { .fc-today-button, .fc-month-button, .fc-agendaWeek-button, .fc-agendaDay-button {

1
src/sass/theme/dashboard/_timeline.scss
View File

@ -1,4 +1,5 @@
#cd-timeline { #cd-timeline {
margin-top: 15px;
position: relative; position: relative;
&:before { &:before {

2
src/sass/theme/dashboard/_todo.scss
View File

@ -165,7 +165,7 @@ body.badmin-transparent {
} }
.blur-box { .blur-box {
height: 100%; height: 100%;
background: linear-gradient(to right, rgba(0,0,0,0.3) 0%,rgba(255,255,255,0) 100%); background: linear-gradient(to right, rgba(255,255,255,0.3) 0%,rgba(255,255,255,0) 100%);
-webkit-filter: blur(3px); -webkit-filter: blur(3px);
} }
} }

19
src/sass/theme/skins/_02_transparent.scss
View File

@ -1,24 +1,25 @@
body.badmin-transparent { body.badmin-transparent {
@include overrideColors(#fff); @include overrideColors(#fff);
@include overridePanelBg(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.9)); @include overridePanelBg(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.9));
.default-color{ .default-color {
color: $default-text!important;; color: $default-text !important;;
} }
.panel.panel-blur{ .panel.panel-blur {
@include scrollbars(.4em, rgba(0,0,0,0.7), rgba(255,255,255,0.8)); @include scrollbars(.4em, rgba(0, 0, 0, 0.7), rgba(255, 255, 255, 0.8));
border-radius: 5px; border-radius: 5px;
color: $default; color: $default;
.panel-heading{ .panel-heading {
border-bottom: 1px solid rgba(0,0,0,0.12); border-bottom: 1px solid rgba(0, 0, 0, 0.12);
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12); box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
} }
} }
.btn-default{ .btn-default {
color: $default; color: $default;
} }
.form-control, .bootstrap-tagsinput input { .form-control, .bootstrap-tagsinput input {
@include placeholderStyle($default, 0.8); @include placeholderStyle($default, 0.9);
background-color: transparent; background-color: rgba(0, 0, 0, .15);
border-radius: 5px;
color: $default; color: $default;
} }
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {