hobo_bootstrap 2.0.0.pre4 → 2.0.0.pre5

data/README.md

@@ -1,9 +1,8 @@
-hobo_bootstrap
-==============
-<hr/>
-
 This is a theme for Hobo 1.4 (http://www.hobocentral.net) that implements the Bootstrap library (http://twitter.github.com/bootstrap/).
 
+# hobo_bootstrap
+<hr/>
+
 [![index][1]][1]
 [![login][2]][2]
 
@@ -16,43 +15,20 @@ Install instructions
 Add this to your Gemfile
 
     gem "hobo_bootstrap", :git => "git://github.com/Hobo/hobo_bootstrap.git"
-    gem 'will_paginate-bootstrap'
-    group :assets do
-      # ... Other stuff ... #
-      gem 'compass_twitter_bootstrap', :git => 'git://github.com/wyuenho/compass-twitter-bootstrap'
-      gem 'compass-rails'
-    end
 {.ruby}
 
 Run bundle to get the gems
 
     bundle
 
-Rename front.css to front.scss so you can bootstrap and hobo_bootstrap like this:
-
-    /*
-     * This is the stylesheet manifest file for the front subsite (which
-     * is your whole application if you don't have any subsites).  Files
-     * or plugins referenced from here or placed in the front/ directory
-     * will be included.
-     *
-     *= require_self
-     *= require application
-     *= require hobo_rapid
-     *= require hobo_jquery
-     *= require hobo_jquery_ui
-     *= require jquery-ui/redmond
+Add to your front.scss:
+
      *= require hobo_bootstrap
-     *= require hobo_bootstrap_docs
-     *= require hobo_bootstrap_responsive
-     *= require_tree ./front
-    */
-    @import "compass_twitter_bootstrap";
 {.css}
 
-Load bootstrap javascripts in app/assets/front.js, for example:
+Add to your front.js:
 
-    //= require bootstrap-all
+    //= require hobo_bootstrap
 {.javascript}
 
 Alternatively, you could require bootstrap-collapse and bootstrap-alert, since those are the only two javascript components that this theme currently requires.   However, we do plan on supporting more in the future.
@@ -62,9 +38,7 @@ Change the theme in app/views/taglibs/front_site.dryml:
     <include gem='hobo_bootstrap'/>
 {.dryml}
 
-
-
-
+You will also want to remove any references to your previous theme in the above files.  `hobo_clean` is the name of the old default Hobo theme.
 
 Two main menu options
 =====================
@@ -78,7 +52,7 @@ By default, hobo_bootstrap puts every option in the top menu, like this:
 But you can also use a sub menu, like the one in the bootstrap documentation:
 [![sub_menu][4]][4]
 
-In order to enable the sub meny, add these lines to your front_site.dryml:
+In order to enable the sub menu, add these lines to your front_site.dryml:
 
     <extend tag="page">
       <old-page merge nav-location="sub">
@@ -96,7 +70,39 @@ This theme includes the bootstrap responsive CSS, which makes it work nicely wit
 
 [![responsive][5]][5]
 
+If you don't want to include the responsive CSS use
+
+    *= require hobo_bootstrap/hobo_bootstrap_main
+
+instead of
+
+    *= require hobo_bootstrap
+
+in your front.scss.
+
+
+Bootswatch themes
+=================
+
+If you want to style your theme differently, the easiest way is to choose a theme from [bootswatch](http://bootswatch.com).
+
+In front.scss, remove:
+
+    *= require hobo_bootstrap
+
+and add this to the bottom of the file, outside of the comment:
+
+    @import "bootswatch/cerulean/variables";
+    @import "hobo_bootstrap";
+    @import "bootswatch/cerulean/bootswatch";
+
+Replace `cerulean` with the theme of your choice.
+
+Add to Gemfile
+
+    gem 'bootswatch-rails'
 
+And run `bundle`.
 
 Complex forms
 =============

data/VERSION

@@ -1 +1 @@
-2.0.0.pre4
+2.0.0.pre5

data/hobo_bootstrap.gemspec

@@ -13,8 +13,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('hobo', "~> 2.0.0.pre1")
   s.add_runtime_dependency('hobo_jquery_ui', "~> 2.0.0.pre1")
-  s.add_runtime_dependency "compass_twitter_bootstrap", "~> 2.0.3"
-  s.add_runtime_dependency "compass-rails", "~> 1.0.3"
+  s.add_runtime_dependency "bootstrap-sass", "~> 2.1"
   s.add_runtime_dependency "will_paginate-bootstrap", "~> 0.2.1"
 
   s.files = `git ls-files -x #{name}/* -z`.split("\0")

data/lib/hobo_bootstrap.rb

@@ -1,8 +1,7 @@
 # Sub dependencies written in the gemspec are not loaded by default:
 #   http://stackoverflow.com/questions/6960078
 # We need to require them here, so we can load the JS from bootstrap
-require 'compass_twitter_bootstrap'
-require 'compass-rails'
+require 'bootstrap-sass'
 require 'will_paginate-bootstrap'
 require 'hobo_rapid'
 require 'hobo_jquery'

data/taglibs/page.dryml

@@ -56,9 +56,9 @@ Make your choice global with:
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
               </button>
-              <h1 param="app-name">
+              <div param="app-name">
                 <a class="brand" href="#{base_url}/"><app-name/></a>
-              </h1>
+              </div>
               <main-nav class="nav" current="&title" param if="&nav_location.blank? || nav_location=='top'" />
               <account-nav if="&login_url(Hobo::Model::UserBase.default_user_model)" include-search="&nav_location.blank? || nav_location=='top'" param/>
             </header>

data/taglibs/search.dryml

@@ -2,7 +2,7 @@
 Adds bootstrap styling to `<live-search>`
 -->
 <extend tag="live-search">
-  <old-live-search>
+  <old-live-search remove-class="form-horizontal">
     <label: replace/>
     <form: class="form-search"/>
     <input: placeholder="Search" class="search-query"/>

data/vendor/assets/javascripts/hobo_bootstrap.js

@@ -1 +1 @@
-//=require bootstrap-all
+//= require bootstrap

data/vendor/assets/stylesheets/hobo_bootstrap.scss

@@ -0,0 +1,3 @@
+@import "hobo_bootstrap/hobo_bootstrap_main";
+@import "hobo_bootstrap/hobo_bootstrap_responsive";
+@import "hobo_bootstrap/hobo_bootstrap_docs";

data/vendor/assets/stylesheets/hobo_bootstrap/hobo_bootstrap_main.scss

@@ -1,5 +1,5 @@
 
-@import "compass_twitter_bootstrap";
+@import "bootstrap";
 
 /* Top menu bar (app name, login...): 
    It's full width so border-radius is unnecessary */
@@ -57,7 +57,7 @@ div.hidden-fields {
 /* spinner */
 .ajax-progress{
   padding: 0 20px 10px;
-  background: url(ajax-loader.gif) no-repeat 0px 1px;
+  background: image-url('ajax-loader.gif') no-repeat 0px 1px;
   display: none;
   z-index: 1000;
 }
@@ -100,10 +100,10 @@ ul.collection { margin-left: 0;}
 
 /* Icon URLs */
 [class^="icon-"], [class*=" icon-"] {
-  background-image: url("../glyphicons-halflings.png");
+  background-image: image-url("glyphicons-halflings.png");
 }
 .icon-white {
-    background-image: url("../glyphicons-halflings-white.png");
+    background-image: image-url("glyphicons-halflings-white.png");
 }
 
 
@@ -126,5 +126,18 @@ ul.collection { margin-left: 0;}
 }
 .control-group.required .control-label:after {
   content:"*";
-  color: #C62121; 
+  color: #C62121;
+}
+
+
+
+/* Sortable collection */
+div.ordering-handle {
+  background: none repeat scroll 0 0 #CCCCCC;
+  color: white;
+  cursor: move;
+  float: left;
+  margin-right: 5px;
+  padding: 0 2px;
+  border-radius: 4px 4px 4px 4px;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hobo_bootstrap
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre4
+  version: 2.0.0.pre5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobo
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0.pre1
 - !ruby/object:Gem::Dependency
-  name: compass_twitter_bootstrap
+  name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,23 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
-- !ruby/object:Gem::Dependency
-  name: compass-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: will_paginate-bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +114,7 @@ files:
 - taglibs/tabs.dryml
 - vendor/assets/images/ajax-loader.gif
 - vendor/assets/javascripts/hobo_bootstrap.js
-- vendor/assets/stylesheets/hobo_bootstrap.css
+- vendor/assets/stylesheets/hobo_bootstrap.scss
 - vendor/assets/stylesheets/hobo_bootstrap/hobo_bootstrap_docs.css
 - vendor/assets/stylesheets/hobo_bootstrap/hobo_bootstrap_main.scss
 - vendor/assets/stylesheets/hobo_bootstrap/hobo_bootstrap_responsive.scss

data/vendor/assets/stylesheets/hobo_bootstrap.css

@@ -1 +0,0 @@
-//= require_tree './hobo_bootstrap'