diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-12-20 20:31:22 +0000 |
|---|---|---|
| committer | Alex Hanselka <alex@gitlab.com> | 2019-01-02 11:58:42 -0600 |
| commit | 4d9fca8769de75ab14a5770141ca696077dfaf8d (patch) | |
| tree | 0e0ec6526d157334220377bd151250c3bf4705e3 /app | |
| parent | cc5874ef6af68ca5bdbfff4b5ea07c6278eda776 (diff) | |
| download | gitlab-ce-4d9fca8769de75ab14a5770141ca696077dfaf8d.tar.gz | |
Merge branch 'use-px-not-rems' into 'master'
Use px instead of rems to prep for csslab
Closes #55314
See merge request gitlab-org/gitlab-ce!23804
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/modal.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables_overrides.scss | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index 7e30747963a..95291b4a9ad 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -25,8 +25,8 @@ &.w-100 { // after upgrading to Bootstrap 4.2 we can use $modal-header-padding-x here // https://github.com/twbs/bootstrap/pull/26976 - margin-right: -2rem; - padding-right: 2rem; + margin-right: -28px; + padding-right: 28px; } } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 4449193c104..ff8f74727f0 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -198,6 +198,7 @@ $well-light-text-color: #5b6169; $gl-font-size: 14px; $gl-font-size-xs: 11px; $gl-font-size-small: 12px; +$gl-font-size-medium: 20px; $gl-font-size-large: 16px; $gl-font-weight-normal: 400; $gl-font-weight-bold: 600; diff --git a/app/assets/stylesheets/framework/variables_overrides.scss b/app/assets/stylesheets/framework/variables_overrides.scss index 5ca76bb6c5a..069f45bff49 100644 --- a/app/assets/stylesheets/framework/variables_overrides.scss +++ b/app/assets/stylesheets/framework/variables_overrides.scss @@ -28,3 +28,9 @@ $popover-border-width: 1px; $popover-border-color: $border-color; $popover-box-shadow: 0 $border-radius-small $border-radius-default 0 $shadow-color; $popover-arrow-outer-color: $shadow-color; +$h1-font-size: 14px * 2.5; +$h2-font-size: 14px * 2; +$h3-font-size: 14px * 1.75; +$h4-font-size: 14px * 1.5; +$h5-font-size: 14px * 1.25; +$h6-font-size: 14px; |