anjlab-bootstrap-rails 2.0.0.2 → 2.0.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/README.md +11 -0
  2. data/lib/bootstrap-rails/version.rb +1 -1
  3. data/vendor/assets/stylesheets/variables.scss +53 -53
  4. metadata +10 -10
data/README.md CHANGED
@@ -115,6 +115,16 @@ Add necessary javascript(s) files to app/assets/javascripts/application.js
115
115
  //= require bootstrap-carousel
116
116
  //= require bootstrap-typeahead
117
117
  ```
118
+
119
+ ## Upgrade notes from 1.4
120
+
121
+ - [Twitter Bootstrap Upgrade](http://twitter.github.com/bootstrap/upgrading.html)
122
+ - rm -rf tmp/cache
123
+
124
+ ## For Developers
125
+
126
+ - Fork this repo if you want fix rails integration bug
127
+ - Fork [SASS repo](https://github.com/yury/bootstrap) if you want fix SASS bug
118
128
 
119
129
  ## Thanks
120
130
  Thanks Twitter for Bootstrap
@@ -122,6 +132,7 @@ http://twitter.github.com/bootstrap
122
132
 
123
133
  Inspired by Seyhun Akyürek and his [twitter-bootstrap-rails gem](https://github.com/seyhunak/twitter-bootstrap-rails)
124
134
 
135
+
125
136
  ## License
126
137
  Copyright (c) 2011 AnjLab
127
138
 
data/lib/bootstrap-rails/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bootstrap
2
2
  module Rails
3
- VERSION = "2.0.0.2"
3
+ VERSION = "2.0.0.3"
4
4
  end
5
5
  end
data/vendor/assets/stylesheets/variables.scss CHANGED
@@ -8,36 +8,36 @@
8
8
  // --------------------------------------------------
9
9
 
10
10
  // Links
11
- $linkColor: #08c;
12
- $linkColorHover: darken($linkColor, 15%);
11
+ $linkColor: #08c !default;
12
+ $linkColorHover: darken($linkColor, 15%) !default;
13
13
 
14
14
  // Grays
15
- $black: #000;
16
- $grayDarker: #222;
17
- $grayDark: #333;
18
- $gray: #555;
19
- $grayLight: #999;
20
- $grayLighter: #eee;
21
- $white: #fff;
15
+ $black: #000 !default;
16
+ $grayDarker: #222 !default;
17
+ $grayDark: #333 !default;
18
+ $gray: #555 !default;
19
+ $grayLight: #999 !default;
20
+ $grayLighter: #eee !default;
21
+ $white: #fff !default;
22
22
 
23
23
  // Accent colors
24
- $blue: #049cdb;
25
- $blueDark: #0064cd;
26
- $green: #46a546;
27
- $red: #9d261d;
28
- $yellow: #ffc40d;
29
- $orange: #f89406;
30
- $pink: #c3325f;
31
- $purple: #7a43b6;
24
+ $blue: #049cdb !default;
25
+ $blueDark: #0064cd !default;
26
+ $green: #46a546 !default;
27
+ $red: #9d261d !default;
28
+ $yellow: #ffc40d !default;
29
+ $orange: #f89406 !default;
30
+ $pink: #c3325f !default;
31
+ $purple: #7a43b6 !default;
32
32
 
33
33
  // Typography
34
- $baseFontSize: 13px;
35
- $baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
36
- $baseLineHeight: 18px;
37
- $textColor: $grayDark;
34
+ $baseFontSize: 13px !default;
35
+ $baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
36
+ $baseLineHeight: 18px !default;
37
+ $textColor: $grayDark !default;
38
38
 
39
39
  // Buttons
40
- $primaryButtonBackground: $linkColor;
40
+ $primaryButtonBackground: $linkColor !default;
41
41
 
42
42
 
43
43
 
@@ -47,41 +47,41 @@ $primaryButtonBackground: $linkColor;
47
47
  // Z-index master list
48
48
  // Used for a bird's eye view of components dependent on the z-axis
49
49
  // Try to avoid customizing these :)
50
- $zindexDropdown: 1000;
51
- $zindexPopover: 1010;
52
- $zindexTooltip: 1020;
53
- $zindexFixedNavbar: 1030;
54
- $zindexModalBackdrop: 1040;
55
- $zindexModal: 1050;
50
+ $zindexDropdown: 1000 !default;
51
+ $zindexPopover: 1010 !default;
52
+ $zindexTooltip: 1020 !default;
53
+ $zindexFixedNavbar: 1030 !default;
54
+ $zindexModalBackdrop: 1040 !default;
55
+ $zindexModal: 1050 !default;
56
56
 
57
57
  // Input placeholder text color
58
- $placeholderText: $grayLight;
58
+ $placeholderText: $grayLight !default;
59
59
 
60
60
  // Navbar
61
- $navbarHeight: 40px;
62
- $navbarBackground: $grayDarker;
63
- $navbarBackgroundHighlight: $grayDark;
61
+ $navbarHeight: 40px !default;
62
+ $navbarBackground: $grayDarker !default;
63
+ $navbarBackgroundHighlight: $grayDark !default;
64
64
 
65
- $navbarText: $grayLight;
66
- $navbarLinkColor: $grayLight;
67
- $navbarLinkColorHover: $white;
65
+ $navbarText: $grayLight !default;
66
+ $navbarLinkColor: $grayLight !default;
67
+ $navbarLinkColorHover: $white !default;
68
68
 
69
69
  // Form states and alerts
70
- $warningText: #c09853;
71
- $warningBackground: #fcf8e3;
72
- $warningBorder: darken(adjust-hue($warningBackground, -10), 3%);
70
+ $warningText: #c09853 !default;
71
+ $warningBackground: #fcf8e3 !default;
72
+ $warningBorder: darken(adjust-hue($warningBackground, -10), 3%) !default;
73
73
 
74
- $errorText: #b94a48;
75
- $errorBackground: #f2dede;
76
- $errorBorder: darken(adjust-hue($errorBackground, -10), 3%);
74
+ $errorText: #b94a48 !default;
75
+ $errorBackground: #f2dede !default;
76
+ $errorBorder: darken(adjust-hue($errorBackground, -10), 3%) !default;
77
77
 
78
- $successText: #468847;
79
- $successBackground: #dff0d8;
80
- $successBorder: darken(adjust-hue($successBackground, -10), 5%);
78
+ $successText: #468847 !default;
79
+ $successBackground: #dff0d8 !default;
80
+ $successBorder: darken(adjust-hue($successBackground, -10), 5%) !default;
81
81
 
82
- $infoText: #3a87ad;
83
- $infoBackground: #d9edf7;
84
- $infoBorder: darken(adjust-hue($infoBackground, -10), 7%);
82
+ $infoText: #3a87ad !default;
83
+ $infoBackground: #d9edf7 !default;
84
+ $infoBorder: darken(adjust-hue($infoBackground, -10), 7%) !default;
85
85
 
86
86
 
87
87
 
@@ -89,11 +89,11 @@ $infoBorder: darken(adjust-hue($infoBackground, -10), 7%);
89
89
  // --------------------------------------------------
90
90
 
91
91
  // Default 940px grid
92
- $gridColumns: 12;
93
- $gridColumnWidth: 60px;
94
- $gridGutterWidth: 20px;
95
- $gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1));
92
+ $gridColumns: 12 !default;
93
+ $gridColumnWidth: 60px !default;
94
+ $gridGutterWidth: 20px !default;
95
+ $gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default;
96
96
 
97
97
  // Fluid grid
98
- $fluidGridColumnWidth: 6.382978723%;
99
- $fluidGridGutterWidth: 2.127659574%;
98
+ $fluidGridColumnWidth: 6.382978723% !default;
99
+ $fluidGridGutterWidth: 2.127659574% !default;
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.2
4
+ version: 2.0.0.3
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-05 00:00:00.000000000 Z
12
+ date: 2012-02-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &70245361070720 !ruby/object:Gem::Requirement
16
+ requirement: &70301951694800 !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: *70245361070720
24
+ version_requirements: *70301951694800
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: sass
27
- requirement: &70245361070040 !ruby/object:Gem::Requirement
27
+ requirement: &70301951710440 !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: *70245361070040
35
+ version_requirements: *70301951710440
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: bundler
38
- requirement: &70245361068940 !ruby/object:Gem::Requirement
38
+ requirement: &70301951709200 !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: *70245361068940
46
+ version_requirements: *70301951709200
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rails
49
- requirement: &70245361067880 !ruby/object:Gem::Requirement
49
+ requirement: &70301951708080 !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: *70245361067880
57
+ version_requirements: *70301951708080
58
58
  description: Twitter Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3
59
59
  projects
60
60
  email: