diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-06-04 04:29:36 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-06-04 04:29:36 +0000 |
| commit | c4effa86d8607026a74d6c49130f4092005fab2a (patch) | |
| tree | 2433b1dd17a8fad0ffcfd2660279d2e32ef0c500 | |
| parent | f4c32540d2234c84ea618979f2dfd1dc23cd5643 (diff) | |
| parent | 27738a5446ce764a1f5924aef4a8f370ff44397e (diff) | |
| download | gitlab-ce-c4effa86d8607026a74d6c49130f4092005fab2a.tar.gz | |
Merge branch '61640-set-font-size-on-html-not-body' into 'master'
Use rems instead of px to set body font-size
Closes #61640
See merge request gitlab-org/gitlab-ce!28544
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/errors.scss | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 93377b8dd91..7f6384f4eea 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -22,7 +22,9 @@ body, .form-control, .search form { // Override default font size used in non-csslab UI - font-size: 14px; + // Use rem to keep default font-size at 14px on body so 1rem still + // fits 8px grid, but also allow users to change browser font size + font-size: .875rem; } legend { diff --git a/app/assets/stylesheets/errors.scss b/app/assets/stylesheets/errors.scss index 658e0ff638e..8c32b6c8985 100644 --- a/app/assets/stylesheets/errors.scss +++ b/app/assets/stylesheets/errors.scss @@ -17,7 +17,7 @@ body { text-align: center; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; margin: auto; - font-size: 14px; + font-size: .875rem; } h1 { |