From: Andy Allan Date: Sun, 22 Dec 2019 10:21:14 +0000 (+0000) Subject: Merge pull request #2464 from hikemaniac/fix-comment-textarea X-Git-Tag: live~3361 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/281d7992f857e7e7c64947a06470898c35035bb6?ds=inline;hp=-c Merge pull request #2464 from hikemaniac/fix-comment-textarea Improve textarea behaviour --- 281d7992f857e7e7c64947a06470898c35035bb6 diff --combined app/assets/stylesheets/common.scss index 6e73da63b,e8db49b7a..c3b7dca67 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@@ -1,5 -1,4 +1,5 @@@ @import "parameters"; +@import "bootstrap-custom"; /* Styles common to large and small screens */ @@@ -109,6 -108,23 +109,6 @@@ body height: 100%; } -h1, h2, h3 { - font-weight: 600; - line-height: 1.2; -} - -h4, h5 { - font-weight: 500; -} - -h1 { - font-size: 18px; -} - -h2, h3 { - font-size: 16px; -} - p > img { width: auto; max-width: 100%; @@@ -264,18 -280,11 +264,18 @@@ header } h1 { + font-size: 18px; + font-weight: 600; + line-height: 1.2; margin: 0; padding-top: 15px; a { color: #000; + } + + a:hover { + color: #000; } } } @@@ -2083,6 -2092,7 +2083,7 @@@ textarea color: #222; background-color: #fff; border: 1px solid $grey; + border-radius: 3px; padding: 2px 5px; margin: 0; width: 200px; @@@ -2095,6 -2105,8 +2096,8 @@@ textarea { padding: 5px; width: 100%; + min-height: 50px; + resize: vertical; } /* Rules for user images */