summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2011-12-28 01:29:53 +0200
committerValery Sizov <vsv2711@gmail.com>2011-12-28 01:29:53 +0200
commitde83c91c2fd8b8f5c7230e2515d6e206331fd37f (patch)
tree9907eb79bfeacbf0d56ff273560128f679f2fd96
parent49b58057091cbe6d9d684d78b1efbc77c578bcd8 (diff)
downloadgitlab-ce-de83c91c2fd8b8f5c7230e2515d6e206331fd37f.tar.gz
small redesign of controls of notes
-rw-r--r--app/assets/stylesheets/notes.css.scss8
-rw-r--r--app/views/notes/_form.html.haml14
2 files changed, 16 insertions, 6 deletions
diff --git a/app/assets/stylesheets/notes.css.scss b/app/assets/stylesheets/notes.css.scss
index c3ee843afa3..4aba53cfd5c 100644
--- a/app/assets/stylesheets/notes.css.scss
+++ b/app/assets/stylesheets/notes.css.scss
@@ -42,3 +42,11 @@ body.project-page #notes-list .note span.note-author strong{font-weight: bold; f
.note .note-title { margin-left:55px; }
+
+p.notify_controls input{
+ margin: 5px;
+}
+
+p.notify_controls span{
+ font-weight: 700;
+}
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index 23c9553ebb1..65af82b35c5 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -22,13 +22,15 @@
%br
%br
= f.file_field :attachment
+
+ %p.notify_controls
+ %span Notify:
+ = check_box_tag :notify, 1, @note.noteable_type != "Commit"
+ = label_tag :notify, "Project team"
- = check_box_tag :notify, 1, @note.noteable_type != "Commit"
- = label_tag :notify, "Notify project team about your note"
-
- -if @note.noteable_type == "Commit"
- = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
- = label_tag :notify_author, "Notify commit author about your note"
+ -if @note.noteable_type == "Commit"
+ = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
+ = label_tag :notify_author, "Commit author"
.clear
%br