Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-01-05 19:10:55 +0300
committerFatih Acet <acetfatih@gmail.com>2017-01-05 19:10:55 +0300
commitc15e36b2d728eebd1b3879de229939dde45328ab (patch)
treebc08be0dacd895f5e02d3ef717d4e23a7853ec0f
parentd2608ce042ce6a112ccc26aef0a74d1a6ef40d7f (diff)
parent97ecf20ca196ae362437fc37d136b3b293957d5c (diff)
Merge branch 'login-page-font-size' into 'master'
Decreases font-size on login page See merge request !8454
-rw-r--r--app/assets/stylesheets/pages/login.scss9
-rw-r--r--changelogs/unreleased/login-page-font-size.yml4
2 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss
index 712bd3da22f..71ed5b1361a 100644
--- a/app/assets/stylesheets/pages/login.scss
+++ b/app/assets/stylesheets/pages/login.scss
@@ -17,14 +17,19 @@
line-height: 1.5;
p {
- font-size: 18px;
+ font-size: 16px;
color: $login-brand-holder-color;
}
h1:first-child {
font-weight: normal;
- margin-bottom: 30px;
+ margin-bottom: 0.68em;
margin-top: 0;
+ font-size: 34px;
+ }
+
+ h3 {
+ font-size: 22px;
}
img {
diff --git a/changelogs/unreleased/login-page-font-size.yml b/changelogs/unreleased/login-page-font-size.yml
new file mode 100644
index 00000000000..e7775006673
--- /dev/null
+++ b/changelogs/unreleased/login-page-font-size.yml
@@ -0,0 +1,4 @@
+---
+title: Decreases font-size on login page
+merge_request:
+author: