speedo 0.2.0 → 0.2.5

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

@@ -5,20 +5,30 @@
   = 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 tip', :rows => 2, title: 'Tip: you can type what you like, and this will get bigger to fit!' }
+    = f.input 'Description', as: :text, input_html: { placeholder: 'AutoGrowing', class: 'autogrow tip', :rows => 2, title: 'Tip: you can type what you like, and this will get bigger to fit!', data: {placement: 'bottom'} }
     = 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' }
-  %button.button.icon.add Add icon
-
-
+    = f.input 'Which do you own?', as: :check_boxes, collection: ['Speedo','Swim Short','Bikini']
+  
+  %hr
+  %h2 Buttons - h2
+  = f.actions do
+    = f.action :submit, label: 'Submit', as: :button, button_html: { class: 'btn left' }
+    = f.action :cancel, label: 'Cancel', as: :link, button_html: { class: 'btn btn-danger left' }
+  .btn-group
+    %button.btn.btn-success
+      %i.icon-plus.icon-white
+      Plus icon
+    %button.btn
+      %i.icon-cog
+      Cog icon
+    %button.btn.btn-danger
+      %i.icon-remove.icon-white
+      Remove icon
+  = link_to 'Bootstrap buttons docs', 'http://twitter.github.com/bootstrap/base-css.html#buttons', target: '_blank'
+
+%hr
 %h3 Sortable dataTable - h3
 %table.dataTable
   %thead
@@ -36,7 +46,7 @@
       %td Hilary
       %td hermahili
 
-
+%hr
 %h4 Inputs with bonuses - h4
 %select.chzn{style: 'width:200px'}
   %option Canada
@@ -46,7 +56,7 @@
 %br
 %input{type: :date, placeholder: 'yy-mm-dd'}
 
-
+%hr
 %h5 Lists - h5
 %ul
   %li This is a list:
@@ -55,7 +65,7 @@
   %li or bullets
   %li (you'll need to add them back when you need 'em)
 
-
+%hr
 %h6 Time - h6
 %pre.ib %time.ago{datetime: Time.now.iso8601}
 results in telling us when this page was loaded:
@@ -69,7 +79,7 @@ results in telling us when this page was loaded:
 
 = content_for :left_col do
   %h2 Left Col
-  %button.button.spin_me Start spinner
+  %button.btn.spin_me Start spinner
   %script
     $('.spin_me').toggle(function() {
     $(this).spin('large','#0090D5');
@@ -79,27 +89,42 @@ results in telling us when this page was loaded:
 
 = content_for :right_col do
   %h3 Right Col
-  .modal.button.icon.comment{rel: '#modal'} Modal
+  %a.btn{href: '#modal', data: {toggle: 'modal', backdrop: 'static'}} Modal
   %br
-  .popup.button.icon.comment{rel: '#popup'} Popup Help!
+  %button.btn{data: {toggle: 'modal', target: '#popup'}} Popup Help!
   %br
-  = link_to 'External Modal', '/', class: 'modal button icon comment', rel: '#external'
-  %br
-  = link_to 'External Popup', '/', class: 'popup button icon comment', rel: '#external'
+  = link_to 'External Popup', '/', class: 'btn', data: {toggle: 'modal', target: '#external'}
 
 
 = content_for :popups do
-  #popup.popup_content
-    %h2.title Helpful Popup
-    %p For popups and modals, all <a> tags will be assumed to be external links that load in content (they still require a placeholder div). Other .popup's assume the content is already on the page. Use "= content_for :popups do".
-    %p Use .popup with rel="#id" on the button (or whatever opens the popup), and #id.popup_content for the content. Within popups, .title receives special styling.
-    %p Modals are for when user input is required before continuing. Make sure to provide a .close element, or the X will be visible in the top-right.
-  #modal.popup_content
-    %h2.title Modal
-    %p Modals needs .close to close them. Use them when user input is required.
-    %p For example: Which are you?
-    %button.button.close Right handed
-    %button.button.close Left handed
-    %button.button.close Ambidextrous
-  #external.popup_content
-    .wrap
+  #modal.modal.hide
+    .modal-header
+      %h2 Modal
+    .modal-body
+      %p When you need user input, set data-backdrop to 'static' and clicking the overlay will have no effect.
+    .modal-footer
+      %p For example: Which are you?
+      %button.btn{data:{dismiss:'modal'}} Right handed
+      %button.btn{data:{dismiss:'modal'}} Left handed
+      %button.btn{data:{dismiss:'modal'}} Ambidextrous
+  #popup.modal.hide
+    .modal-header
+      %button.close{data:{dismiss:"modal"}} ×
+      %h2 Helpful Popup
+    .modal-body
+      %p Put your popup content in "= content_for :popups do".
+      %p Popups should have an #ID and .modal.hide. You can have .modal-header, -body and -footer within modals.
+      %p External content can be loaded by specifying both href="external-link" and data-target="#id-of-modal". Make sure to include a .modal-body for the content to be loaded into.
+      %pre
+        \#external.modal.hide
+        \  .modal-body
+    .modal-footer
+      = link_to 'View bootstrap docs', 'http://twitter.github.com/bootstrap/javascript.html#modals', target: '_blank'
+  #external.modal.hide
+    .modal-header
+      %button.close{data:{dismiss:"modal"}} ×
+      %h1 The heading isn't external
+    .modal-body
+    .modal-footer
+      Neither is the footer
+

data/lib/generators/speedo/install_generator.rb

@@ -25,9 +25,12 @@ module Speedo
       end
 
       # app/assets/stylesheets/speedo.css.scss
-      def copy_stylesheet
-        copy_file 'app/assets/stylesheets/speedo.css.scss', 
-                  'app/assets/stylesheets/speedo.css.scss'
+      def copy_stylesheets
+        css = ['speedo','base','layout','plugins','theme','helpers']
+        css.each do |file|
+          copy_file "app/assets/stylesheets/speedo/#{file}.css.scss", 
+                    "app/assets/stylesheets/speedo/#{file}.css.scss"
+        end
       end
 
       

data/lib/speedo/version.rb

@@ -1,3 +1,3 @@
 module Speedo
-  VERSION = "0.2.0"
+  VERSION = "0.2.5"
 end