compass_twitter_bootstrap 2.0.3 → 2.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (113) hide show
  1. data/CHANGELOG.md +6 -0
  2. data/README.md +41 -7
  3. data/build/convert.rb +27 -11
  4. data/lib/compass_twitter_bootstrap/version.rb +1 -1
  5. data/stylesheets/_compass_twitter_bootstrap.scss +2 -1
  6. data/stylesheets/_compass_twitter_bootstrap_awesome.scss +1 -1
  7. data/stylesheets/_compass_twitter_bootstrap_responsive.scss +1 -1
  8. data/stylesheets/compass_twitter_bootstrap/_accordion.scss +4 -3
  9. data/stylesheets/compass_twitter_bootstrap/_alerts.scss +31 -10
  10. data/stylesheets/compass_twitter_bootstrap/_breadcrumbs.scss +14 -14
  11. data/stylesheets/compass_twitter_bootstrap/_button-groups.scss +91 -55
  12. data/stylesheets/compass_twitter_bootstrap/_buttons.scss +126 -84
  13. data/stylesheets/compass_twitter_bootstrap/_carousel.scss +33 -23
  14. data/stylesheets/compass_twitter_bootstrap/_close.scss +7 -5
  15. data/stylesheets/compass_twitter_bootstrap/_code.scss +12 -8
  16. data/stylesheets/compass_twitter_bootstrap/_component-animations.scss +9 -7
  17. data/stylesheets/compass_twitter_bootstrap/_dropdowns.scss +112 -22
  18. data/stylesheets/compass_twitter_bootstrap/_font-awesome.scss +258 -196
  19. data/stylesheets/compass_twitter_bootstrap/_forms.scss +262 -161
  20. data/stylesheets/compass_twitter_bootstrap/_grid.scss +18 -2
  21. data/stylesheets/compass_twitter_bootstrap/_hero-unit.scss +11 -8
  22. data/stylesheets/compass_twitter_bootstrap/_labels-badges.scss +42 -26
  23. data/stylesheets/compass_twitter_bootstrap/_layouts.scss +3 -4
  24. data/stylesheets/compass_twitter_bootstrap/_media.scss +55 -0
  25. data/stylesheets/compass_twitter_bootstrap/_mixins.scss +243 -189
  26. data/stylesheets/compass_twitter_bootstrap/_modals.scss +28 -23
  27. data/stylesheets/compass_twitter_bootstrap/_navbar.scss +269 -143
  28. data/stylesheets/compass_twitter_bootstrap/_navs.scss +59 -46
  29. data/stylesheets/compass_twitter_bootstrap/_pager.scss +17 -12
  30. data/stylesheets/compass_twitter_bootstrap/_pagination.scss +92 -27
  31. data/stylesheets/compass_twitter_bootstrap/_popovers.scss +116 -36
  32. data/stylesheets/compass_twitter_bootstrap/_progress-bars.scss +35 -30
  33. data/stylesheets/compass_twitter_bootstrap/_reset.scss +101 -11
  34. data/stylesheets/compass_twitter_bootstrap/_responsive-1200px-min.scss +9 -7
  35. data/stylesheets/compass_twitter_bootstrap/_responsive-767px-max.scss +115 -71
  36. data/stylesheets/compass_twitter_bootstrap/_responsive-768px-979px.scss +8 -6
  37. data/stylesheets/compass_twitter_bootstrap/_responsive-navbar.scss +53 -14
  38. data/stylesheets/compass_twitter_bootstrap/_responsive-utilities.scss +17 -15
  39. data/stylesheets/compass_twitter_bootstrap/_responsive.scss +48 -0
  40. data/stylesheets/compass_twitter_bootstrap/_scaffolding.scss +27 -4
  41. data/stylesheets/compass_twitter_bootstrap/_sprites.scss +24 -22
  42. data/stylesheets/compass_twitter_bootstrap/_tables.scss +122 -61
  43. data/stylesheets/compass_twitter_bootstrap/_thumbnails.scss +12 -7
  44. data/stylesheets/compass_twitter_bootstrap/_tooltip.scss +50 -15
  45. data/stylesheets/compass_twitter_bootstrap/_type.scss +93 -93
  46. data/stylesheets/compass_twitter_bootstrap/_utilities.scss +9 -2
  47. data/stylesheets/compass_twitter_bootstrap/_variables.scss +134 -38
  48. data/stylesheets/compass_twitter_bootstrap/_wells.scss +11 -10
  49. data/stylesheets_sass/_compass_twitter_bootstrap.sass +2 -1
  50. data/stylesheets_sass/_compass_twitter_bootstrap_awesome.sass +1 -1
  51. data/stylesheets_sass/_compass_twitter_bootstrap_responsive.sass +1 -1
  52. data/stylesheets_sass/compass_twitter_bootstrap/_accordion.sass +4 -3
  53. data/stylesheets_sass/compass_twitter_bootstrap/_alerts.sass +27 -9
  54. data/stylesheets_sass/compass_twitter_bootstrap/_breadcrumbs.sass +12 -13
  55. data/stylesheets_sass/compass_twitter_bootstrap/_button-groups.sass +93 -55
  56. data/stylesheets_sass/compass_twitter_bootstrap/_buttons.sass +113 -88
  57. data/stylesheets_sass/compass_twitter_bootstrap/_carousel.sass +31 -23
  58. data/stylesheets_sass/compass_twitter_bootstrap/_close.sass +5 -4
  59. data/stylesheets_sass/compass_twitter_bootstrap/_code.sass +12 -9
  60. data/stylesheets_sass/compass_twitter_bootstrap/_component-animations.sass +7 -6
  61. data/stylesheets_sass/compass_twitter_bootstrap/_dropdowns.sass +105 -21
  62. data/stylesheets_sass/compass_twitter_bootstrap/_font-awesome.sass +228 -31
  63. data/stylesheets_sass/compass_twitter_bootstrap/_forms.sass +255 -155
  64. data/stylesheets_sass/compass_twitter_bootstrap/_grid.sass +16 -2
  65. data/stylesheets_sass/compass_twitter_bootstrap/_hero-unit.sass +10 -7
  66. data/stylesheets_sass/compass_twitter_bootstrap/_labels-badges.sass +38 -31
  67. data/stylesheets_sass/compass_twitter_bootstrap/_layouts.sass +3 -4
  68. data/stylesheets_sass/compass_twitter_bootstrap/_media.sass +48 -0
  69. data/stylesheets_sass/compass_twitter_bootstrap/_mixins.sass +215 -174
  70. data/stylesheets_sass/compass_twitter_bootstrap/_modals.sass +25 -26
  71. data/stylesheets_sass/compass_twitter_bootstrap/_navbar.sass +229 -134
  72. data/stylesheets_sass/compass_twitter_bootstrap/_navs.sass +53 -46
  73. data/stylesheets_sass/compass_twitter_bootstrap/_pager.sass +16 -12
  74. data/stylesheets_sass/compass_twitter_bootstrap/_pagination.sass +78 -23
  75. data/stylesheets_sass/compass_twitter_bootstrap/_popovers.sass +106 -40
  76. data/stylesheets_sass/compass_twitter_bootstrap/_progress-bars.sass +35 -30
  77. data/stylesheets_sass/compass_twitter_bootstrap/_reset.sass +80 -12
  78. data/stylesheets_sass/compass_twitter_bootstrap/_responsive-1200px-min.sass +8 -7
  79. data/stylesheets_sass/compass_twitter_bootstrap/_responsive-767px-max.sass +89 -54
  80. data/stylesheets_sass/compass_twitter_bootstrap/_responsive-768px-979px.sass +7 -6
  81. data/stylesheets_sass/compass_twitter_bootstrap/_responsive-navbar.sass +38 -13
  82. data/stylesheets_sass/compass_twitter_bootstrap/_responsive-utilities.sass +18 -17
  83. data/stylesheets_sass/compass_twitter_bootstrap/_responsive.sass +44 -0
  84. data/stylesheets_sass/compass_twitter_bootstrap/_scaffolding.sass +24 -4
  85. data/stylesheets_sass/compass_twitter_bootstrap/_sprites.sass +25 -8
  86. data/stylesheets_sass/compass_twitter_bootstrap/_tables.sass +110 -83
  87. data/stylesheets_sass/compass_twitter_bootstrap/_thumbnails.sass +11 -7
  88. data/stylesheets_sass/compass_twitter_bootstrap/_tooltip.sass +43 -19
  89. data/stylesheets_sass/compass_twitter_bootstrap/_type.sass +123 -75
  90. data/stylesheets_sass/compass_twitter_bootstrap/_utilities.sass +7 -2
  91. data/stylesheets_sass/compass_twitter_bootstrap/_variables.sass +141 -37
  92. data/stylesheets_sass/compass_twitter_bootstrap/_wells.sass +10 -9
  93. data/vendor/assets/fonts/fontawesome-webfont.eot +0 -0
  94. data/vendor/assets/fonts/fontawesome-webfont.svg +247 -167
  95. data/vendor/assets/fonts/fontawesome-webfont.ttf +0 -0
  96. data/vendor/assets/fonts/fontawesome-webfont.woff +0 -0
  97. data/vendor/assets/images/glyphicons-halflings-white.png +0 -0
  98. data/vendor/assets/images/glyphicons-halflings.png +0 -0
  99. data/vendor/assets/javascripts/bootstrap-affix.js +117 -0
  100. data/vendor/assets/javascripts/bootstrap-alert.js +13 -4
  101. data/vendor/assets/javascripts/bootstrap-all.js +2 -1
  102. data/vendor/assets/javascripts/bootstrap-button.js +17 -8
  103. data/vendor/assets/javascripts/bootstrap-carousel.js +30 -14
  104. data/vendor/assets/javascripts/bootstrap-collapse.js +24 -14
  105. data/vendor/assets/javascripts/bootstrap-dropdown.js +80 -19
  106. data/vendor/assets/javascripts/bootstrap-modal.js +111 -84
  107. data/vendor/assets/javascripts/bootstrap-popover.js +21 -5
  108. data/vendor/assets/javascripts/bootstrap-scrollspy.js +21 -10
  109. data/vendor/assets/javascripts/bootstrap-tab.js +17 -8
  110. data/vendor/assets/javascripts/bootstrap-tooltip.js +36 -24
  111. data/vendor/assets/javascripts/bootstrap-transition.js +6 -7
  112. data/vendor/assets/javascripts/bootstrap-typeahead.js +87 -49
  113. metadata +17 -7
@@ -1,12 +1,14 @@
1
- // THUMBNAILS
2
- // ----------
1
+ //
2
+ // Thumbnails
3
+ // --------------------------------------------------
4
+
3
5
  // Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
4
6
 
5
7
  // Make wrapper ul behave like the grid
6
8
  .thumbnails
7
9
  margin-left: -$gridGutterWidth
8
10
  list-style: none
9
- +bootstrap-clearfix
11
+ +ctb-clearfix
10
12
 
11
13
  // Fluid rows have no left margin
12
14
  .row-fluid .thumbnails
@@ -23,15 +25,16 @@
23
25
  .thumbnail
24
26
  display: block
25
27
  padding: 4px
26
- line-height: 1
28
+ line-height: $baseLineHeight
27
29
  border: 1px solid #ddd
28
- +bootstrap-border-radius(4px)
29
- +bootstrap-box-shadow(0 1px 1px rgba(0, 0, 0, 0.075))
30
+ +ctb-border-radius($baseBorderRadius)
31
+ +ctb-box-shadow(0 1px 3px rgba(0, 0, 0, 0.055))
32
+ +ctb-transition(all 0.2s ease-in-out)
30
33
 
31
34
  // Add a hover state for linked versions only
32
35
  a.thumbnail:hover
33
36
  border-color: $linkColor
34
- +bootstrap-box-shadow(0 1px 4px rgba(0, 105, 214, 0.25))
37
+ +ctb-box-shadow(0 1px 4px rgba(0, 105, 214, 0.25))
35
38
 
36
39
  // Images and captions
37
40
  .thumbnail > img
@@ -42,3 +45,4 @@ a.thumbnail:hover
42
45
 
43
46
  .thumbnail .caption
44
47
  padding: 9px
48
+ color: $gray
@@ -1,6 +1,8 @@
1
- // TOOLTIP
2
- // ------=
1
+ //
2
+ // Tooltips
3
+ // --------------------------------------------------
3
4
 
5
+ // Base class
4
6
  .tooltip
5
7
  position: absolute
6
8
  z-index: $zindexTooltip
@@ -8,36 +10,58 @@
8
10
  visibility: visible
9
11
  padding: 5px
10
12
  font-size: 11px
11
- +bootstrap-opacity(0)
13
+ +ctb-opacity(0)
12
14
  &.in
13
- +bootstrap-opacity(80)
15
+ +ctb-opacity(80)
14
16
  &.top
15
- margin-top: -2px
17
+ margin-top: -3px
16
18
  &.right
17
- margin-left: 2px
19
+ margin-left: 3px
18
20
  &.bottom
19
- margin-top: 2px
21
+ margin-top: 3px
20
22
  &.left
21
- margin-left: -2px
22
- &.top .tooltip-arrow
23
- +bootstrap-popoverArrow-top
24
- &.left .tooltip-arrow
25
- +bootstrap-popoverArrow-left
26
- &.bottom .tooltip-arrow
27
- +bootstrap-popoverArrow-bottom
28
- &.right .tooltip-arrow
29
- +bootstrap-popoverArrow-right
23
+ margin-left: -3px
30
24
 
25
+ // Wrapper for the tooltip content
31
26
  .tooltip-inner
32
27
  max-width: 200px
33
28
  padding: 3px 8px
34
- color: $white
29
+ color: $tooltipColor
35
30
  text-align: center
36
31
  text-decoration: none
37
- background-color: $black
38
- +bootstrap-border-radius(4px)
32
+ background-color: $tooltipBackground
33
+ +ctb-border-radius($baseBorderRadius)
39
34
 
35
+ // Arrows
40
36
  .tooltip-arrow
41
37
  position: absolute
42
38
  width: 0
43
39
  height: 0
40
+ border-color: transparent
41
+ border-style: solid
42
+
43
+ .tooltip
44
+ &.top .tooltip-arrow
45
+ bottom: 0
46
+ left: 50%
47
+ margin-left: -$tooltipArrowWidth
48
+ border-width: $tooltipArrowWidth $tooltipArrowWidth 0
49
+ border-top-color: $tooltipArrowColor
50
+ &.right .tooltip-arrow
51
+ top: 50%
52
+ left: 0
53
+ margin-top: -$tooltipArrowWidth
54
+ border-width: $tooltipArrowWidth $tooltipArrowWidth $tooltipArrowWidth 0
55
+ border-right-color: $tooltipArrowColor
56
+ &.left .tooltip-arrow
57
+ top: 50%
58
+ right: 0
59
+ margin-top: -$tooltipArrowWidth
60
+ border-width: $tooltipArrowWidth 0 $tooltipArrowWidth $tooltipArrowWidth
61
+ border-left-color: $tooltipArrowColor
62
+ &.bottom .tooltip-arrow
63
+ top: 0
64
+ left: 50%
65
+ margin-left: -$tooltipArrowWidth
66
+ border-width: 0 $tooltipArrowWidth $tooltipArrowWidth
67
+ border-bottom-color: $tooltipArrowColor
@@ -1,84 +1,135 @@
1
- // Typography.less
2
- // Headings, body text, lists, code, and more for a versatile and durable typography system
3
- // ----------------------------------------------------------------------------------------
1
+ //
2
+ // Typography
3
+ // --------------------------------------------------
4
4
 
5
- // BODY TEXT
6
- // ---------
5
+ // Body text
6
+ // -------------------------
7
7
 
8
8
  p
9
9
  margin: 0 0 $baseLineHeight / 2
10
- font-family: $baseFontFamily
11
- font-size: $baseFontSize
12
- line-height: $baseLineHeight
13
- small
14
- font-size: $baseFontSize - 2
15
- color: $grayLight
16
10
 
17
11
  .lead
18
12
  margin-bottom: $baseLineHeight
19
- font-size: 20px
13
+ font-size: $baseFontSize * 1.5
20
14
  font-weight: 200
21
15
  line-height: $baseLineHeight * 1.5
22
16
 
23
- // HEADINGS
24
- // --------
17
+ // Emphasis & misc
18
+ // -------------------------
19
+
20
+ // Ex: 14px base font * 85% = about 12px
21
+ small
22
+ font-size: 85%
23
+
24
+ strong
25
+ font-weight: bold
26
+
27
+ em
28
+ font-style: italic
29
+
30
+ cite
31
+ font-style: normal
32
+
33
+ // Utility classes
34
+ .muted
35
+ color: $grayLight
36
+
37
+ a.muted:hover
38
+ color: darken($grayLight, 10%)
39
+
40
+ .text-warning
41
+ color: $warningText
42
+
43
+ a.text-warning:hover
44
+ color: darken($warningText, 10%)
45
+
46
+ .text-error
47
+ color: $errorText
48
+
49
+ a.text-error:hover
50
+ color: darken($errorText, 10%)
51
+
52
+ .text-info
53
+ color: $infoText
54
+
55
+ a.text-info:hover
56
+ color: darken($infoText, 10%)
57
+
58
+ .text-success
59
+ color: $successText
60
+
61
+ a.text-success:hover
62
+ color: darken($successText, 10%)
63
+
64
+ // Headings
65
+ // -------------------------
25
66
 
26
67
  h1, h2, h3, h4, h5, h6
27
- margin: 0
68
+ margin: $baseLineHeight / 2 0
28
69
  font-family: $headingsFontFamily
29
70
  font-weight: $headingsFontWeight
71
+ line-height: $baseLineHeight
30
72
  color: $headingsColor
31
73
  text-rendering: optimizelegibility
32
74
  // Fix the character spacing for headings
33
75
  small
34
76
  font-weight: normal
77
+ line-height: 1
35
78
  color: $grayLight
36
79
 
37
- h1
38
- font-size: 30px
80
+ h1,
81
+ h2,
82
+ h3
39
83
  line-height: $baseLineHeight * 2
40
- small
41
- font-size: 18px
42
84
 
85
+ h1
86
+ font-size: $baseFontSize * 2.75
87
+
88
+ // ~38px
43
89
  h2
44
- font-size: 24px
45
- line-height: $baseLineHeight * 2
46
- small
47
- font-size: 18px
90
+ font-size: $baseFontSize * 2.25
48
91
 
92
+ // ~32px
49
93
  h3
50
- font-size: 18px
51
- line-height: $baseLineHeight * 1.5
52
- small
53
- font-size: 14px
54
-
55
- h4, h5, h6
56
- line-height: $baseLineHeight
94
+ font-size: $baseFontSize * 1.75
57
95
 
96
+ // ~24px
58
97
  h4
59
- font-size: 14px
60
- small
61
- font-size: 12px
98
+ font-size: $baseFontSize * 1.25
62
99
 
100
+ // ~18px
63
101
  h5
64
- font-size: 12px
102
+ font-size: $baseFontSize
65
103
 
66
104
  h6
67
- font-size: 11px
68
- color: $grayLight
69
- text-transform: uppercase
105
+ font-size: $baseFontSize * 0.85
106
+
107
+ // ~12px
108
+
109
+ h1 small
110
+ font-size: $baseFontSize * 1.75
111
+
112
+ // ~24px
113
+ h2 small
114
+ font-size: $baseFontSize * 1.25
115
+
116
+ // ~18px
117
+ h3 small
118
+ font-size: $baseFontSize
119
+
120
+ h4 small
121
+ font-size: $baseFontSize
70
122
 
71
123
  // Page header
124
+ // -------------------------
125
+
72
126
  .page-header
73
- padding-bottom: $baseLineHeight - 1
74
- margin: $baseLineHeight 0
127
+ padding-bottom: $baseLineHeight / 2 - 1
128
+ margin: $baseLineHeight 0 $baseLineHeight * 1.5
75
129
  border-bottom: 1px solid $grayLighter
76
130
 
77
- .page-header h1
78
- line-height: 1
79
-
80
- // LISTS
81
- // -----
131
+ // Lists
132
+ // --------------------------------------------------
82
133
 
83
134
  // Unordered and Ordered lists
84
135
  ul, ol
@@ -91,20 +142,27 @@ ol ol,
91
142
  ol ul
92
143
  margin-bottom: 0
93
144
 
94
- ul
95
- list-style: disc
96
-
97
- ol
98
- list-style: decimal
99
-
100
145
  li
101
146
  line-height: $baseLineHeight
102
147
 
148
+ // Remove default list styles
149
+
103
150
  ul.unstyled,
104
151
  ol.unstyled
105
152
  margin-left: 0
106
153
  list-style: none
107
154
 
155
+ // Single-line list items
156
+
157
+ ul.inline,
158
+ ol.inline
159
+ margin-left: 0
160
+ list-style: none
161
+ & > li
162
+ display: inline-block
163
+ padding-left: 5px
164
+ padding-right: 5px
165
+
108
166
  // Description Lists
109
167
  dl
110
168
  margin-bottom: $baseLineHeight
@@ -115,22 +173,22 @@ dd
115
173
 
116
174
  dt
117
175
  font-weight: bold
118
- line-height: $baseLineHeight - 1
119
- // fix jank Helvetica Neue font bug
120
176
 
121
177
  dd
122
178
  margin-left: $baseLineHeight / 2
123
179
 
124
180
  // Horizontal layout (like forms)
125
181
  .dl-horizontal
182
+ +ctb-clearfix
183
+ // Ensure dl clears floats if empty dd elements present
126
184
  dt
127
185
  float: left
128
- width: 120px
186
+ width: $horizontalComponentOffset - 20
129
187
  clear: left
130
188
  text-align: right
131
- +bootstrap-text-overflow
189
+ +ctb-text-overflow
132
190
  dd
133
- margin-left: 130px
191
+ margin-left: $horizontalComponentOffset
134
192
 
135
193
  // MISC
136
194
  // ----
@@ -142,20 +200,12 @@ hr
142
200
  border-top: 1px solid $hrBorder
143
201
  border-bottom: 1px solid $white
144
202
 
145
- // Emphasis
146
- strong
147
- font-weight: bold
148
-
149
- em
150
- font-style: italic
151
-
152
- .muted
153
- color: $grayLight
154
-
155
203
  // Abbreviations and acronyms
156
- abbr[title]
204
+
205
+ abbr[title],
206
+ abbr[data-original-title]
157
207
  cursor: help
158
- border-bottom: 1px dotted #ddd
208
+ border-bottom: 1px dotted $grayLight
159
209
 
160
210
  abbr.initialism
161
211
  font-size: 90%
@@ -168,7 +218,7 @@ blockquote
168
218
  border-left: 5px solid $grayLighter
169
219
  p
170
220
  margin-bottom: 0
171
- +bootstrap-font-shorthand(16px, 300, $baseLineHeight * 1.25)
221
+ +ctb-font-shorthand(16px, 300, $baseLineHeight * 1.25)
172
222
  small
173
223
  display: block
174
224
  line-height: $baseLineHeight
@@ -185,6 +235,11 @@ blockquote
185
235
  p,
186
236
  small
187
237
  text-align: right
238
+ small
239
+ &:before
240
+ content: ''
241
+ &:after
242
+ content: '\00A0 \2014'
188
243
 
189
244
  // Quotes
190
245
 
@@ -200,10 +255,3 @@ address
200
255
  margin-bottom: $baseLineHeight
201
256
  font-style: normal
202
257
  line-height: $baseLineHeight
203
-
204
- // Misc
205
- small
206
- font-size: 100%
207
-
208
- cite
209
- font-style: normal
@@ -1,5 +1,6 @@
1
- // UTILITY CLASSES
2
- // ---------------
1
+ //
2
+ // Utility classes
3
+ // --------------------------------------------------
3
4
 
4
5
  // Quick floats
5
6
  .pull-right
@@ -18,3 +19,7 @@
18
19
  // Visibility
19
20
  .invisible
20
21
  visibility: hidden
22
+
23
+ // For Affix plugin
24
+ .affix
25
+ position: fixed
@@ -1,8 +1,8 @@
1
- // Variables.less
2
- // Variables to customize the look and feel of Bootstrap
3
- // -----------------------------------------------------
1
+ //
2
+ // Variables
3
+ // --------------------------------------------------
4
4
 
5
- // GLOBAL VALUES
5
+ // Global values
6
6
  // --------------------------------------------------
7
7
 
8
8
  // Grays
@@ -40,35 +40,63 @@ $linkColorHover: darken($linkColor, 15%) !default
40
40
  // -------------------------
41
41
  $sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default
42
42
  $serifFontFamily: Georgia, "Times New Roman", Times, serif !default
43
- $monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace !default
43
+ $monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace !default
44
44
 
45
- $baseFontSize: 13px !default
45
+ $baseFontSize: 14px !default
46
46
  $baseFontFamily: $sansFontFamily !default
47
- $baseLineHeight: 18px !default
47
+ $baseLineHeight: 20px !default
48
48
  $altFontFamily: $serifFontFamily !default
49
49
 
50
- $headingsFontFamily: inherit !default
50
+ $headingsFontFamily: inherit
51
51
 
52
52
  // empty to use BS default, $baseFontFamily
53
- $headingsFontWeight: bold !default
53
+ $headingsFontWeight: bold
54
54
 
55
55
  // instead of browser default, bold
56
- $headingsColor: inherit !default
56
+ $headingsColor: inherit
57
57
 
58
58
  // empty to use BS default, $textColor
59
59
 
60
+ // Component sizing
61
+ // -------------------------
62
+ // Based on 14px font-size and 20px line-height
63
+
64
+ $fontSizeLarge: $baseFontSize * 1.25
65
+
66
+ // ~18px
67
+ $fontSizeSmall: $baseFontSize * 0.85
68
+
69
+ // ~12px
70
+ $fontSizeMini: $baseFontSize * 0.75
71
+
72
+ // ~11px
73
+
74
+ $paddingLarge: 11px 19px
75
+
76
+ // 44px
77
+ $paddingSmall: 2px 10px
78
+
79
+ // 26px
80
+ $paddingMini: 0 6px
81
+
82
+ // 22px
83
+
84
+ $baseBorderRadius: 4px !default
85
+ $borderRadiusLarge: 6px !default
86
+ $borderRadiusSmall: 3px !default
87
+
60
88
  // Tables
61
89
  // -------------------------
62
- $tableBackground: transparent !default
90
+ $tableBackground: transparent
63
91
 
64
92
  // overall background-color
65
- $tableBackgroundAccent: #f9f9f9 !default
93
+ $tableBackgroundAccent: #f9f9f9
66
94
 
67
95
  // for striping
68
- $tableBackgroundHover: #f5f5f5 !default
96
+ $tableBackgroundHover: whitesmoke
69
97
 
70
98
  // for hover
71
- $tableBorder: #dddddd !default
99
+ $tableBorder: #dddddd
72
100
 
73
101
  // table and cell border
74
102
 
@@ -76,10 +104,10 @@ $tableBorder: #dddddd !default
76
104
  // -------------------------
77
105
  $btnBackground: $white !default
78
106
  $btnBackgroundHighlight: darken($white, 10%) !default
79
- $btnBorder: #cccccc !default
107
+ $btnBorder: #bbbbbb !default
80
108
 
81
109
  $btnPrimaryBackground: $linkColor !default
82
- $btnPrimaryBackgroundHighlight: adjust-hue($btnPrimaryBackground, 15%) !default
110
+ $btnPrimaryBackgroundHighlight: adjust-hue($btnPrimaryBackground, 20%) !default
83
111
 
