diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-05 21:14:21 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-05 21:14:21 +0000 |
| commit | 6ed5cd1c2b667eecae54ef94fd274adf39958c1d (patch) | |
| tree | 3fbc12c8fc0555b9af77b42d63e4fa3b0e5ca57c | |
| parent | f69c38e09a088f4cee3525bf6ac898a465f1ee69 (diff) | |
| parent | c6a4c7be810a0898a5e90ad57f74267d4e5cb8c9 (diff) | |
| download | gitlab-ce-6ed5cd1c2b667eecae54ef94fd274adf39958c1d.tar.gz | |
Merge branch 'fix-header-styles' into 'master'
Fix header styles
Closes #46704 and #46697
See merge request gitlab-org/gitlab-ce!19443
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 083d4656f07..d205d84b84f 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -39,6 +39,41 @@ html [type="button"], cursor: pointer; } +h1, +h2, +h3, +h4, +h5, +h6 { + color: $gl-text-color; + font-weight: 600; +} + +h1, +.h1, +h2, +.h2, +h3, +.h3 { + margin-top: 20px; + margin-bottom: 10px; +} + +h4, +.h4, +h5, +.h5, +h6, +.h6 { + margin-top: 10px; + margin-bottom: 10px; +} + +h5, +.h5 { + font-size: $gl-font-size; +} + input[type="file"] { // Bootstrap 4 file input height is taller by default // which makes them look ugly |