diff --git a/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss index bb6e76de9d..6dfd684f5a 100644 --- a/themes/bootstrap/scss/_common.scss +++ b/themes/bootstrap/scss/_common.scss @@ -1,7 +1,5 @@ body { - padding: 0; - margin: 0; - margin-#{$left}: $navi-width; + text-align: $left; } #page_content { diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss index bea5e2fbb5..97378b9c34 100644 --- a/themes/metro/scss/_common.scss +++ b/themes/metro/scss/_common.scss @@ -71,11 +71,6 @@ display: none; } -/* general tags */ -html { - font-size: 100%; -} - input, select, textarea { @@ -83,10 +78,7 @@ textarea { } body { - padding: 0; - margin-#{$left}: $navi-width; - line-height: 1; - font-size: 11px; + text-align: $left; } /* Override style formats by html tags */ diff --git a/themes/metro/scss/_variables.scss b/themes/metro/scss/_variables.scss index 6796e6f7f5..3c50961e49 100644 --- a/themes/metro/scss/_variables.scss +++ b/themes/metro/scss/_variables.scss @@ -161,7 +161,8 @@ $font-family-light: "Open Sans Light", "Segoe UI Light", "Segoe UI", sans-serif; $font-family-bold: "Open Sans Bold", sans-serif; $font-family-extra-bold: "Open Sans Extrabold", "Segoe Black", sans-serif; -$font-size-base: 0.8rem; +$font-size-base: 0.6875rem; // 11px +$line-height-base: 1; // Buttons diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss index ce8b141081..d3c210bad2 100644 --- a/themes/original/scss/_common.scss +++ b/themes/original/scss/_common.scss @@ -1,9 +1,3 @@ -// Common styles for the original theme - -html { - font-size: 82%; -} - input, select, textarea { @@ -11,9 +5,7 @@ textarea { } body { - padding: 0; - margin: 0; - margin-#{$left}: 240px; + text-align: $left; } #page_content { diff --git a/themes/original/scss/_variables.scss b/themes/original/scss/_variables.scss index 19a02271ea..f2c3cf73fe 100644 --- a/themes/original/scss/_variables.scss +++ b/themes/original/scss/_variables.scss @@ -61,6 +61,8 @@ $body-color: $main-color; $font-family-base: sans-serif; $font-family-monospace: monospace; +$font-size-base: 0.82rem; + // Card $card-border-radius: 0; diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss index 19967568d0..c840412f8d 100644 --- a/themes/pmahomme/scss/_common.scss +++ b/themes/pmahomme/scss/_common.scss @@ -1,12 +1,3 @@ -/** - * Common styles for the pmahomme theme - */ - -/* general tags */ -html { - font-size: 82%; -} - input, select, textarea { @@ -14,9 +5,7 @@ textarea { } body { - padding: 0; - margin: 0; - margin-#{$left}: $navi-width; + text-align: $left; } #page_content { diff --git a/themes/pmahomme/scss/_variables.scss b/themes/pmahomme/scss/_variables.scss index ad626e2469..1de9bac504 100644 --- a/themes/pmahomme/scss/_variables.scss +++ b/themes/pmahomme/scss/_variables.scss @@ -60,6 +60,8 @@ $body-color: $main-color; $font-family-base: sans-serif; $font-family-monospace: monospace; +$font-size-base: 0.82rem; + // Buttons $enable-gradients: true;