fix form and css

barthezslavik · Dec 22, 2012 · 3b30866 · 3b30866
1 parent 181dea7
commit 3b30866
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 79 deletions.
diff --git a/app/assets/stylesheets/main.css.sass b/app/assets/stylesheets/main.css.sass
@@ -0,0 +1,11 @@
+p, a
+  font-family: Verdana
+  font-size: 13px
+
+
+.simple_form label
+  font-size: 12px
+  font-weight: bold
+  float: left
+  width: 150px
+  margin: 5px 10px 4px 0
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
diff --git a/app/views/samples/_form.html.haml b/app/views/samples/_form.html.haml
@@ -1,5 +1,7 @@
 = simple_form_for @sample do |f|
-  = f.input :name
-  = f.input :description
-  = f.input :screenshot, :as => :file
-  = f.submit 'Save'
+  .inputs.clearfix
+    = f.input :name
+    = f.input :description
+    = f.input :screenshot, :as => :file
+  .actions.clearfix
+    = f.submit 'Save'
diff --git a/app/views/samples/index.html.haml b/app/views/samples/index.html.haml
@@ -3,8 +3,7 @@
     %tr
       %td
         - screenshot = image_tag sample.screenshot.url(:medium) if sample.screenshot
-        - if sample.screenshot_file_name?
-          = screenshot
+        = screenshot
       %td= link_to sample.name, sample, data:{ push: true }
   /= link_to 'Edit', edit_sample_path(sample)
   /= link_to 'Destroy', sample, :confirm => 'Are you sure?', :method => :delete

diff --git a/app/views/samples/new.html.haml b/app/views/samples/new.html.haml
@@ -1,5 +1,2 @@
-%h1 New sample
-
 = render 'form'
-
-= link_to 'Back', samples_path
+/= link_to 'Back', samples_path
diff --git a/public/screenshots/medium/missing.png b/public/screenshots/medium/missing.png