summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorSteven Verbeek <dubcanada@gmail.com>2012-03-24 13:19:20 -0300
committerSteven Verbeek <dubcanada@gmail.com>2012-03-24 13:19:20 -0300
commit194467b8f82dc6ae8a01679276e256efb153856f (patch)
treef64127ce3686d5e9fa2567e91cc024a0378760fd /app
parent46605c9175f6648219e8193904f1af267e98a7ce (diff)
downloadgitlab-ce-194467b8f82dc6ae8a01679276e256efb153856f.tar.gz
Started note attachment changes, and text changes
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/common.scss4
-rw-r--r--app/views/notes/_form.html.haml4
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index a04153878c2..8267a3abaf6 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1115,4 +1115,8 @@ p.time {
height: 30px;
overflow:hidden;
}
+
+ label.large {
+ width:160px;
+ }
} \ No newline at end of file
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index 72fe9b32896..aa51eba25c5 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -24,10 +24,10 @@
.span4
%h5 Attachment:
.clearfix
- = f.label :attachment, "Any file less then 10 MB"
.attachments
- %button.file_upload
+ %button.file_upload.btn
.input= f.file_field :attachment, :class => "input-file"
+ = f.label.large :attachment, "Any file less then 10 MB"
= f.submit 'Add Comment', :class => "btn primary", :id => "submit_note"