anjlab-bootstrap-rails 2.0.1.1 → 2.0.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (42) hide show
  1. data/README.md +2 -1
  2. data/lib/bootstrap-rails/version.rb +1 -1
  3. data/vendor/assets/javascripts/bootstrap-alert.js +1 -1
  4. data/vendor/assets/javascripts/bootstrap-button.js +1 -1
  5. data/vendor/assets/javascripts/bootstrap-carousel.js +7 -3
  6. data/vendor/assets/javascripts/bootstrap-collapse.js +4 -2
  7. data/vendor/assets/javascripts/bootstrap-dropdown.js +1 -1
  8. data/vendor/assets/javascripts/bootstrap-modal.js +1 -1
  9. data/vendor/assets/javascripts/bootstrap-popover.js +1 -1
  10. data/vendor/assets/javascripts/bootstrap-scrollspy.js +1 -1
  11. data/vendor/assets/javascripts/bootstrap-tab.js +1 -1
  12. data/vendor/assets/javascripts/bootstrap-tooltip.js +2 -2
  13. data/vendor/assets/javascripts/bootstrap-transition.js +1 -1
  14. data/vendor/assets/javascripts/bootstrap-typeahead.js +7 -7
  15. data/vendor/assets/stylesheets/alerts.scss +2 -14
  16. data/vendor/assets/stylesheets/badges.scss +36 -0
  17. data/vendor/assets/stylesheets/bootstrap.scss +2 -1
  18. data/vendor/assets/stylesheets/breadcrumbs.scss +2 -0
  19. data/vendor/assets/stylesheets/button-groups.scss +31 -7
  20. data/vendor/assets/stylesheets/buttons.scss +17 -13
  21. data/vendor/assets/stylesheets/code.scss +2 -2
  22. data/vendor/assets/stylesheets/component-animations.scss +3 -1
  23. data/vendor/assets/stylesheets/dropdowns.scss +45 -27
  24. data/vendor/assets/stylesheets/forms.scss +75 -42
  25. data/vendor/assets/stylesheets/grid.scss +2 -5
  26. data/vendor/assets/stylesheets/hero-unit.scss +3 -1
  27. data/vendor/assets/stylesheets/labels.scss +8 -2
  28. data/vendor/assets/stylesheets/mixins.scss +174 -135
  29. data/vendor/assets/stylesheets/modals.scss +12 -5
  30. data/vendor/assets/stylesheets/navbar.scss +77 -35
  31. data/vendor/assets/stylesheets/navs.scss +19 -9
  32. data/vendor/assets/stylesheets/pager.scss +6 -0
  33. data/vendor/assets/stylesheets/pagination.scss +1 -0
  34. data/vendor/assets/stylesheets/progress-bars.scss +15 -1
  35. data/vendor/assets/stylesheets/reset.scss +1 -1
  36. data/vendor/assets/stylesheets/responsive.scss +72 -28
  37. data/vendor/assets/stylesheets/scaffolding.scss +4 -4
  38. data/vendor/assets/stylesheets/tables.scss +15 -13
  39. data/vendor/assets/stylesheets/type.scss +21 -5
  40. data/vendor/assets/stylesheets/variables.scss +92 -6
  41. data/vendor/assets/stylesheets/wells.scss +10 -0
  42. metadata +12 -11
@@ -7,11 +7,9 @@
7
7
  // GLOBAL VALUES
8
8
  // --------------------------------------------------
9
9
 
10
- // Links
11
- $linkColor: #08c !default;
12
- $linkColorHover: darken($linkColor, 15%) !default;
13
10
 
14
11
  // Grays
12
+ // -------------------------
15
13
  $black: #000 !default;
16
14
  $grayDarker: #222 !default;
17
15
  $grayDark: #333 !default;
@@ -20,7 +18,9 @@ $grayLight: #999 !default;
20
18
  $grayLighter: #eee !default;
21
19
  $white: #fff !default;
22
20
 
21
+
23
22
  // Accent colors
23
+ // -------------------------
24
24
  $blue: #049cdb !default;
25
25
  $blueDark: #0064cd !default;
26
26
  $green: #46a546 !default;
@@ -30,14 +30,78 @@ $orange: #f89406 !default;
30
30
  $pink: #c3325f !default;
31
31
  $purple: #7a43b6 !default;
