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

View File

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

View File

@ -5,7 +5,7 @@
ba-panel
ba-panel-title="Basic"
ba-panel-class="with-scroll">
<div class="default-color">
<div >
<div class="alert bg-success">
<strong>Well done!</strong> You successfully read this important alert message.
</div>
@ -25,7 +25,7 @@
ba-panel
ba-panel-title="Dismissible alerts"
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>
<strong>Well done!</strong> You successfully read this important alert message.
</div>
@ -49,7 +49,7 @@
ba-panel
ba-panel-title="Links in alerts"
ba-panel-class="with-scroll">
<div class="default-color">
<div >
<div class="alert bg-success">
<strong>Well done!</strong> You successfully read <a href class="alert-link">this important alert message</a>.
</div>
@ -69,7 +69,7 @@
ba-panel
ba-panel-title="Composite alerts"
ba-panel-class="with-scroll">
<div class="default-color">
<div >
<div class="alert bg-warning">
<h4 class="default-color">Warning!</h4>
<strong>Pay attention.</strong> Change a few things up and try submitting again.

View File

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

View File

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

View File

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

View File

@ -3,7 +3,7 @@
& > thead {
& > tr {
& > th {
border-bottom: 1px solid rgba(255,255,255,0.5);
border-bottom: 1px solid rgba(255, 255, 255, 0.1);
white-space: nowrap;
&:first-child {
text-align: center;
@ -22,7 +22,7 @@
& > td {
padding: 0px 8px;
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 {
text-align: center;
}
@ -32,8 +32,11 @@
}
}
}
&.table-bordered th {
border-color: rgba(255,255,255,0.5) !important;
&.table-bordered {
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-wrap {
vertical-align: super;
@ -218,17 +220,17 @@ body.badmin-transparent {
}
.black-muted-bg {
background-color: rgba(0, 0, 0, 0.25);
background-color: rgba(0, 0, 0, 0.1);
}
.table-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) {
background-color: rgba(0, 0, 0, 0.25);
background-color: rgba(0, 0, 0, 0.1);
}
.table > tbody > tr.primary > td {
background-color: $primary;
@ -251,3 +253,20 @@ body.badmin-transparent {
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 {
}

View File

@ -744,7 +744,7 @@ body.badmin-transparent{
}
.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 {

View File

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

View File

@ -165,7 +165,7 @@ body.badmin-transparent {
}
.blur-box {
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);
}
}

View File

@ -17,8 +17,9 @@ body.badmin-transparent {
color: $default;
}
.form-control, .bootstrap-tagsinput input {
@include placeholderStyle($default, 0.8);
background-color: transparent;
@include placeholderStyle($default, 0.9);
background-color: rgba(0, 0, 0, .15);
border-radius: 5px;
color: $default;
}
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {