diff options
| author | Darby <darbsies@gmail.com> | 2015-06-16 14:44:13 -0700 |
|---|---|---|
| committer | Darby <darbsies@gmail.com> | 2015-06-16 14:44:13 -0700 |
| commit | c39c823421e9dfd3add4cb49a82fa32831797aa0 (patch) | |
| tree | 227b0b23dbd5770312af9777986da4d752bfca49 | |
| parent | 5fa0248966316d672429eabc46407e1429ef2283 (diff) | |
| download | gitlab-ce-placeholder_text.tar.gz | |
Changed the placeholder text and modified the css class to make it visibleplaceholder_text
| -rw-r--r-- | Gemfile.lock | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/generic/zen.scss | 27 | ||||
| -rw-r--r-- | app/views/projects/_zen.html.haml | 2 |
3 files changed, 8 insertions, 24 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fd7cbd508e5..a81f590713b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -855,3 +855,6 @@ DEPENDENCIES virtus webmock (~> 1.21.0) wikicloth (= 0.8.1) + +BUNDLED WITH + 1.10.3 diff --git a/app/assets/stylesheets/generic/zen.scss b/app/assets/stylesheets/generic/zen.scss index 7ab01187a02..7e86a0fe4b9 100644 --- a/app/assets/stylesheets/generic/zen.scss +++ b/app/assets/stylesheets/generic/zen.scss @@ -63,43 +63,24 @@ } } - // Make the placeholder text in the standard textarea the same color as the - // background, effectively hiding it - - .zen-backdrop textarea::-webkit-input-placeholder { - color: white; - } - - .zen-backdrop textarea:-moz-placeholder { - color: white; - } - - .zen-backdrop textarea::-moz-placeholder { - color: white; - } - - .zen-backdrop textarea:-ms-input-placeholder { - color: white; - } - // Make the color of the placeholder text in the Zenned-out textarea darker, // so it becomes visible input:checked ~ .zen-backdrop textarea::-webkit-input-placeholder { - color: #999; + color: #A8A8A8; } input:checked ~ .zen-backdrop textarea:-moz-placeholder { - color: #999; + color: #A8A8A8; opacity: 1; } input:checked ~ .zen-backdrop textarea::-moz-placeholder { - color: #999; + color: #A8A8A8; opacity: 1; } input:checked ~ .zen-backdrop textarea:-ms-input-placeholder { - color: #999; + color: #A8A8A8; } } diff --git a/app/views/projects/_zen.html.haml b/app/views/projects/_zen.html.haml index cf1c55ecca6..e27394ab30b 100644 --- a/app/views/projects/_zen.html.haml +++ b/app/views/projects/_zen.html.haml @@ -2,7 +2,7 @@ %input#zen-toggle-comment.zen-toggle-comment{ tabindex: '-1', type: 'checkbox' } .zen-backdrop - classes << ' js-gfm-input markdown-area' - = f.text_area attr, class: classes, placeholder: 'Leave a comment' + = f.text_area attr, class: classes, placeholder: 'You can tag other participants like this: @michael do you think this is a good idea? Also @deborah, what do you think?' = link_to nil, class: 'zen-enter-link', tabindex: '-1' do %i.fa.fa-expand Edit in fullscreen |