diff --git a/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss index b254619f75..bb6e76de9d 100644 --- a/themes/bootstrap/scss/_common.scss +++ b/themes/bootstrap/scss/_common.scss @@ -2,7 +2,6 @@ body { padding: 0; margin: 0; margin-#{$left}: $navi-width; - color: $main-color; } #page_content { @@ -144,8 +143,8 @@ a img { } hr { - color: $main-color; - background-color: $main-color; + color: $body-color; + background-color: $body-color; border: 0; height: 1px; } @@ -1904,7 +1903,7 @@ div { width: 202px; position: relative; margin: 0 auto 1em; - color: $main-color; + color: $body-color; div.percentage { position: absolute; @@ -2932,7 +2931,7 @@ input#auto_increment_opt { } .btn-link { - color: $main-color; + color: $body-color; &:hover { color: #fff; diff --git a/themes/bootstrap/scss/_variables.scss b/themes/bootstrap/scss/_variables.scss index 3bd13c7d19..f55f0196ba 100644 --- a/themes/bootstrap/scss/_variables.scss +++ b/themes/bootstrap/scss/_variables.scss @@ -19,9 +19,6 @@ $navi-pointer-background: #ddd; // main frame -// foreground (text) color for the main frame -$main-color: #444; - // foreground (text) color of the pointer in browse mode $browse-pointer-color: #000; diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss index 6cc95bdf0d..bea5e2fbb5 100644 --- a/themes/metro/scss/_common.scss +++ b/themes/metro/scss/_common.scss @@ -85,7 +85,6 @@ textarea { body { padding: 0; margin-#{$left}: $navi-width; - color: $main-color; line-height: 1; font-size: 11px; } diff --git a/themes/metro/scss/_variables.scss b/themes/metro/scss/_variables.scss index 3960b14db3..6796e6f7f5 100644 --- a/themes/metro/scss/_variables.scss +++ b/themes/metro/scss/_variables.scss @@ -148,6 +148,10 @@ $blue-header: #3a7ead; // Bootstrap // --------- +// Body + +$body-color: $main-color; + // Typography $font-family-base: "Open Sans", "Segoe UI", sans-serif; diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss index d8631cc332..ce8b141081 100644 --- a/themes/original/scss/_common.scss +++ b/themes/original/scss/_common.scss @@ -14,7 +14,6 @@ body { padding: 0; margin: 0; margin-#{$left}: 240px; - color: $main-color; } #page_content { diff --git a/themes/original/scss/_variables.scss b/themes/original/scss/_variables.scss index 8b6c5f2abd..19a02271ea 100644 --- a/themes/original/scss/_variables.scss +++ b/themes/original/scss/_variables.scss @@ -54,6 +54,7 @@ $bg-two: #d5d5d5; // Body $body-bg: #f5f5f5; +$body-color: $main-color; // Typography diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss index 846ecb5a78..19967568d0 100644 --- a/themes/pmahomme/scss/_common.scss +++ b/themes/pmahomme/scss/_common.scss @@ -17,7 +17,6 @@ body { padding: 0; margin: 0; margin-#{$left}: $navi-width; - color: $main-color; } #page_content { diff --git a/themes/pmahomme/scss/_variables.scss b/themes/pmahomme/scss/_variables.scss index 5e69478494..ad626e2469 100644 --- a/themes/pmahomme/scss/_variables.scss +++ b/themes/pmahomme/scss/_variables.scss @@ -51,6 +51,10 @@ $bg-two: #d5d5d5; // Bootstrap // --------- +// Body + +$body-color: $main-color; + // Typography $font-family-base: sans-serif;