Skip to content

Commit

Permalink
refactor(global): make more configurable
Browse files Browse the repository at this point in the history
  • Loading branch information
SashaSkywalker authored and KostyaDanovsky committed May 13, 2016
1 parent c0d40df commit c52bbb0
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 19 deletions.
8 changes: 4 additions & 4 deletions src/sass/404.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,18 @@ html, body {
body {
font: 12px/16px $font-family;
color: $default-text;
background-color: $default;
@include main-background();
display: flex;
align-items: center;
}

.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;

Expand All @@ -45,5 +46,4 @@ body {
color: $primary-dark;
}
}
}

}
7 changes: 3 additions & 4 deletions src/sass/app/_email.scss
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@

.compose-footer {
padding: 2px 4px;
background-color: $input-border;
background-color: whitesmoke;
.btn-send {
background-color: $primary-light;
color: white;
Expand Down Expand Up @@ -696,7 +696,7 @@
}

.compose-container {
background-color: $input-border;
background-color: whitesmoke;
.ta-text.ta-editor {
background-color: $input-border;
div {
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/sass/app/_modals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion src/sass/app/_profile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/sass/app/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ a.learn-more {
h1 {
font-weight: $font-bold;
width: 100%;
color: $default;
color: $default-text;
margin-bottom: 10px;
}
p {
Expand Down
2 changes: 1 addition & 1 deletion src/sass/app/maps/_leaflet.scss
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@
.leaflet-popup-content {
margin: 13px 19px;
line-height: 1.4;
color: $default-text;
color: $dropdown-text;
}

.leaflet-popup-content p {
Expand Down
2 changes: 1 addition & 1 deletion src/sass/theme/bootstrap-overrides/_tabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
border-top-left-radius: 5px;
}
.dropdown-menu > li > a {
color: $default-text;
color: $dropdown-text;
}
}

Expand Down
8 changes: 2 additions & 6 deletions src/sass/theme/dashboard/_calendar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit c52bbb0

Please sign in to comment.