Commit e5fa0bb127a5fda436a484a079604fc3b9098a48

Authored by Steven Verbeek
1 parent fb4c033a

Started note attachment changes, and text changes

app/assets/stylesheets/common.scss
@@ -1102,18 +1102,15 @@ p.time { @@ -1102,18 +1102,15 @@ p.time {
1102 1102
1103 .file_upload { 1103 .file_upload {
1104 position: absolute; 1104 position: absolute;
1105 - width: 100%;  
1106 - height: 100%; 1105 + right:14px;
  1106 + top:7px;
  1107 + height: 30px;
1107 } 1108 }
1108 1109
1109 div.attachments { 1110 div.attachments {
1110 position:relative; 1111 position:relative;
1111 - width: 100px;  
1112 - height: 30px; 1112 + width: 350px;
  1113 + height: 40px;
1113 overflow:hidden; 1114 overflow:hidden;
1114 } 1115 }
1115 -  
1116 - label.large {  
1117 - width:160px;  
1118 - }  
1119 } 1116 }
1120 \ No newline at end of file 1117 \ No newline at end of file
app/views/notes/_form.html.haml
@@ -24,10 +24,11 @@ @@ -24,10 +24,11 @@
24 .span8 24 .span8
25 %h5 Attachment: 25 %h5 Attachment:
26 .clearfix 26 .clearfix
27 - .attachments  
28 - %button.file_upload.btn "Upload File" 27 + .attachments.breadcrumb
  28 + %span.file_name File name...
  29 + %button.file_upload.btn.primary Upload File
29 .input= f.file_field :attachment, :class => "input-file" 30 .input= f.file_field :attachment, :class => "input-file"
30 - %label.large{:for => "attachment"} "Any file less then 10 MB" 31 + %span Any file less then 10 MB
31 32
32 33
33 = f.submit 'Add Comment', :class => "btn primary", :id => "submit_note" 34 = f.submit 'Add Comment', :class => "btn primary", :id => "submit_note"