From c52bbb091a03aee1ba150b5ec6257a0286579cce Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 25 Apr 2016 17:36:18 +0300 Subject: [PATCH] refactor(global): make more configurable --- src/sass/404.scss | 8 ++++---- src/sass/app/_email.scss | 7 +++---- src/sass/app/_modals.scss | 2 +- src/sass/app/_profile.scss | 2 +- src/sass/app/_typography.scss | 2 +- src/sass/app/maps/_leaflet.scss | 2 +- src/sass/theme/bootstrap-overrides/_tabs.scss | 2 +- src/sass/theme/dashboard/_calendar.scss | 8 ++------ 8 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/sass/404.scss b/src/sass/404.scss index e3b7a5b..b5d85c4 100644 --- a/src/sass/404.scss +++ b/src/sass/404.scss @@ -13,7 +13,7 @@ html, body { body { font: 12px/16px $font-family; color: $default-text; - background-color: $default; + @include main-background(); display: flex; align-items: center; } @@ -21,9 +21,10 @@ body { .page-not-found-modal { width: 638px; margin: 0 auto; + @include bg-translucent-dark(0.5); border-radius: 5px; font-weight: $font-light; - color: $default-text; + color: #ffffff; padding: 32px; text-align: center; @@ -45,5 +46,4 @@ body { color: $primary-dark; } } -} - +} \ No newline at end of file diff --git a/src/sass/app/_email.scss b/src/sass/app/_email.scss index f8c4709..276d8de 100644 --- a/src/sass/app/_email.scss +++ b/src/sass/app/_email.scss @@ -666,7 +666,7 @@ .compose-footer { padding: 2px 4px; - background-color: $input-border; + background-color: whitesmoke; .btn-send { background-color: $primary-light; color: white; @@ -696,7 +696,7 @@ } .compose-container { - background-color: $input-border; + background-color: whitesmoke; .ta-text.ta-editor { background-color: $input-border; div { @@ -754,10 +754,9 @@ } .ta-toolbar { .btn { - border-width: 1px; border-radius: 0; color: $dropdown-text; - border-color: transparent; + border: 1px transparent; &.active { box-shadow: none; background-color: rgba(0, 0, 0, .12); diff --git a/src/sass/app/_modals.scss b/src/sass/app/_modals.scss index 9943678..df6ec50 100644 --- a/src/sass/app/_modals.scss +++ b/src/sass/app/_modals.scss @@ -35,7 +35,7 @@ .form-control{ color: $github-color; background-color: transparent; - border: 1px solid $input-border; + border: 1px solid $select-border; @include placeholderStyle($dropdown-text, 0.9); } .modal-body p, .modal-body div, .modal-body span{ diff --git a/src/sass/app/_profile.scss b/src/sass/app/_profile.scss index 70a41ca..88e7f0a 100644 --- a/src/sass/app/_profile.scss +++ b/src/sass/app/_profile.scss @@ -149,7 +149,7 @@ a.sn-link { font-size: 17px; margin-right: 8px; background-color: rgba(0,0,0,.15); - color: $default; + color: $default-text; } span { diff --git a/src/sass/app/_typography.scss b/src/sass/app/_typography.scss index ccd4acb..09d3e97 100644 --- a/src/sass/app/_typography.scss +++ b/src/sass/app/_typography.scss @@ -357,7 +357,7 @@ a.learn-more { h1 { font-weight: $font-bold; width: 100%; - color: $default; + color: $default-text; margin-bottom: 10px; } p { diff --git a/src/sass/app/maps/_leaflet.scss b/src/sass/app/maps/_leaflet.scss index 86a5e77..942e0c7 100644 --- a/src/sass/app/maps/_leaflet.scss +++ b/src/sass/app/maps/_leaflet.scss @@ -433,7 +433,7 @@ .leaflet-popup-content { margin: 13px 19px; line-height: 1.4; - color: $default-text; + color: $dropdown-text; } .leaflet-popup-content p { diff --git a/src/sass/theme/bootstrap-overrides/_tabs.scss b/src/sass/theme/bootstrap-overrides/_tabs.scss index bcc2f40..78e933a 100644 --- a/src/sass/theme/bootstrap-overrides/_tabs.scss +++ b/src/sass/theme/bootstrap-overrides/_tabs.scss @@ -156,7 +156,7 @@ border-top-left-radius: 5px; } .dropdown-menu > li > a { - color: $default-text; + color: $dropdown-text; } } diff --git a/src/sass/theme/dashboard/_calendar.scss b/src/sass/theme/dashboard/_calendar.scss index 0b9ca73..e15c8c1 100644 --- a/src/sass/theme/dashboard/_calendar.scss +++ b/src/sass/theme/dashboard/_calendar.scss @@ -55,7 +55,7 @@ div.blurCalendar{ } th, td { - border: 1px solid; + border: 1px solid rgba(255,255,255,0.3); padding: 0; vertical-align: top; } @@ -94,7 +94,7 @@ div.blurCalendar{ .fc-unthemed { th, td, hr, thead, tbody, .fc-row, .fc-popover { - border-color: $border; + border-color: rgba(255,255,255,0.3); } .fc-popover { @@ -740,10 +740,6 @@ a.fc-more { } } -.fc td{ - border-color: $border; -} - .fc-today-button, .fc-month-button, .fc-agendaWeek-button, .fc-agendaDay-button { display: none; }