anjlab-bootstrap-rails 2.0.0.1 → 2.0.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/README.md +58 -15
  2. data/lib/bootstrap-rails/version.rb +1 -1
  3. data/vendor/assets/stylesheets/mixins.scss +6 -5
  4. metadata +10 -10
data/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # Twitter Bootstrap for Rails 3
1
+ # Twitter Bootstrap v2 for Rails 3
2
2
  Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
3
3
  It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
4
4
 
@@ -6,11 +6,11 @@ It includes base CSS and HTML for typography, forms, buttons, tables, grids, nav
6
6
 
7
7
  anjlab-bootstrap-rails project integrates Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3 projects
8
8
 
9
- ## Rails 3.1
9
+ ## Rails > 3.1
10
10
  Include Bootstrap in Gemfile;
11
11
 
12
12
  ``` ruby
13
- gem 'anjlab-bootstrap-rails', :require => 'bootstrap-rails'
13
+ gem 'anjlab-bootstrap-rails', '>= 2.0', :require => 'bootstrap-rails'
14
14
  ```
15
15
 
16
16
  or you can install from latest build;
@@ -32,26 +32,65 @@ Add necessary stylesheet file to app/assets/stylesheets/application.css
32
32
 
33
33
  You can override boostrapr variables:
34
34
 
35
- ``` csss
35
+ ```scss
36
36
  // Create app/assets/stylesheets/bootstrap.scss
37
- // CSS Reset
38
- @import "reset.scss";
39
-
40
37
  // Core variables and mixins
41
38
  @import "variables.scss"; // Modify this for custom colors, font-sizes, etc
42
39
 
40
+
41
+ // Override variabels here
43
42
  $linkColor: red; // Make all links red
44
43
 
45
44
  @import "mixins.scss";
46
45
 
46
+ // CSS Reset
47
+ @import "reset.scss";
48
+
47
49
  // Grid system and page structure
48
50
  @import "scaffolding.scss";
51
+ @import "grid.scss";
52
+ @import "layouts.scss";
49
53
 
50
- // Styled patterns and elements
54
+ // Base CSS
51
55
  @import "type.scss";
56
+ @import "code.scss";
52
57
  @import "forms.scss";
53
58
  @import "tables.scss";
54
- @import "patterns.scss";
59
+
60
+ // Components: common
61
+ @import "sprites.scss";
62
+ @import "dropdowns.scss";
63
+ @import "wells.scss";
64
+ @import "component-animations.scss";
65
+ @import "close.scss";
66
+
67
+ // Components: Buttons & Alerts
68
+ @import "buttons.scss";
69
+ @import "button-groups.scss";
70
+ @import "alerts.scss"; // Note: alerts share common CSS with buttons and thus have styles in buttons.scss
71
+
72
+ // Components: Nav
73
+ @import "navs.scss";
74
+ @import "navbar.scss";
75
+ @import "breadcrumbs.scss";
76
+ @import "pagination.scss";
77
+ @import "pager.scss";
78
+
79
+ // Components: Popovers
80
+ @import "modals.scss";
81
+ @import "tooltip.scss";
82
+ @import "popovers.scss";
83
+
84
+ // Components: Misc
85
+ @import "thumbnails.scss";
86
+ @import "labels.scss";
87
+ @import "progress-bars.scss";
88
+ @import "accordion.scss";
89
+ @import "carousel.scss";
90
+ @import "hero-unit.scss";
91
+
92
+ // Utility classes
93
+ @import "utilities.scss"; // Has to be last to override when necessary
55
94
  ```
56
95
 
57
96
  ## Javascripts
@@ -63,14 +102,18 @@ Add necessary javascript(s) files to app/assets/javascripts/application.js
63
102
  //= require bootstrap
64
103
 
65
104
  // Or peek any of them yourself
66
- //= require bootstrap-alerts
67
- //= require bootstrap-buttons
68
- //= require bootstrap-dropdown
105
+ //= require bootstrap-transition
106
+ //= require bootstrap-alert
69
107
  //= require bootstrap-modal
70
- //= require bootstrap-twipsy
71
- //= require bootstrap-popover
108
+ //= require bootstrap-dropdown
72
109
  //= require bootstrap-scrollspy
73
- //= require bootstrap-tabs
110
+ //= require bootstrap-tab
111
+ //= require bootstrap-tooltip
112
+ //= require bootstrap-popover
113
+ //= require bootstrap-button
114
+ //= require bootstrap-collapse
115
+ //= require bootstrap-carousel
116
+ //= require bootstrap-typeahead
74
117
  ```
75
118
 
76
119
  ## Thanks
data/lib/bootstrap-rails/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bootstrap
2
2
  module Rails
3
- VERSION = "2.0.0.1"
3
+ VERSION = "2.0.0.2"
4
4
  end
5
5
  end
data/vendor/assets/stylesheets/mixins.scss CHANGED
@@ -418,12 +418,13 @@
418
418
  }
419
419
  @mixin gradient-striped($color, $angle: -45deg) {
420
420
  background-color: $color;
421
+ $transparent: rgba(0,0,0,0); // Workaround compass transparent color-stop bug https://github.com/chriseppstein/compass/issues/356
421
422
  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
422
- background-image: -webkit-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
423
- background-image: -moz-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
424
- background-image: -ms-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
425
- background-image: -o-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
426
- background-image: linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
423
+ background-image: -webkit-linear-gradient($angle, rgba(255,255,255,.15) 25%, $transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, $transparent 75%, $transparent);
424
+ background-image: -moz-linear-gradient($angle, rgba(255,255,255,.15) 25%, $transparent 25%, $transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, $transparent 75%, $transparent);
425
+ background-image: -ms-linear-gradient($angle, rgba(255,255,255,.15) 25%, $transparent 25%, $transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, $transparent 75%, $transparent);
426
+ background-image: -o-linear-gradient($angle, rgba(255,255,255,.15) 25%, $transparent 25%, $transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, $transparent 75%, $transparent);
427
+ background-image: linear-gradient($angle, rgba(255,255,255,.15) 25%, $transparent 25%, $transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, $transparent 75%, $transparent);
427
428
  }
428
429
 
429
430
  // Gradient Bar Colors for buttons and alerts
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: anjlab-bootstrap-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.1
4
+ version: 2.0.0.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-02-04 00:00:00.000000000 Z
12
+ date: 2012-02-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &70113559046980 !ruby/object:Gem::Requirement
16
+ requirement: &70245361070720 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70113559046980
24
+ version_requirements: *70245361070720
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: sass
27
- requirement: &70113559046520 !ruby/object:Gem::Requirement
27
+ requirement: &70245361070040 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70113559046520
35
+ version_requirements: *70245361070040
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: bundler
38
- requirement: &70113559045820 !ruby/object:Gem::Requirement
38
+ requirement: &70245361068940 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '1.0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70113559045820
46
+ version_requirements: *70245361068940
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rails
49
- requirement: &70113559045200 !ruby/object:Gem::Requirement
49
+ requirement: &70245361067880 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '3.1'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70113559045200
57
+ version_requirements: *70245361067880
58
58
  description: Twitter Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3
59
59
  projects
60
60
  email: