diff options
| author | Benjamin Neff <benjamin@coding4coffee.ch> | 2019-06-17 02:20:42 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2019-06-17 02:20:42 +0300 |
| commit | 6f14f1b850e5aa085b1c53cc8666f5ddf4ec1e6c (patch) | |
| tree | 66075659ec288b740cf9781cd8eb7d686463797d /app/assets/stylesheets | |
| parent | 0f0b3edec2d6b300987a3b997fbafb6243b2dd72 (diff) | |
| parent | d674f5391046f27b62aa1d450bc1283fde0a8fd2 (diff) | |
Merge branch 'next-minor' into develop
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/markdown-content.scss | 24 | ||||
| -rw-r--r-- | app/assets/stylesheets/registration.scss | 7 |
2 files changed, 26 insertions, 5 deletions
diff --git a/app/assets/stylesheets/markdown-content.scss b/app/assets/stylesheets/markdown-content.scss index 6b092dbdb..c5813de21 100644 --- a/app/assets/stylesheets/markdown-content.scss +++ b/app/assets/stylesheets/markdown-content.scss @@ -16,6 +16,30 @@ } } + h1 { + font-size: 2.7rem; + } + + h2 { + font-size: 2.3rem; + } + + h3 { + font-size: 2rem; + } + + h4 { + font-size: 1.8rem; + } + + h5 { + font-size: 1.6rem; + } + + h6 { + font-size: 1.4rem; + } + .img-responsive { display: inline; } diff --git a/app/assets/stylesheets/registration.scss b/app/assets/stylesheets/registration.scss index 5fb2a2bc6..6fd755464 100644 --- a/app/assets/stylesheets/registration.scss +++ b/app/assets/stylesheets/registration.scss @@ -38,16 +38,13 @@ width: 120px; } - .captcha-input { + .form-control.captcha-input { border-bottom: 1px solid $input-border; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; box-sizing: border-box; - font-size: 16px; - height: 40px; line-height: $line-height-base; - padding: 10px 10px 10px 130px; - width: 100%; + padding-left: 130px; } .terms > a { |