speedo 0.1.2 → 0.1.3

data/app/assets/stylesheets/speedo.css.scss

@@ -1,4 +1,5 @@
 @import "normalize";
+@import "formtastic-buttonless";
 @import "autoSuggest";
 @import "chosen";
 @import "gh-buttons";
@@ -171,10 +172,19 @@ footer {
 .dataTables_wrapper {
   @include clearfix;
 }
-div.selector, div.uploader {
+div.uni-selector, div.uni-uploader {
   margin-left:-2px;         /* Left aligns the uniform masks, but be careful if they're inline */
 }
+.formtastic textarea {
+  padding:5px;
+}
+.inline_choices .choice {
+  display:inline-block; zoom:1;*display:inline;
+  vertical-align:top;
+  margin-right:1em;
+}
 ul.as-selections {
+  width:72%; // To match the formtastic input widths
   border:1px solid #999;
   @include border-radius(3px);
   padding:5px;
@@ -185,6 +195,10 @@ ul.as-selections {
     &:focus {color:inherit;}
   }
 }
+.as-results {
+  position:absolute;
+  left:25%; // To match the formtastic label width
+}
 .button-group, .button {
   vertical-align:top;
 }

data/app/views/speedo/home/examples.html.haml

@@ -1,16 +1,26 @@
 - @col_layout = 'threecol'
 
-%h1 Buttons - h1
-%button.button.icon.add Click
-.button-group
-  %input.button.danger{type: :submit, value: 'Cancel'}
-  %a.button.icon.comment.popup{href: '#popup', title: 'Popup title'} Popup
-.button Nothing
-
-%time.ago{datetime: '2012-03-17'}
-
-
-%h2 Sortable Table - h2
+%h1 Forms with Uniform, AutoGrowing, AutoSuggesting - h1
+= semantic_form_for 'speedo' do |f|
+  = f.inputs do
+    = f.input 'Title', placeholder: 'Type your title'
+    = f.input 'Singer', input_html: { class: 'autoSuggest' }
+    = f.input 'Description', as: :text, input_html: { placeholder: 'AutoGrowing', class: 'autoGrow', :rows => 2 }
+    = f.input 'Attachment', as: :file, required: false
+    = f.input 'Select', as: :select, include_blank: false
+    = f.input 'Are you real?', as: :radio, wrapper_html: { class: 'inline_choices' }
+    = f.input 'Which do you own?', as: :check_boxes, collection: ['Speedo','Swim Short','Bikini'], wrapper_html: { class: 'inline_choices' }
+
+  %h2 Buttons and button-groups - h2
+  .button-group
+    = f.actions do
+      = f.action :submit, label: 'Submit', as: :button, button_html: { class: 'button' }
+      = f.action :cancel, label: 'Cancel', as: :link, button_html: { class: 'button danger' }
+  = link_to 'Popup', '#popup', class: 'button popup icon comment', title: 'Popup title'
+  %button.button.icon.add Add icon
+
+
+%h3 Sortable dataTable - h3
 %table.dataTable
   %thead
     %tr
@@ -28,8 +38,7 @@
       %td hermahili
 
 
-
-%h3 Inputs with bonuses - h3
+%h4 Inputs with bonuses - h4
 %select.chzn{style: 'width:200px'}
   %option Canada
   %option UK
@@ -39,47 +48,7 @@
 %input{type: :date, placeholder: 'yy-mm-dd'}
 
 
-
-%h4 AutoGrowing, AutoSuggesting - h4
-%textarea.autoGrow{cols: '50', placeholder: 'AutoGrowing'}
-
-%br
-%input.autoSuggest
-
-
-
-%h5 Uniformed Inputs - h5
-%label
-  %input{type: :checkbox, checked: 'checked'}
-  One
-%label  
-  %input{type: :checkbox}
-  Two
-%label  
-  %input{type: :checkbox}
-  Three
-%br
-
-%label
-  %input{type: :radio, name: 'radio', checked: 'checked'}
-  One
-%label
-  %input{type: :radio, name: 'radio'}
-  Two
-%label
-  %input{type: :radio, name: 'radio'}
-  Three
-
-%br
-%select
-  %option Select Something
-
-%br
-%input{type: :file}
-
-
-
-%h6 Lists and time - h6
+%h5 Lists - h5
 %ul
   %li This is a list:
   %li no margin 
@@ -87,6 +56,8 @@
   %li or bullets
   %li (you'll need to add them back when you need 'em)
 
+
+%h6 Time - h6
 %pre.ib %time.ago{datetime: Time.now.iso8601}
 results in telling us when this page was loaded:
 %time.ago.notice.flash{datetime: Time.now.iso8601}

data/lib/generators/speedo/install_generator.rb

@@ -40,6 +40,9 @@ module Speedo
           else
             say 'Make sure to @import "speedo"; in your application.css.scss, and @import other files - do NOT use *=require.'
           end
+        else
+          copy_file 'app/assets/stylesheets/application.css.scss', 
+                    'app/assets/stylesheets/application.css.scss'
         end
         
         if File.exist? 'app/assets/stylesheets/application.css'

data/lib/speedo/version.rb

@@ -1,3 +1,3 @@
 module Speedo
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end