diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-08-29 21:09:27 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-08-29 21:09:27 +0800 |
commit | 110d7fb78c0edf2e18c70ff3d9b60671f6935977 (patch) | |
tree | d05720cfd55e3b91e067aaeca5731572e5853e4e /app/assets/stylesheets/pages/login.scss | |
parent | 00b440443808fba04fc55f7e77c61f79e29c21ea (diff) | |
parent | 01785533a5ba26e9dbed7972d9732a9b122ff3e0 (diff) | |
download | gitlab-ce-110d7fb78c0edf2e18c70ff3d9b60671f6935977.tar.gz |
Merge remote-tracking branch 'upstream/master' into perf.slow-issuable
* upstream/master: (206 commits)
Resolve "Monitoring graph date formatting is wrong"
Add styles for shorter code
Update doc for dind using overlay2
Cleans merge_jid when possible on MergeService
Rename MergeRequest#async_merge to merge_async
Add changelog
Track enqueued and ongoing MRs
Remove locked? check when unlocking a merge request
Update CHANGELOG.md for 9.5.2
Update rubocop-gitlab-security to 0.1.0
Fix spec
Fix changelog
Fix spec
Add changelog
Remove trigger_request.trigger.owner
Reproduced bug
Fix a transient failure in mini_pipeline_graph_spec
fix typo
fix spec
Fix events error importing GitLab projects
...
Diffstat (limited to 'app/assets/stylesheets/pages/login.scss')
-rw-r--r-- | app/assets/stylesheets/pages/login.scss | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index 3cbe8dededb..d4dc43035eb 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -22,7 +22,7 @@ } h1:first-child { - font-weight: normal; + font-weight: $gl-font-weight-normal; margin-bottom: 0.68em; margin-top: 0; font-size: 34px; @@ -38,7 +38,7 @@ } a { - font-weight: bold; + font-weight: $gl-font-weight-bold; } } @@ -54,7 +54,7 @@ padding: 15px; .login-heading h3 { - font-weight: 300; + font-weight: $gl-font-weight-normal; line-height: 1.5; margin: 0 0 10px; } @@ -186,7 +186,7 @@ } label { - font-weight: normal; + font-weight: $gl-font-weight-normal; } .submit-container { |