From e2e8e384bb3ebe539af333a064e3d8481eb9b8ea Mon Sep 17 00:00:00 2001
From: Darby <darbsies@gmail.com>
Date: Thu, 18 Jun 2015 13:50:33 -0700
Subject: [PATCH] Revert "Changed the placeholder text and modified the css
class to make it visible"
This reverts commit c39c823421e9dfd3add4cb49a82fa32831797aa0.
---
app/assets/stylesheets/generic/zen.scss | 27 +++++++++++++++++++++----
app/views/projects/_zen.html.haml | 2 +-
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/app/assets/stylesheets/generic/zen.scss b/app/assets/stylesheets/generic/zen.scss
index 7e86a0fe4b9..7ab01187a02 100644
--- a/app/assets/stylesheets/generic/zen.scss
+++ b/app/assets/stylesheets/generic/zen.scss
@@ -63,24 +63,43 @@
}
}
+ // 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: #A8A8A8;
+ color: #999;
}
input:checked ~ .zen-backdrop textarea:-moz-placeholder {
- color: #A8A8A8;
+ color: #999;
opacity: 1;
}
input:checked ~ .zen-backdrop textarea::-moz-placeholder {
- color: #A8A8A8;
+ color: #999;
opacity: 1;
}
input:checked ~ .zen-backdrop textarea:-ms-input-placeholder {
- color: #A8A8A8;
+ color: #999;
}
}
diff --git a/app/views/projects/_zen.html.haml b/app/views/projects/_zen.html.haml
index e27394ab30b..cf1c55ecca6 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: 'You can tag other participants like this: @michael do you think this is a good idea? Also @deborah, what do you think?'
+ = f.text_area attr, class: classes, placeholder: 'Leave a comment'
= link_to nil, class: 'zen-enter-link', tabindex: '-1' do
%i.fa.fa-expand
Edit in fullscreen
--
GitLab