diff --git a/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js b/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js index 833d839..8fc4960 100644 --- a/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js +++ b/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js @@ -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', diff --git a/src/app/pages/ui/alerts/alerts.html b/src/app/pages/ui/alerts/alerts.html index 5452133..5fd6a6c 100644 --- a/src/app/pages/ui/alerts/alerts.html +++ b/src/app/pages/ui/alerts/alerts.html @@ -5,7 +5,7 @@ ba-panel ba-panel-title="Basic" ba-panel-class="with-scroll"> -
+
Well done! You successfully read this important alert message.
@@ -25,7 +25,7 @@ ba-panel ba-panel-title="Dismissible alerts" ba-panel-class="with-scroll"> -
+
@@ -49,7 +49,7 @@ ba-panel ba-panel-title="Links in alerts" ba-panel-class="with-scroll"> -
+
Well done! You successfully read this important alert message.
@@ -69,7 +69,7 @@ ba-panel ba-panel-title="Composite alerts" ba-panel-class="with-scroll"> -
+

Warning!

Pay attention. Change a few things up and try submitting again. diff --git a/src/app/theme/theme.module.js b/src/app/theme/theme.module.js index 0beceab..adf34ba 100644 --- a/src/app/theme/theme.module.js +++ b/src/app/theme/theme.module.js @@ -9,6 +9,7 @@ 'toastr', 'chart.js', 'angular-chartist', + 'angular.morris-chart', 'textAngular', 'BlurAdmin.theme.components' ]); diff --git a/src/sass/app/_alerts.scss b/src/sass/app/_alerts.scss index 0f0c6c4..ecb267a 100644 --- a/src/sass/app/_alerts.scss +++ b/src/sass/app/_alerts.scss @@ -22,4 +22,17 @@ button{ color: $input-border; } +} + +.bg-success { + background-color: $success; +} +.bg-info { + background-color: $info; +} +.bg-warning { + background-color: $warning; +} +.bg-danger { + background-color: $danger; } \ No newline at end of file diff --git a/src/sass/app/_form.scss b/src/sass/app/_form.scss index 75165e7..6d55a15 100644 --- a/src/sass/app/_form.scss +++ b/src/sass/app/_form.scss @@ -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 { @@ -500,4 +500,8 @@ label.custom-input-danger { } .progress-bar-danger { background-color: $danger; +} + +.has-success .input-group-addon { + border: none; } \ No newline at end of file diff --git a/src/sass/theme/_table.scss b/src/sass/theme/_table.scss index c69e06a..288c645 100644 --- a/src/sass/theme/_table.scss +++ b/src/sass/theme/_table.scss @@ -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; @@ -75,7 +77,7 @@ margin-bottom: 10px; } -.select-page-size-wrap{ +.select-page-size-wrap { width: 150px; } @@ -174,28 +176,28 @@ input.search-input { border-bottom-right-radius: 0px; } -.status-button{ +.status-button { width: 60px; } -.table{ - .editable-wrap .editable-controls, .editable-wrap .editable-error{ +.table { + .editable-wrap .editable-controls, .editable-wrap .editable-error { vertical-align: sub; - .btn{ - &.dropdown-toggle{ + .btn { + &.dropdown-toggle { padding: 3px 20px; margin-top: 3px; } padding: 3px 8px; } - input{ + input { line-height: 1px; height: 30px; } } } -.form-inline button[type="submit"].editable-table-button{ +.form-inline button[type="submit"].editable-table-button { margin-left: 0; } @@ -217,32 +219,32 @@ body.badmin-transparent { } } - .black-muted-bg{ - background-color: rgba(0, 0, 0, 0.25); + .black-muted-bg { + background-color: rgba(0, 0, 0, 0.1); } - .table-hover{ + .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); + .table-striped > tbody > tr:nth-of-type(odd) { + background-color: rgba(0, 0, 0, 0.1); } - .table > tbody > tr.primary > td{ + .table > tbody > tr.primary > td { background-color: $primary; } - .table > tbody > tr.success > td{ + .table > tbody > tr.success > td { background-color: $success; } - .table > tbody > tr.warning > td{ + .table > tbody > tr.warning > td { background-color: $warning; } - .table > tbody > tr.danger > td{ + .table > tbody > tr.danger > td { background-color: $danger; } - .table > tbody > tr.info > td{ + .table > tbody > tr.info > td { background-color: $info; } @@ -250,4 +252,21 @@ body.badmin-transparent { color: $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 { + } \ No newline at end of file diff --git a/src/sass/theme/dashboard/_calendar.scss b/src/sass/theme/dashboard/_calendar.scss index 186faca..926fee5 100644 --- a/src/sass/theme/dashboard/_calendar.scss +++ b/src/sass/theme/dashboard/_calendar.scss @@ -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 { diff --git a/src/sass/theme/dashboard/_timeline.scss b/src/sass/theme/dashboard/_timeline.scss index 618b402..a78136c 100644 --- a/src/sass/theme/dashboard/_timeline.scss +++ b/src/sass/theme/dashboard/_timeline.scss @@ -1,4 +1,5 @@ #cd-timeline { + margin-top: 15px; position: relative; &:before { diff --git a/src/sass/theme/dashboard/_todo.scss b/src/sass/theme/dashboard/_todo.scss index 4ca16ce..9e27d37 100644 --- a/src/sass/theme/dashboard/_todo.scss +++ b/src/sass/theme/dashboard/_todo.scss @@ -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); } } diff --git a/src/sass/theme/skins/_02_transparent.scss b/src/sass/theme/skins/_02_transparent.scss index d4f709e..50f5f5e 100644 --- a/src/sass/theme/skins/_02_transparent.scss +++ b/src/sass/theme/skins/_02_transparent.scss @@ -1,24 +1,25 @@ body.badmin-transparent { @include overrideColors(#fff); @include overridePanelBg(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.9)); - .default-color{ - color: $default-text!important;; + .default-color { + color: $default-text !important;; } - .panel.panel-blur{ - @include scrollbars(.4em, rgba(0,0,0,0.7), rgba(255,255,255,0.8)); + .panel.panel-blur { + @include scrollbars(.4em, rgba(0, 0, 0, 0.7), rgba(255, 255, 255, 0.8)); border-radius: 5px; color: $default; - .panel-heading{ - border-bottom: 1px solid rgba(0,0,0,0.12); + .panel-heading { + border-bottom: 1px solid rgba(0, 0, 0, 0.12); box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12); } } - .btn-default{ + .btn-default { 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 {