hobo_bootstrap 2.0.0.pre4 → 2.0.0.pre5
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +41 -35
- data/VERSION +1 -1
- data/hobo_bootstrap.gemspec +1 -2
- data/lib/hobo_bootstrap.rb +1 -2
- data/taglibs/page.dryml +2 -2
- data/taglibs/search.dryml +1 -1
- data/vendor/assets/javascripts/hobo_bootstrap.js +1 -1
- data/vendor/assets/stylesheets/hobo_bootstrap.scss +3 -0
- data/vendor/assets/stylesheets/hobo_bootstrap/hobo_bootstrap_main.scss +18 -5
- metadata +6 -22
- data/vendor/assets/stylesheets/hobo_bootstrap.css +0 -1
data/README.md
CHANGED
@@ -1,9 +1,8 @@
|
|
1
|
-
hobo_bootstrap
|
2
|
-
==============
|
3
|
-
<hr/>
|
4
|
-
|
5
1
|
This is a theme for Hobo 1.4 (http://www.hobocentral.net) that implements the Bootstrap library (http://twitter.github.com/bootstrap/).
|
6
2
|
|
3
|
+
# hobo_bootstrap
|
4
|
+
<hr/>
|
5
|
+
|
7
6
|
[![index][1]][1]
|
8
7
|
[![login][2]][2]
|
9
8
|
|
@@ -16,43 +15,20 @@ Install instructions
|
|
16
15
|
Add this to your Gemfile
|
17
16
|
|
18
17
|
gem "hobo_bootstrap", :git => "git://github.com/Hobo/hobo_bootstrap.git"
|
19
|
-
gem 'will_paginate-bootstrap'
|
20
|
-
group :assets do
|
21
|
-
# ... Other stuff ... #
|
22
|
-
gem 'compass_twitter_bootstrap', :git => 'git://github.com/wyuenho/compass-twitter-bootstrap'
|
23
|
-
gem 'compass-rails'
|
24
|
-
end
|
25
18
|
{.ruby}
|
26
19
|
|
27
20
|
Run bundle to get the gems
|
28
21
|
|
29
22
|
bundle
|
30
23
|
|
31
|
-
|
32
|
-
|
33
|
-
/*
|
34
|
-
* This is the stylesheet manifest file for the front subsite (which
|
35
|
-
* is your whole application if you don't have any subsites). Files
|
36
|
-
* or plugins referenced from here or placed in the front/ directory
|
37
|
-
* will be included.
|
38
|
-
*
|
39
|
-
*= require_self
|
40
|
-
*= require application
|
41
|
-
*= require hobo_rapid
|
42
|
-
*= require hobo_jquery
|
43
|
-
*= require hobo_jquery_ui
|
44
|
-
*= require jquery-ui/redmond
|
24
|
+
Add to your front.scss:
|
25
|
+
|
45
26
|
*= require hobo_bootstrap
|
46
|
-
*= require hobo_bootstrap_docs
|
47
|
-
*= require hobo_bootstrap_responsive
|
48
|
-
*= require_tree ./front
|
49
|
-
*/
|
50
|
-
@import "compass_twitter_bootstrap";
|
51
27
|
{.css}
|
52
28
|
|
53
|
-
|
29
|
+
Add to your front.js:
|
54
30
|
|
55
|
-
//= require
|
31
|
+
//= require hobo_bootstrap
|
56
32
|
{.javascript}
|
57
33
|
|
58
34
|
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:
|
|
62
38
|
<include gem='hobo_bootstrap'/>
|
63
39
|
{.dryml}
|
64
40
|
|
65
|
-
|
66
|
-
|
67
|
-
|
41
|
+
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.
|
68
42
|
|
69
43
|
Two main menu options
|
70
44
|
=====================
|
@@ -78,7 +52,7 @@ By default, hobo_bootstrap puts every option in the top menu, like this:
|
|
78
52
|
But you can also use a sub menu, like the one in the bootstrap documentation:
|
79
53
|
[![sub_menu][4]][4]
|
80
54
|
|
81
|
-
In order to enable the sub
|
55
|
+
In order to enable the sub menu, add these lines to your front_site.dryml:
|
82
56
|
|
83
57
|
<extend tag="page">
|
84
58
|
<old-page merge nav-location="sub">
|
@@ -96,7 +70,39 @@ This theme includes the bootstrap responsive CSS, which makes it work nicely wit
|
|
96
70
|
|
97
71
|
[![responsive][5]][5]
|
98
72
|
|
73
|
+
If you don't want to include the responsive CSS use
|
74
|
+
|
75
|
+
*= require hobo_bootstrap/hobo_bootstrap_main
|
76
|
+
|
77
|
+
instead of
|
78
|
+
|
79
|
+
*= require hobo_bootstrap
|
80
|
+
|
81
|
+
in your front.scss.
|
82
|
+
|
83
|
+
|
84
|
+
Bootswatch themes
|
85
|
+
=================
|
86
|
+
|
87
|
+
If you want to style your theme differently, the easiest way is to choose a theme from [bootswatch](http://bootswatch.com).
|
88
|
+
|
89
|
+
In front.scss, remove:
|
90
|
+
|
91
|
+
*= require hobo_bootstrap
|
92
|
+
|
93
|
+
and add this to the bottom of the file, outside of the comment:
|
94
|
+
|
95
|
+
@import "bootswatch/cerulean/variables";
|
96
|
+
@import "hobo_bootstrap";
|
97
|
+
@import "bootswatch/cerulean/bootswatch";
|
98
|
+
|
99
|
+
Replace `cerulean` with the theme of your choice.
|
100
|
+
|
101
|
+
Add to Gemfile
|
102
|
+
|
103
|
+
gem 'bootswatch-rails'
|
99
104
|
|
105
|
+
And run `bundle`.
|
100
106
|
|
101
107
|
Complex forms
|
102
108
|
=============
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
2.0.0.
|
1
|
+
2.0.0.pre5
|
data/hobo_bootstrap.gemspec
CHANGED
@@ -13,8 +13,7 @@ Gem::Specification.new do |s|
|
|
13
13
|
|
14
14
|
s.add_runtime_dependency('hobo', "~> 2.0.0.pre1")
|
15
15
|
s.add_runtime_dependency('hobo_jquery_ui', "~> 2.0.0.pre1")
|
16
|
-
s.add_runtime_dependency "
|
17
|
-
s.add_runtime_dependency "compass-rails", "~> 1.0.3"
|
16
|
+
s.add_runtime_dependency "bootstrap-sass", "~> 2.1"
|
18
17
|
s.add_runtime_dependency "will_paginate-bootstrap", "~> 0.2.1"
|
19
18
|
|
20
19
|
s.files = `git ls-files -x #{name}/* -z`.split("\0")
|
data/lib/hobo_bootstrap.rb
CHANGED
@@ -1,8 +1,7 @@
|
|
1
1
|
# Sub dependencies written in the gemspec are not loaded by default:
|
2
2
|
# http://stackoverflow.com/questions/6960078
|
3
3
|
# We need to require them here, so we can load the JS from bootstrap
|
4
|
-
require '
|
5
|
-
require 'compass-rails'
|
4
|
+
require 'bootstrap-sass'
|
6
5
|
require 'will_paginate-bootstrap'
|
7
6
|
require 'hobo_rapid'
|
8
7
|
require 'hobo_jquery'
|
data/taglibs/page.dryml
CHANGED
@@ -56,9 +56,9 @@ Make your choice global with:
|
|
56
56
|
<span class="icon-bar"></span>
|
57
57
|
<span class="icon-bar"></span>
|
58
58
|
</button>
|
59
|
-
<
|
59
|
+
<div param="app-name">
|
60
60
|
<a class="brand" href="#{base_url}/"><app-name/></a>
|
61
|
-
</
|
61
|
+
</div>
|
62
62
|
<main-nav class="nav" current="&title" param if="&nav_location.blank? || nav_location=='top'" />
|
63
63
|
<account-nav if="&login_url(Hobo::Model::UserBase.default_user_model)" include-search="&nav_location.blank? || nav_location=='top'" param/>
|
64
64
|
</header>
|
data/taglibs/search.dryml
CHANGED
@@ -1 +1 @@
|
|
1
|
-
//=require bootstrap
|
1
|
+
//= require bootstrap
|
@@ -1,5 +1,5 @@
|
|
1
1
|
|
2
|
-
@import "
|
2
|
+
@import "bootstrap";
|
3
3
|
|
4
4
|
/* Top menu bar (app name, login...):
|
5
5
|
It's full width so border-radius is unnecessary */
|
@@ -57,7 +57,7 @@ div.hidden-fields {
|
|
57
57
|
/* spinner */
|
58
58
|
.ajax-progress{
|
59
59
|
padding: 0 20px 10px;
|
60
|
-
background: url(ajax-loader.gif) no-repeat 0px 1px;
|
60
|
+
background: image-url('ajax-loader.gif') no-repeat 0px 1px;
|
61
61
|
display: none;
|
62
62
|
z-index: 1000;
|
63
63
|
}
|
@@ -100,10 +100,10 @@ ul.collection { margin-left: 0;}
|
|
100
100
|
|
101
101
|
/* Icon URLs */
|
102
102
|
[class^="icon-"], [class*=" icon-"] {
|
103
|
-
background-image: url("
|
103
|
+
background-image: image-url("glyphicons-halflings.png");
|
104
104
|
}
|
105
105
|
.icon-white {
|
106
|
-
background-image: url("
|
106
|
+
background-image: image-url("glyphicons-halflings-white.png");
|
107
107
|
}
|
108
108
|
|
109
109
|
|
@@ -126,5 +126,18 @@ ul.collection { margin-left: 0;}
|
|
126
126
|
}
|
127
127
|
.control-group.required .control-label:after {
|
128
128
|
content:"*";
|
129
|
-
color: #C62121;
|
129
|
+
color: #C62121;
|
130
|
+
}
|
131
|
+
|
132
|
+
|
133
|
+
|
134
|
+
/* Sortable collection */
|
135
|
+
div.ordering-handle {
|
136
|
+
background: none repeat scroll 0 0 #CCCCCC;
|
137
|
+
color: white;
|
138
|
+
cursor: move;
|
139
|
+
float: left;
|
140
|
+
margin-right: 5px;
|
141
|
+
padding: 0 2px;
|
142
|
+
border-radius: 4px 4px 4px 4px;
|
130
143
|
}
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: hobo_bootstrap
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.0.
|
4
|
+
version: 2.0.0.pre5
|
5
5
|
prerelease: 6
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-
|
12
|
+
date: 2012-11-02 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: hobo
|
@@ -44,13 +44,13 @@ dependencies:
|
|
44
44
|
- !ruby/object:Gem::Version
|
45
45
|
version: 2.0.0.pre1
|
46
46
|
- !ruby/object:Gem::Dependency
|
47
|
-
name:
|
47
|
+
name: bootstrap-sass
|
48
48
|
requirement: !ruby/object:Gem::Requirement
|
49
49
|
none: false
|
50
50
|
requirements:
|
51
51
|
- - ~>
|
52
52
|
- !ruby/object:Gem::Version
|
53
|
-
version: 2.
|
53
|
+
version: '2.1'
|
54
54
|
type: :runtime
|
55
55
|
prerelease: false
|
56
56
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -58,23 +58,7 @@ dependencies:
|
|
58
58
|
requirements:
|
59
59
|
- - ~>
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: 2.
|
62
|
-
- !ruby/object:Gem::Dependency
|
63
|
-
name: compass-rails
|
64
|
-
requirement: !ruby/object:Gem::Requirement
|
65
|
-
none: false
|
66
|
-
requirements:
|
67
|
-
- - ~>
|
68
|
-
- !ruby/object:Gem::Version
|
69
|
-
version: 1.0.3
|
70
|
-
type: :runtime
|
71
|
-
prerelease: false
|
72
|
-
version_requirements: !ruby/object:Gem::Requirement
|
73
|
-
none: false
|
74
|
-
requirements:
|
75
|
-
- - ~>
|
76
|
-
- !ruby/object:Gem::Version
|
77
|
-
version: 1.0.3
|
61
|
+
version: '2.1'
|
78
62
|
- !ruby/object:Gem::Dependency
|
79
63
|
name: will_paginate-bootstrap
|
80
64
|
requirement: !ruby/object:Gem::Requirement
|
@@ -130,7 +114,7 @@ files:
|
|
130
114
|
- taglibs/tabs.dryml
|
131
115
|
- vendor/assets/images/ajax-loader.gif
|
132
116
|
- vendor/assets/javascripts/hobo_bootstrap.js
|
133
|
-
- vendor/assets/stylesheets/hobo_bootstrap.
|
117
|
+
- vendor/assets/stylesheets/hobo_bootstrap.scss
|
134
118
|
- vendor/assets/stylesheets/hobo_bootstrap/hobo_bootstrap_docs.css
|
135
119
|
- vendor/assets/stylesheets/hobo_bootstrap/hobo_bootstrap_main.scss
|
136
120
|
- vendor/assets/stylesheets/hobo_bootstrap/hobo_bootstrap_responsive.scss
|
@@ -1 +0,0 @@
|
|
1
|
-
//= require_tree './hobo_bootstrap'
|