summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAriejan de Vroom <ariejan@ariejan.net>2012-03-14 12:39:33 +0200
committerAriejan de Vroom <ariejan@ariejan.net>2012-03-14 12:39:33 +0200
commited11ca13e80341ed604198426f4d516618e4d23f (patch)
tree2686f70db981501666ab6676c326ee99abcbf12a
parent317963b1ab6dcf6cf7ccd4aaa6f5928128651878 (diff)
downloadgitlab-ce-ed11ca13e80341ed604198426f4d516618e4d23f.tar.gz
Added form hint about markdown for the project description
-rw-r--r--app/assets/stylesheets/common.scss5
-rw-r--r--app/views/projects/_form.html.haml4
2 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index f6120e68db5..6be40104b6e 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -921,3 +921,8 @@ p.time {
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.1);
box-shadow: 0 1px 2px rgba(0,0,0,.1);
}
+
+.hint {
+ font-style: italic;
+ color: #999;
+}
diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml
index a65a0244a8f..9c39f807146 100644
--- a/app/views/projects/_form.html.haml
+++ b/app/views/projects/_form.html.haml
@@ -48,7 +48,9 @@
.clearfix
= f.label :description
- .input= f.text_area :description, :placeholder => "project description", :class => "xlarge", :rows => 4
+ .input
+ = f.text_area :description, :placeholder => "project description", :class => "xlarge", :rows => 4
+ %p.hint Markdown is enabled.
%br