diff options
author | Morris Jobke <hey@morrisjobke.de> | 2017-11-27 13:40:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-27 13:40:03 +0100 |
commit | cfae590ac93f8b5c9c633aafbf205f54a7400201 (patch) | |
tree | 015d0fbb25e57e208ec061c5d1e2711dd96bb69d /core | |
parent | e02229e412bcca562a892e3c0692f7ac2ab43c4a (diff) | |
parent | b248c53c6a8a2d420256921ca4889fc553ce8fee (diff) | |
download | nextcloud-server-cfae590ac93f8b5c9c633aafbf205f54a7400201.tar.gz nextcloud-server-cfae590ac93f8b5c9c633aafbf205f54a7400201.zip |
Merge pull request #7266 from nextcloud/fix-input-field-not-disabled-while-a-comment-is-being-sent
Fix input field not disabled while a comment is being sent
Diffstat (limited to 'core')
-rw-r--r-- | core/css/inputs.scss | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/core/css/inputs.scss b/core/css/inputs.scss index 20e8cbf08e0..00e0e47f9a8 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -13,7 +13,7 @@ */ /* Specifically override browser styles */ -input, textarea, select, button, div[contenteditable=true] { +input, textarea, select, button, div[contenteditable=true], div[contenteditable=false] { font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; } .select2-container-multi .select2-choices .select2-search-field input, .select2-search input, .ui-widget { @@ -25,7 +25,8 @@ select, button, input, textarea, -div[contenteditable=true] { +div[contenteditable=true], +div[contenteditable=false] { width: 130px; min-height: 32px; box-sizing: border-box; @@ -88,6 +89,23 @@ div[contenteditable=true], } } +div[contenteditable=false] { + margin: 3px 3px 3px 0; + padding: 7px 6px; + font-size: 13px; + background-color: $color-main-background; + color: nc-lighten($color-main-text, 33%); + border: 1px solid nc-darken($color-main-background, 14%); + outline: none; + border-radius: $border-radius; + cursor: text; + + background-color: nc-darken($color-main-background, 8%); + color: rgba($color-main-text, 0.4); + cursor: default; + opacity: 0.5; +} + /* Specific override */ input { &:not([type='radio']):not([type='checkbox']):not([type='range']):not([type='submit']):not([type='button']):not([type='reset']):not([type='color']):not([type='file']):not([type='image']) { @@ -171,6 +189,13 @@ textarea, div[contenteditable=true] { } } +div[contenteditable=false] { + color: nc-lighten($color-main-text, 33%); + cursor: text; + font-family: inherit; + height: auto; +} + /* Override the ugly select arrow */ select { -webkit-appearance: none; |