diff --git a/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss index 70f1b72a40..dfb4d146d7 100644 --- a/themes/bootstrap/scss/_common.scss +++ b/themes/bootstrap/scss/_common.scss @@ -1,7 +1,3 @@ -body { - text-align: $left; -} - #page_content { margin: 0 0.5em; } @@ -10,12 +6,6 @@ body { margin: 0 auto; } -textarea, -pre, -code { - font-family: $font-family-monospace; -} - h2 { font-size: 2em; font-weight: normal; diff --git a/themes/bootstrap/scss/_reboot.scss b/themes/bootstrap/scss/_reboot.scss new file mode 100644 index 0000000000..0069b5921a --- /dev/null +++ b/themes/bootstrap/scss/_reboot.scss @@ -0,0 +1,5 @@ +// Body + +body { + text-align: $left; +} diff --git a/themes/bootstrap/scss/theme.scss b/themes/bootstrap/scss/theme.scss index e78c587af4..279288b77b 100644 --- a/themes/bootstrap/scss/theme.scss +++ b/themes/bootstrap/scss/theme.scss @@ -1,6 +1,7 @@ @import "direction"; @import "variables"; @import "bootstrap"; +@import "reboot"; @import "common"; @import "enum-editor"; @import "gis"; diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss index 3d2fab4cd0..c6d39be541 100644 --- a/themes/metro/scss/_common.scss +++ b/themes/metro/scss/_common.scss @@ -63,24 +63,10 @@ font-style: normal; } -*:focus { - outline: none; -} - #li_select_fontsize { display: none; } -input, -select, -textarea { - font-size: 1em; -} - -body { - text-align: $left; -} - /* Override style formats by html tags */ font[color="red"], @@ -234,12 +220,6 @@ form.login label { margin: 20px !important; } -textarea, -pre, -code { - font-family: $font-family-monospace !important; -} - h1 { font-family: $font-family-light; font-weight: normal; diff --git a/themes/metro/scss/_reboot.scss b/themes/metro/scss/_reboot.scss new file mode 100644 index 0000000000..8144360a1a --- /dev/null +++ b/themes/metro/scss/_reboot.scss @@ -0,0 +1,23 @@ +// Document + +*:focus { + outline: none; +} + +// Body + +body { + text-align: $left; +} + +// Forms + +input, +select, +textarea { + font-size: 1em; +} + +textarea { + font-family: $font-family-monospace; +} diff --git a/themes/metro/scss/theme.scss b/themes/metro/scss/theme.scss index fa9e8c4948..130678625f 100644 --- a/themes/metro/scss/theme.scss +++ b/themes/metro/scss/theme.scss @@ -1,6 +1,7 @@ @import "../../pmahomme/scss/direction"; @import "variables"; @import "../../pmahomme/scss/bootstrap"; +@import "reboot"; @import "common"; @import "enum-editor"; @import "gis"; diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss index df45a4b7bb..90276e5c18 100644 --- a/themes/original/scss/_common.scss +++ b/themes/original/scss/_common.scss @@ -1,13 +1,3 @@ -input, -select, -textarea { - font-size: 1em; -} - -body { - text-align: $left; -} - #page_content { margin: 0 0.5em; } @@ -16,12 +6,6 @@ body { margin: 0 auto; } -textarea, -pre, -code { - font-family: $font-family-monospace; -} - h1 { font-size: 140%; font-weight: bold; diff --git a/themes/original/scss/_reboot.scss b/themes/original/scss/_reboot.scss new file mode 100644 index 0000000000..0b85978ccb --- /dev/null +++ b/themes/original/scss/_reboot.scss @@ -0,0 +1,17 @@ +// Body + +body { + text-align: $left; +} + +// Forms + +input, +select, +textarea { + font-size: 1em; +} + +textarea { + font-family: $font-family-monospace; +} diff --git a/themes/original/scss/theme.scss b/themes/original/scss/theme.scss index ad12db90b0..223fbe84a5 100644 --- a/themes/original/scss/theme.scss +++ b/themes/original/scss/theme.scss @@ -1,6 +1,7 @@ @import "../../pmahomme/scss/direction"; @import "variables"; @import "../../pmahomme/scss/bootstrap"; +@import "reboot"; @import "common"; @import "../../pmahomme/scss/enum-editor"; @import "../../pmahomme/scss/gis"; diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss index 4d0e272212..ad99ecb609 100644 --- a/themes/pmahomme/scss/_common.scss +++ b/themes/pmahomme/scss/_common.scss @@ -1,13 +1,3 @@ -input, -select, -textarea { - font-size: 1em; -} - -body { - text-align: $left; -} - #page_content { margin: 0 0.5em; } @@ -16,12 +6,6 @@ body { margin: 0 auto; } -textarea, -pre, -code { - font-family: $font-family-monospace; -} - h1 { font-size: 140%; font-weight: bold; diff --git a/themes/pmahomme/scss/_reboot.scss b/themes/pmahomme/scss/_reboot.scss new file mode 100644 index 0000000000..0b85978ccb --- /dev/null +++ b/themes/pmahomme/scss/_reboot.scss @@ -0,0 +1,17 @@ +// Body + +body { + text-align: $left; +} + +// Forms + +input, +select, +textarea { + font-size: 1em; +} + +textarea { + font-family: $font-family-monospace; +} diff --git a/themes/pmahomme/scss/theme.scss b/themes/pmahomme/scss/theme.scss index 0120bcf889..e8acd7867d 100644 --- a/themes/pmahomme/scss/theme.scss +++ b/themes/pmahomme/scss/theme.scss @@ -1,6 +1,7 @@ @import "direction"; @import "variables"; @import "bootstrap"; +@import "reboot"; @import "common"; @import "enum-editor"; @import "gis";