84
112
  $btnInfoBackground: #5bc0de !default
85
113
  $btnInfoBackgroundHighlight: #2f96b4 !default
@@ -93,24 +121,33 @@ $btnWarningBackgroundHighlight: $orange !default
93
121
  $btnDangerBackground: #ee5f5b !default
94
122
  $btnDangerBackgroundHighlight: #bd362f !default
95
123
 
96
- $btnInverseBackground: $gray !default
124
+ $btnInverseBackground: #444444 !default
97
125
  $btnInverseBackgroundHighlight: $grayDarker !default
98
126
 
99
127
  // Forms
100
128
  // -------------------------
101
129
  $inputBackground: $white !default
102
130
  $inputBorder: #cccccc !default
103
- $inputBorderRadius: 3px !default
131
+ $inputBorderRadius: $baseBorderRadius !default
104
132
  $inputDisabledBackground: $grayLighter !default
105
- $formActionsBackground: #f5f5f5 !default
133
+ $formActionsBackground: whitesmoke !default
134
+ $inputHeight: $baseLineHeight + 10px
135
+
136
+ // base line-height + 8px vertical padding + 2px top/bottom border
106
137
 
107
138
  // Dropdowns
108
139
  // -------------------------
109
140
  $dropdownBackground: $white !default
110
141
  $dropdownBorder: rgba(0, 0, 0, 0.2) !default
142
+ $dropdownDividerTop: #e5e5e5 !default
143
+ $dropdownDividerBottom: $white !default
144
+
111
145
  $dropdownLinkColor: $grayDark !default
112
146
  $dropdownLinkColorHover: $white !default
113
- $dropdownLinkBackgroundHover: $linkColor !default
147
+ $dropdownLinkColorActive: $white !default
148
+
149
+ $dropdownLinkBackgroundActive: $linkColor !default
150
+ $dropdownLinkBackgroundHover: $dropdownLinkBackgroundActive !default
114
151
 
115
152
  // COMPONENT VARIABLES
116
153
  // --------------------------------------------------
@@ -121,15 +158,15 @@ $dropdownLinkBackgroundHover: $linkColor !default
121
158
  // Try to avoid customizing these :)
122
159
  $zindexDropdown: 1000 !default
123
160
  $zindexPopover: 1010 !default
124
- $zindexTooltip: 1020 !default
161
+ $zindexTooltip: 1030 !default
125
162
  $zindexFixedNavbar: 1030 !default
126
163
  $zindexModalBackdrop: 1040 !default
127
164
  $zindexModal: 1050 !default
128
165
 
129
166
  // Sprite icons path
130
167
  // -------------------------
131
- $iconSpritePath: "../img/glyphicons-halflings.png" !default
132
- $iconWhiteSpritePath: "../img/glyphicons-halflings-white.png" !default
168
+ $iconSpritePath: "glyphicons-halflings.png" !default
169
+ $iconWhiteSpritePath: "glyphicons-halflings-white.png" !default
133
170
 
134
171
  // Input placeholder text color
135
172
  // -------------------------
@@ -139,25 +176,58 @@ $placeholderText: $grayLight !default
139
176
  // -------------------------
140
177
  $hrBorder: $grayLighter !default
141
178
 
179
+ // Horizontal forms & lists
180
+ // -------------------------
181
+ $horizontalComponentOffset: 180px !default
182
+
183
+ // Wells
184
+ // -------------------------
185
+ $wellBackground: whitesmoke !default
186
+
142
187
  // Navbar
143
188
  // -------------------------
144
- $navbarHeight: 40px !default
145
- $navbarBackground: $grayDarker !default
146
- $navbarBackgroundHighlight: $grayDark !default
189
+ $navbarCollapseWidth: 979px !default
190
+ $navbarCollapseDesktopWidth: $navbarCollapseWidth + 1 !default
147
191
 
148
- $navbarText: $grayLight !default
149
- $navbarLinkColor: $grayLight !default
150
- $navbarLinkColorHover: $white !default
151
- $navbarLinkColorActive: $navbarLinkColorHover !default
192
+ $navbarHeight: 40px !default
193
+ $navbarBackgroundHighlight: white !default
194
+ $navbarBackground: darken($navbarBackgroundHighlight, 5%) !default
195
+ $navbarBorder: darken($navbarBackground, 12%) !default
196
+
197
+ $navbarText: #777777 !default
198
+ $navbarLinkColor: #777777 !default
199
+ $navbarLinkColorHover: $grayDark !default
200
+ $navbarLinkColorActive: $gray !default
152
201
  $navbarLinkBackgroundHover: transparent !default
153
- $navbarLinkBackgroundActive: $navbarBackground !default
202
+ $navbarLinkBackgroundActive: darken($navbarBackground, 5%) !default
154
203
 