32
32
 
33
+
34
+ // Scaffolding
35
+ // -------------------------
36
+ $bodyBackground: $white !default;
37
+ $textColor: $grayDark !default;
38
+
39
+
40
+ // Links
41
+ // -------------------------
42
+ $linkColor: #08c !default;
43
+ $linkColorHover: darken($linkColor, 15%) !default;
44
+
45
+
33
46
  // Typography
47
+ // -------------------------
34
48
  $baseFontSize: 13px !default;
35
49
  $baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
36
50
  $baseLineHeight: 18px !default;
37
- $textColor: $grayDark !default;
51
+ $altFontFamily: Georgia, "Times New Roman", Times, serif !default;
52
+
53
+ $headingsFontFamily: inherit !default; // empty to use BS default, $baseFontFamily
54
+ $headingsFontWeight: bold !default; // instead of browser default, bold
55
+ $headingsColor: inherit !default; // empty to use BS default, $textColor
56
+
57
+
58
+ // Tables
59
+ // -------------------------
60
+ $tableBackground: transparent !default; // overall background-color
61
+ $tableBackgroundAccent: #f9f9f9 !default; // for striping
62
+ $tableBackgroundHover: #f5f5f5 !default; // for hover
63
+ $tableBorder: #ddd !default; // table and cell border
64
+
38
65
 
39
66
  // Buttons
40
- $primaryButtonBackground: $linkColor !default;
67
+ // -------------------------
68
+ $btnBackground: $white !default;
69
+ $btnBackgroundHighlight: darken($white, 10%) !default;
70
+ $btnBorder: darken($white, 20%) !default;
71
+
72
+ $btnPrimaryBackground: $linkColor !default;
73
+ $btnPrimaryBackgroundHighlight: adjust-hue($btnPrimaryBackground, 15%) !default;
74
+
75
+ $btnInfoBackground: #5bc0de !default;
76
+ $btnInfoBackgroundHighlight: #2f96b4 !default;
77
+
78
+ $btnSuccessBackground: #62c462 !default;
79
+ $btnSuccessBackgroundHighlight: #51a351 !default;
80
+
81
+ $btnWarningBackground: lighten($orange, 15%) !default;
82
+ $btnWarningBackgroundHighlight: $orange !default;
83
+
84
+ $btnDangerBackground: #ee5f5b !default;
85
+ $btnDangerBackgroundHighlight: #bd362f !default;
86
+
87
+ $btnInverseBackground: $gray !default;
88
+ $btnInverseBackgroundHighlight: $grayDarker !default;
89
+
90
+
91
+ // Forms
92
+ // -------------------------
93
+ $inputBackground: $white !default;
94
+ $inputBorder: #ccc !default;
95
+ $inputDisabledBackground: $grayLighter !default;
96
+
97
+
98
+ // Dropdowns
99
+ // -------------------------
100
+ $dropdownBackground: $white !default;
101
+ $dropdownBorder: rgba(0,0,0,.2) !default;
102
+ $dropdownLinkColor: $grayDark !default;
103
+ $dropdownLinkColorHover: $white !default;
104
+ $dropdownLinkBackgroundHover: $linkColor !default;
41
105
 
42
106
 
43
107
 
@@ -45,6 +109,7 @@ $primaryButtonBackground: $linkColor !default;
45
109
  // --------------------------------------------------
46
110
 
47
111
  // Z-index master list
112
+ // -------------------------
48
113
  // Used for a bird's eye view of components dependent on the z-axis
49
114
  // Try to avoid customizing these :)
50
115
  $zindexDropdown: 1000 !default;
@@ -54,6 +119,7 @@ $zindexFixedNavbar: 1030 !default;
54
119
  $zindexModalBackdrop: 1040 !default;
55
120
  $zindexModal: 1050 !default;
56
121
 
122
+
57
123
  // Sprite icons path
58
124
  $iconSpritePath: image-path("glyphicons-halflings.png") !default;
59
125
  $iconWhiteSpritePath: image-path("glyphicons-halflings-white.png") !default;
@@ -65,16 +131,33 @@ $placeholderText: $grayLight !default;
65
131
  $hrBorder: $grayLighter !default;
66
132
 
67
133
  // Navbar
134
+ // -------------------------
68
135
  $navbarHeight: 40px !default;
