diff --git a/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss index a0c58beb23..b254619f75 100644 --- a/themes/bootstrap/scss/_common.scss +++ b/themes/bootstrap/scss/_common.scss @@ -3,7 +3,6 @@ body { margin: 0; margin-#{$left}: $navi-width; color: $main-color; - background: $main-background; } #page_content { diff --git a/themes/bootstrap/scss/_variables.scss b/themes/bootstrap/scss/_variables.scss index d20c21b201..3bd13c7d19 100644 --- a/themes/bootstrap/scss/_variables.scss +++ b/themes/bootstrap/scss/_variables.scss @@ -22,9 +22,6 @@ $navi-pointer-background: #ddd; // foreground (text) color for the main frame $main-color: #444; -// background for the main frame -$main-background: #fff; - // 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 2356d4ae96..6cc95bdf0d 100644 --- a/themes/metro/scss/_common.scss +++ b/themes/metro/scss/_common.scss @@ -86,7 +86,6 @@ body { padding: 0; margin-#{$left}: $navi-width; color: $main-color; - background: $main-background; line-height: 1; font-size: 11px; } @@ -117,7 +116,7 @@ body#loginform { } div.container { - color: $main-background; + color: $body-bg; text-align: $left; width: 48em; margin-#{$left}: auto; @@ -127,7 +126,7 @@ body#loginform { /* stylelint-disable-next-line font-family-no-missing-generic-family-keyword */ font-family: 'IcoMoon'; font-size: 220px; - color: $main-background; + color: $body-bg; content: "a"; float: $left; margin-#{$right}: 20px; @@ -144,7 +143,7 @@ body#loginform { h1 { display: inline-block; text-align: $left; - color: $main-background; + color: $body-bg; font-size: 2.5em; padding-top: 0; margin-#{$right}: -50%; @@ -350,7 +349,7 @@ button.mult_submit { a { border: 1px solid $border-color; - background: $main-background; + background: $body-bg; padding: 4px 8px; } } @@ -411,7 +410,7 @@ input { padding: 5px; margin: 6px; font-family: $font-family-base; - background-color: $main-background; + background-color: $body-bg; &:focus { border: 1px solid $navi-hover-background; @@ -439,7 +438,7 @@ textarea { overflow: visible; border: 1px solid $browse-gray-color; color: $th-color; - background-color: $main-background; + background-color: $body-bg; } fieldset { @@ -451,7 +450,7 @@ fieldset { fieldset { margin: 20px; margin-bottom: 0; - background-color: $main-background; + background-color: $body-bg; border: none; } } @@ -498,7 +497,7 @@ select { padding: 4px; font-family: $font-family-base; margin: 5px; - background-color: $main-background; + background-color: $body-bg; max-width: 17em; &:focus { @@ -786,12 +785,12 @@ table tr.hover:not(.nopointer) th { th.condition { border: 1px solid $browse-warning-color; background: $browse-warning-color; - color: $main-background !important; + color: $body-bg !important; a { border: 1px solid $browse-warning-color; background: $browse-warning-color; - color: $main-background !important; + color: $body-bg !important; } } @@ -2058,7 +2057,7 @@ div.sqlvalidate, padding: 1em; margin: 1em; overflow: auto; - background-color: $main-background; + background-color: $body-bg; border: 1px solid $border-color; direction: ltr; } diff --git a/themes/metro/scss/_navigation.scss b/themes/metro/scss/_navigation.scss index be71fbe6c7..efe93a8a1d 100644 --- a/themes/metro/scss/_navigation.scss +++ b/themes/metro/scss/_navigation.scss @@ -11,7 +11,7 @@ z-index: 800; input[type="text"] { - background-color: $main-background; + background-color: $body-bg; font-family: $font-family-base; } diff --git a/themes/metro/scss/_variables.scss b/themes/metro/scss/_variables.scss index 37c28d8f37..3960b14db3 100644 --- a/themes/metro/scss/_variables.scss +++ b/themes/metro/scss/_variables.scss @@ -16,7 +16,7 @@ $navi-pointer-background: #377796; $navi-database-name-color: #333; $navi-hover-background: #428eb4; $main-color: #444; -$main-background: #fff; +$body-bg: #fff; $browse-pointer-color: #377796; $browse-marker-color: #000; $browse-warning-color: #d44a26; @@ -44,7 +44,7 @@ $blue-header: #3a7ead; $navi-database-name-color: #fff; $navi-hover-background: #216475; $main-color: #444; - $main-background: #fff; + $body-bg: #fff; $browse-pointer-color: #004d60; $browse-marker-color: #000; $browse-warning-color: #d44a26; @@ -71,7 +71,7 @@ $blue-header: #3a7ead; $navi-database-name-color: #fff; $navi-hover-background: #a10707; $main-color: #444; - $main-background: #fff; + $body-bg: #fff; $browse-pointer-color: #780505; $browse-marker-color: #000; $browse-warning-color: #d44a26; @@ -98,7 +98,7 @@ $blue-header: #3a7ead; $navi-database-name-color: #fff; $navi-hover-background: #428eb4; $main-color: #444; - $main-background: #fff; + $body-bg: #fff; $browse-pointer-color: #377796; $browse-marker-color: #000; $browse-warning-color: #d44a26; @@ -125,7 +125,7 @@ $blue-header: #3a7ead; $navi-database-name-color: #fff; $navi-hover-background: #999; $main-color: #444; - $main-background: #fff; + $body-bg: #fff; $browse-pointer-color: #666; $browse-marker-color: #000; $browse-warning-color: #666; @@ -174,7 +174,7 @@ $btn-padding-x: 0.5rem; $card-border-width: 0; $card-cap-color: $navi-background; -$card-cap-bg: $main-background; +$card-cap-bg: $body-bg; // Alert diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss index de1957e65b..d8631cc332 100644 --- a/themes/original/scss/_common.scss +++ b/themes/original/scss/_common.scss @@ -15,7 +15,6 @@ body { margin: 0; margin-#{$left}: 240px; color: $main-color; - background: $main-background; } #page_content { @@ -837,7 +836,7 @@ ul { a.tab:hover, .tabactive { - background-color: $main-background; + background-color: $body-bg; } } @@ -852,7 +851,7 @@ ul { } &#topmenu > li.active { - border-bottom: 1pt solid $main-background; + border-bottom: 1pt solid $body-bg; } } @@ -2258,7 +2257,7 @@ input#auto_increment_opt { position: fixed; top: 44px; width: 100%; - background: $main-background; + background: $body-bg; } #table_columns { diff --git a/themes/original/scss/_variables.scss b/themes/original/scss/_variables.scss index 15019898fd..8b6c5f2abd 100644 --- a/themes/original/scss/_variables.scss +++ b/themes/original/scss/_variables.scss @@ -22,9 +22,6 @@ $navi-pointer-background: #99c; // foreground (text) color for the main frame $main-color: #000; -// background for the main frame -$main-background: #f5f5f5; - // foreground (text) color of the pointer in browse mode $browse-pointer-color: #000; @@ -54,6 +51,10 @@ $bg-two: #d5d5d5; // Bootstrap // --------- +// Body + +$body-bg: #f5f5f5; + // Typography $font-family-base: sans-serif; diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss index 82f2e9e08d..846ecb5a78 100644 --- a/themes/pmahomme/scss/_common.scss +++ b/themes/pmahomme/scss/_common.scss @@ -18,7 +18,6 @@ body { margin: 0; margin-#{$left}: $navi-width; color: $main-color; - background: $main-background; } #page_content { diff --git a/themes/pmahomme/scss/_variables.scss b/themes/pmahomme/scss/_variables.scss index f42a5a9ce3..5e69478494 100644 --- a/themes/pmahomme/scss/_variables.scss +++ b/themes/pmahomme/scss/_variables.scss @@ -22,9 +22,6 @@ $navi-pointer-background: #ddd; // foreground (text) color for the main frame $main-color: #444; -// background for the main frame -$main-background: #fff; - // foreground (text) color of the pointer in browse mode $browse-pointer-color: #000;