155
- $navbarSearchBackground: lighten($navbarBackground, 25%) !default
156
- $navbarSearchBackgroundFocus: $white !default
157
- $navbarSearchBorder: darken($navbarSearchBackground, 30%) !default
158
- $navbarSearchPlaceholderColor: #cccccc !default
159
204
  $navbarBrandColor: $navbarLinkColor !default
160
205
 
206
+ // Inverted navbar
207
+ $navbarInverseBackground: #111111 !default
208
+ $navbarInverseBackgroundHighlight: #222222 !default
209
+ $navbarInverseBorder: #252525 !default
210
+
211
+ $navbarInverseText: $grayLight !default
212
+ $navbarInverseLinkColor: $grayLight !default
213
+ $navbarInverseLinkColorHover: $white !default
214
+ $navbarInverseLinkColorActive: $navbarInverseLinkColorHover !default
215
+ $navbarInverseLinkBackgroundHover: transparent !default
216
+ $navbarInverseLinkBackgroundActive: $navbarInverseBackground !default
217
+
218
+ $navbarInverseSearchBackground: lighten($navbarInverseBackground, 25%) !default
219
+ $navbarInverseSearchBackgroundFocus: $white !default
220
+ $navbarInverseSearchBorder: $navbarInverseBackground !default
221
+ $navbarInverseSearchPlaceholderColor: #cccccc !default
222
+
223
+ $navbarInverseBrandColor: $navbarInverseLinkColor !default
224
+
225
+ // Pagination
226
+ // -------------------------
227
+ $paginationBackground: white !default
228
+ $paginationBorder: #dddddd !default
229
+ $paginationActiveBackground: whitesmoke !default
230
+
161
231
  // Hero unit
162
232
  // -------------------------
163
233
  $heroUnitBackground: $grayLighter !default
@@ -182,6 +252,22 @@ $infoText: #3a87ad !default
182
252
  $infoBackground: #d9edf7 !default
183
253
  $infoBorder: darken(adjust-hue($infoBackground, -10), 7%) !default
184
254
 
255
+ // Tooltips and popovers
256
+ // -------------------------
257
+ $tooltipColor: white !default
258
+ $tooltipBackground: black !default
259
+ $tooltipArrowWidth: 5px !default
260
+ $tooltipArrowColor: $tooltipBackground !default
261
+
262
+ $popoverBackground: white !default
263
+ $popoverArrowWidth: 10px !default
264
+ $popoverArrowColor: white !default
265
+ $popoverTitleBackground: darken($popoverBackground, 3%) !default
266
+
267
+ // Special enhancement for popovers
268
+ $popoverArrowOuterWidth: $popoverArrowWidth + 1 !default
269
+ $popoverArrowOuterColor: rgba(0, 0, 0, 0.25) !default
270
+
185
271
  // GRID
186
272
  // --------------------------------------------------
187
273
 
@@ -192,7 +278,25 @@ $gridColumnWidth: 60px !default
192
278
  $gridGutterWidth: 20px !default
193
279
  $gridRowWidth: $gridColumns * $gridColumnWidth + $gridGutterWidth * ($gridColumns - 1) !default
194
280
 
281
+ // 1200px min
282
+ $gridColumnWidth1200: 70px !default
283
+ $gridGutterWidth1200: 30px !default
284
+ $gridRowWidth1200: $gridColumns * $gridColumnWidth1200 + $gridGutterWidth1200 * ($gridColumns - 1) !default
285
+
286
+ // 768px-979px
287
+ $gridColumnWidth768: 42px !default
288
+ $gridGutterWidth768: 20px !default
289
+ $gridRowWidth768: $gridColumns * $gridColumnWidth768 + $gridGutterWidth768 * ($gridColumns - 1) !default
290
+
195
291
  // Fluid grid
196
292
  // -------------------------
197
- $fluidGridColumnWidth: 6.383% !default
198
- $fluidGridGutterWidth: 2.128% !default
293
+ $fluidGridColumnWidth: percentage($gridColumnWidth / $gridRowWidth) !default
294
+ $fluidGridGutterWidth: percentage($gridGutterWidth / $gridRowWidth) !default
295
+
296
+ // 1200px min
297
+ $fluidGridColumnWidth1200: percentage($gridColumnWidth1200 / $gridRowWidth1200) !default
298
+ $fluidGridGutterWidth1200: percentage($gridGutterWidth1200 / $gridRowWidth1200) !default
299
+
300
+ // 768px-979px
301
+ $fluidGridColumnWidth768: percentage($gridColumnWidth768 / $gridRowWidth768) !default
302
+ $fluidGridGutterWidth768: percentage($gridGutterWidth768 / $gridRowWidth768) !default