69
136
  $navbarBackground: $grayDarker !default;
70
137
  $navbarBackgroundHighlight: $grayDark !default;
71
- $navbarLinkBackgroundHover: transparent !default;
72
138
 
73
139
  $navbarText: $grayLight !default;
74
140
  $navbarLinkColor: $grayLight !default;
75
141
  $navbarLinkColorHover: $white !default;
142
+ $navbarLinkColorActive: $navbarLinkColorHover !default;
143
+ $navbarLinkBackgroundHover: transparent !default;
144
+ $navbarLinkBackgroundActive: $navbarBackground !default;
145
+
146
+ $navbarSearchBackground: lighten($navbarBackground, 25%) !default;
147
+ $navbarSearchBackgroundFocus: $white !default;
148
+ $navbarSearchBorder: darken($navbarSearchBackground, 30%) !default;
149
+ $navbarSearchPlaceholderColor: #ccc !default;
150
+
151
+
152
+ // Hero unit
153
+ // -------------------------
154
+ $heroUnitBackground: $grayLighter !default;
155
+ $heroUnitHeadingColor: inherit !default;
156
+ $heroUnitLeadColor: inherit !default;
157
+
76
158
 
77
159
  // Form states and alerts
160
+ // -------------------------
78
161
  $warningText: #c09853 !default;
79
162
  $warningBackground: #fcf8e3 !default;
80
163
  $warningBorder: darken(adjust-hue($warningBackground, -10), 3%) !default;
@@ -93,15 +176,18 @@ $infoBorder: darken(adjust-hue($infoBackground, -10), 7%) !default;
93
176
 
94
177
 
95
178
 
179
+
96
180
  // GRID
97
181
  // --------------------------------------------------
98
182
 
99
183
  // Default 940px grid
184
+ // -------------------------
100
185
  $gridColumns: 12 !default;
101
186
  $gridColumnWidth: 60px !default;
102
187
  $gridGutterWidth: 20px !default;
103
188
  $gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default;
104
189
 
190
+
105
191
  // Fluid grid
106
192
  $fluidGridColumnWidth: 6.382978723% !default;
107
193
  $fluidGridGutterWidth: 2.127659574% !default;
@@ -15,3 +15,13 @@
15
15
  border-color: rgba(0,0,0,.15);
16
16
  }
17
17
  }
18
+
19
+ // Sizes
20
+ .well-large {
21
+ padding: 24px;
22
+ @include border-radius(6px);
23
+ }
24
+ .well-small {
25
+ padding: 9px;
26
+ @include border-radius(3px);
27
+ }
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.1.1
4
+ version: 2.0.2.0
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-19 00:00:00.000000000 Z
12
+ date: 2012-03-14 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &70179644361800 !ruby/object:Gem::Requirement
16
+ requirement: &70350658378680 !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: *70179644361800
24
+ version_requirements: *70350658378680
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: sass
27
- requirement: &70179644355960 !ruby/object:Gem::Requirement
27
+ requirement: &70350658392440 !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: *70179644355960
35
+ version_requirements: *70350658392440
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: bundler
38
- requirement: &70179644352160 !ruby/object:Gem::Requirement
38
+ requirement: &70350658387680 !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: *70179644352160
46
+ version_requirements: *70350658387680
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rails
49
- requirement: &70179644350840 !ruby/object:Gem::Requirement
49
+ requirement: &70350658402400 !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: *70179644350840
57
+ version_requirements: *70350658402400
58
58
  description: Twitter Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3
59
59
  projects
60
60
  email:
@@ -92,6 +92,7 @@ files:
92
92
  - vendor/assets/javascripts/bootstrap.js
93
93
  - vendor/assets/stylesheets/accordion.scss
94
94
  - vendor/assets/stylesheets/alerts.scss
95
+ - vendor/assets/stylesheets/badges.scss
95
96
  - vendor/assets/stylesheets/bootstrap.scss
96
97
  - vendor/assets/stylesheets/breadcrumbs.scss
97
98
  - vendor/assets/stylesheets/button-groups.scss
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
145
146
  version: '0'
146
147
  requirements: []
147
148
  rubyforge_project:
148
- rubygems_version: 1.8.15
149
+ rubygems_version: 1.8.17
149
150
  signing_key:
150
151
  specification_version: 3
151
152
  summary: Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3 projects