compass_twitter_bootstrap 2.0.3 → 2.2.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 (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,5 +1,19 @@
1
+ //
2
+ // Grid system
3
+ // --------------------------------------------------
4
+
1
5
  // Fixed (940px)
2
- +bootstrap-grid-core($gridColumnWidth, $gridGutterWidth)
6
+ +ctb-grid-core($gridColumnWidth, $gridGutterWidth)
3
7
 
4
8
  // Fluid (940px)
5
- +bootstrap-grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth)
9
+ +ctb-grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth)
10
+
11
+ // Reset utility classes due to specificity
12
+
13
+ [class*="span"].hide,
14
+ .row-fluid [class*="span"].hide
15
+ display: none
16
+
17
+ [class*="span"].pull-right,
18
+ .row-fluid [class*="span"].pull-right
19
+ float: right
@@ -1,19 +1,22 @@
1
- // HERO UNIT
2
- // ---------
1
+ //
2
+ // Hero unit
3
+ // --------------------------------------------------
3
4
 
4
5
  .hero-unit
5
6
  padding: 60px
6
7
  margin-bottom: 30px
8
+ font-size: 18px
9
+ font-weight: 200
10
+ line-height: $baseLineHeight * 1.5
11
+ color: $heroUnitLeadColor
7
12
  background-color: $heroUnitBackground
8
- +bootstrap-border-radius(6px)
13
+ +ctb-border-radius(6px)
9
14
  h1
10
15
  margin-bottom: 0
11
16
  font-size: 60px
12
17
  line-height: 1
13
18
  color: $heroUnitHeadingColor
14
19
  letter-spacing: -1px
15
- p
16
- font-size: 18px
17
- font-weight: 200
20
+ li
18
21
  line-height: $baseLineHeight * 1.5
19
- color: $heroUnitLeadColor
22
+ // Reset since we specify in type.less
@@ -1,10 +1,13 @@
1
- // LABELS & BADGES
2
- // ---------------
1
+ //
2
+ // Labels and badges
3
+ // --------------------------------------------------
3
4
 
4
5
  // Base classes
5
6
 
6
7
  .label,
7
8
  .badge
9
+ display: inline-block
10
+ padding: 2px 4px
8
11
  font-size: $baseFontSize * 0.846
9
12
  font-weight: bold
10
13
  line-height: 14px
@@ -17,12 +20,19 @@
17
20
 
18
21
  // Set unique padding and border-radii
19
22
  .label
20
- padding: 1px 4px 2px
21
- +bootstrap-border-radius(3px)
23
+ +ctb-border-radius(3px)
22
24
 
23
25
  .badge
24
- padding: 1px 9px 2px
25
- +bootstrap-border-radius(9px)
26
+ padding-left: 9px
27
+ padding-right: 9px
28
+ +ctb-border-radius(9px)
29
+
30
+ // Empty labels/badges collapse
31
+
32
+ .label,
33
+ .badge
34
+ &:empty
35
+ display: none
26
36
 
27
37
  // Hover state, but only for links
28
38
  a
@@ -35,51 +45,48 @@ a
35
45
  // Colors
36
46
  // Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
37
47
  // Important (red)
38
-
39
- .label-important,
40
- .badge-important
48
+ .label-important, .badge-important
41
49
  background-color: $errorText
42
50
 
43
- .label-important[href],
44
- .badge-important[href]
51
+ .label-important[href], .badge-important[href]
45
52
  background-color: darken($errorText, 10%)
46
53
 
47
54
  // Warnings (orange)
48
-
49
- .label-warning,
50
- .badge-warning
55
+ .label-warning, .badge-warning
51
56
  background-color: $orange
52
57
 
53
- .label-warning[href],
54
- .badge-warning[href]
58
+ .label-warning[href], .badge-warning[href]
55
59
  background-color: darken($orange, 10%)
56
60
 
57
61
  // Success (green)
58
-
59
- .label-success,
60
- .badge-success
62
+ .label-success, .badge-success
61
63
  background-color: $successText
62
64
 
63
- .label-success[href],
64
- .badge-success[href]
65
+ .label-success[href], .badge-success[href]
65
66
  background-color: darken($successText, 10%)
66
67
 
67
68
  // Info (turquoise)
68
-
69
- .label-info,
70
- .badge-info
69
+ .label-info, .badge-info
71
70
  background-color: $infoText
72
71
 
73
- .label-info[href],
74
- .badge-info[href]
72
+ .label-info[href], .badge-info[href]
75
73
  background-color: darken($infoText, 10%)
76
74
 
77
75
  // Inverse (black)
78
-
79
- .label-inverse,
80
- .badge-inverse
76
+ .label-inverse, .badge-inverse
81
77
  background-color: $grayDark
82
78
 
83
- .label-inverse[href],
84
- .badge-inverse[href]
79
+ .label-inverse[href], .badge-inverse[href]
85
80
  background-color: darken($grayDark, 10%)
81
+
82
+ // Quick fix for labels/badges in buttons
83
+ .btn
84
+ .label,
85
+ .badge
86
+ position: relative
87
+ top: -1px
88
+
89
+ .btn-mini
90
+ .label,
91
+ .badge
92
+ top: 0
@@ -1,14 +1,13 @@
1
1
  //
2
2
  // Layouts
3
- // Fixed-width and fluid (with sidebar) layouts
4
- // --------------------------------------------
3
+ // --------------------------------------------------
5
4
 
6
5
  // Container (centered, fixed-width layouts)
7
6
  .container
8
- +bootstrap-container-fixed
7
+ +ctb-container-fixed
9
8
 
10
9
  // Fluid layouts (left aligned, with sidebar, min- & max-width content)
11
10
  .container-fluid
12
11
  padding-right: $gridGutterWidth
13
12
  padding-left: $gridGutterWidth
14
- +bootstrap-clearfix
13
+ +ctb-clearfix
@@ -0,0 +1,48 @@
1
+ // Media objects
2
+ // Source: http://stubbornella.org/content/?p=497
3
+ // --------------------------------------------------
4
+
5
+ // Common styles
6
+ // -------------------------
7
+
8
+ // Clear the floats
9
+
10
+ .media,
11
+ .media-body
12
+ overflow: hidden
13
+ *overflow: visible
14
+ zoom: 1
15
+
16
+ // Proper spacing between instances of .media
17
+
18
+ .media,
19
+ .media .media
20
+ margin-top: 15px
21
+
22
+ .media:first-child
23
+ margin-top: 0
24
+
25
+ // For images and videos, set to block
26
+ .media-object
27
+ display: block
28
+
29
+ // Reset margins on headings for tighter default spacing
30
+ .media-heading
31
+ margin: 0 0 5px
32
+
33
+ // Media image alignment
34
+ // -------------------------
35
+
36
+ .media .pull-left
37
+ margin-right: 10px
38
+
39
+ .media .pull-right
40
+ margin-left: 10px
41
+
42
+ // Media list variation
43
+ // -------------------------
44
+
45
+ // Undo default ul/ol styles
46
+ .media-list
47
+ margin-left: 0
48
+ list-style: none
@@ -1,6 +1,6 @@
1
- // Mixins.less
2
- // Snippets of reusable CSS to develop faster and keep code readable
3
- // -----------------------------------------------------------------
1
+ //
2
+ // Mixins
3
+ // --------------------------------------------------
4
4
 
5
5
  // UTILITY MIXINS
6
6
  // --------------------------------------------------
@@ -8,18 +8,21 @@
8
8
  // Clearfix
9
9
  // --------
10
10
  // For clearing floats like a boss h5bp.com/q
11
- =bootstrap-clearfix
11
+ =ctb-clearfix
12
12
  *zoom: 1
13
13
  &:before,
14
14
  &:after
15
15
  display: table
16
16
  content: ""
17
+ // Fixes Opera/contenteditable bug:
18
+ // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952
19
+ line-height: 0
17
20
  &:after
18
21
  clear: both
19
22
 
20
23
  // Webkit-style focus
21
24
  // ------------------
22
- =bootstrap-tab-focus
25
+ =ctb-tab-focus
23
26
  // Default
24
27
  outline: thin dotted #333
25
28
  // Webkit
@@ -28,16 +31,16 @@
28
31
 
29
32
  // Center-align a block level element
30
33
  // ----------------------------------
31
- =bootstrap-center-block
34
+ =ctb-center-block
32
35
  display: block
33
36
  margin-left: auto
34
37
  margin-right: auto
35
38
 
36
39
  // IE7 inline-block
37
40
  // ----------------
38
- =bootstrap-ie7-inline-block
41
+ =ctb-ie7-inline-block
39
42
  *display: inline
40
- /* IE7 inline-block hack
43
+ // IE7 inline-block hack
41
44
  *zoom: 1
42
45
 
43
46
  // IE7 likes to collapse whitespace on either side of the inline-block elements.
@@ -46,37 +49,37 @@
46
49
  // right version is for icons, which come before. Applying both is ok, but it will
47
50
  // mean that space between those elements will be .6em (~2 space characters) in IE7,
48
51
  // instead of the 1 space in other browsers.
49
- =bootstrap-ie7-restore-left-whitespace
52
+ =ctb-ie7-restore-left-whitespace
50
53
  *margin-left: .3em
51
54
  &:first-child
52
55
  *margin-left: 0
53
56
 
54
- =bootstrap-ie7-restore-right-whitespace
57
+ =ctb-ie7-restore-right-whitespace
55
58
  *margin-right: .3em
56
- &:last-child
57
- *margin-left: 0
58
59
 
59
60
  // Sizing shortcuts
60
61
  // -------------------------
61
- =bootstrap-size($height, $width)
62
+ =ctb-size($height, $width)
62
63
  width: $width
63
64
  height: $height
64
65
 
65
- =bootstrap-square($size)
66
- +bootstrap-size($size, $size)
66
+ =ctb-square($size)
67
+ +ctb-size($size, $size)
67
68
 
68
69
  // Placeholder text
69
70
  // -------------------------
70
- =bootstrap-placeholder($color: $placeholderText)
71
- \:-moz-placeholder
71
+ =ctb-placeholder($color: $placeholderText)
72
+ &:-moz-placeholder
73
+ color: $color
74
+ &:-ms-input-placeholder
72
75
  color: $color
73
- \::-webkit-input-placeholder
76
+ &::-webkit-input-placeholder
74
77
  color: $color
75
78
 
76
79
  // Text overflow
77
80
  // -------------------------
78
81
  // Requires inline-block or block for proper styling
79
- =bootstrap-text-overflow
82
+ =ctb-text-overflow
80
83
  overflow: hidden
81
84
  text-overflow: ellipsis
82
85
  white-space: nowrap
@@ -84,7 +87,7 @@
84
87
  // CSS image replacement
85
88
  // -------------------------
86
89
  // Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
87
- =bootstrap-hide-text
90
+ =ctb-hide-text
88
91
  font: 0 / 0 a
89
92
  color: transparent
90
93
  text-shadow: none
@@ -93,60 +96,68 @@
93
96
 
94
97
  // FONTS
95
98
  // --------------------------------------------------
96
- =bootstrap-font-family-serif
99
+
100
+ =ctb-font-family-serif
97
101
  font-family: $serifFontFamily
98
102
 
99
- =bootstrap-font-family-sans-serif
103
+ =ctb-font-family-sans-serif
100
104
  font-family: $sansFontFamily
101
105
 
102
- =bootstrap-font-family-monospace
106
+ =ctb-font-family-monospace
103
107
  font-family: $monoFontFamily
104
108
 
105
- =bootstrap-font-shorthand($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight)
109
+ =ctb-font-shorthand($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight)
106
110
  font-size: $size
107
111
  font-weight: $weight
108
112
  line-height: $lineHeight
109
113
 
110
- =bootstrap-font-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight)
111
- +bootstrap-font-family-serif
112
- +bootstrap-font-shorthand($size, $weight, $lineHeight)
114
+ =ctb-font-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight)
115
+ +ctb-font-family-serif
116
+ +ctb-font-shorthand($size, $weight, $lineHeight)
113
117
 
114
- =bootstrap-font-sans-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight)
115
- +bootstrap-font-family-sans-serif
116
- +bootstrap-font-shorthand($size, $weight, $lineHeight)
118
+ =ctb-font-sans-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight)
119
+ +ctb-font-family-sans-serif
120
+ +ctb-font-shorthand($size, $weight, $lineHeight)
117
121
 
118
- =bootstrap-font-monospace($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight)
119
- +bootstrap-font-family-monospace
120
- +bootstrap-font-shorthand($size, $weight, $lineHeight)
122
+ =ctb-font-monospace($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight)
123
+ +ctb-font-family-monospace
124
+ +ctb-font-shorthand($size, $weight, $lineHeight)
121
125
 
122
126
  // FORMS
123
127
  // --------------------------------------------------
124
128
 
125
129
  // Block level inputs
126
- =bootstrap-input-block-level
130
+ =ctb-input-block-level
127
131
  display: block
128
132
  width: 100%
129
- min-height: 28px
133
+ min-height: 30px
130
134
  // Make inputs at least the height of their button counterpart
131
- +bootstrap-box-sizing(border-box)
135
+ +ctb-box-sizing(border-box)
132
136
  // Makes inputs behave like true block-level elements
133
137
 
134
138
  // Mixin for form field states
135
- =bootstrap-formFieldState($textColor: #555555, $borderColor: #cccccc, $backgroundColor: #f5f5f5)
139
+ =ctb-formFieldState($textColor: #555555, $borderColor: #cccccc, $backgroundColor: whitesmoke)
136
140
  // Set the text color
137
141
  > label,
138
142
  .help-block,
139
143
  .help-inline
140
144
  color: $textColor
141
145
  // Style inputs accordingly
146
+ .checkbox,
147
+ .radio,
142
148
  input,
143
149
  select,
144
150
  textarea
145
151
  color: $textColor
146
152
  border-color: $borderColor
153
+ +ctb-box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075))
154
+ // Redeclare so transitions work
147
155
  &:focus
148
156
  border-color: darken($borderColor, 10%)
149
- +bootstrap-box-shadow(0 0 6px lighten($borderColor, 20%))
157
+ // Write out in full since the lighten() function isn't easily escaped
158
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px lighten($borderColor, 20%)
159
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px lighten($borderColor, 20%)
160
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px lighten($borderColor, 20%)
150
161
  // Give a small background color for input-prepend/-append
151
162
  .input-prepend .add-on,
152
163
  .input-append .add-on
@@ -158,95 +169,129 @@
158
169
  // --------------------------------------------------
159
170
 
160
171
  // Border Radius
161
- =bootstrap-border-radius($radius)
172
+ =ctb-border-radius($radius)
162
173
  -webkit-border-radius: $radius
163
174
  -moz-border-radius: $radius
164
175
  border-radius: $radius
165
176
 
177
+ // Single Corner Border Radius
178
+ =ctb-border-top-left-radius($radius)
179
+ -webkit-border-top-left-radius: $radius
180
+ -moz-border-radius-topleft: $radius
181
+ border-top-left-radius: $radius
182
+
183
+ =ctb-border-top-right-radius($radius)
184
+ -webkit-border-top-right-radius: $radius
185
+ -moz-border-radius-topright: $radius
186
+ border-top-right-radius: $radius
187
+
188
+ =ctb-border-bottom-right-radius($radius)
189
+ -webkit-border-bottom-right-radius: $radius
190
+ -moz-border-radius-bottomright: $radius
191
+ border-bottom-right-radius: $radius
192
+
193
+ =ctb-border-bottom-left-radius($radius)
194
+ -webkit-border-bottom-left-radius: $radius
195
+ -moz-border-radius-bottomleft: $radius
196
+ border-bottom-left-radius: $radius
197
+
198
+ // Single Side Border Radius
199
+ =ctb-border-top-radius($radius)
200
+ +ctb-border-top-right-radius($radius)
201
+ +ctb-border-top-left-radius($radius)
202
+
203
+ =ctb-border-right-radius($radius)
204
+ +ctb-border-top-right-radius($radius)
205
+ +ctb-border-bottom-right-radius($radius)
206
+
207
+ =ctb-border-bottom-radius($radius)
208
+ +ctb-border-bottom-right-radius($radius)
209
+ +ctb-border-bottom-left-radius($radius)
210
+
211
+ =ctb-border-left-radius($radius)
212
+ +ctb-border-top-left-radius($radius)
213
+ +ctb-border-bottom-left-radius($radius)
214
+
166
215
  // Drop shadows
167
- =bootstrap-box-shadow($shadow)
216
+ =ctb-box-shadow($shadow)
168
217
  -webkit-box-shadow: $shadow
169
218
  -moz-box-shadow: $shadow
170
219
  box-shadow: $shadow
171
220
 
172
221
  // Transitions
173
- =bootstrap-transition($transition)
222
+ =ctb-transition($transition)
174
223
  -webkit-transition: $transition
175
224
  -moz-transition: $transition
176
- -ms-transition: $transition
177
225
  -o-transition: $transition
178
226
  transition: $transition
179
227
 
180
228
  // Transformations
181
- =bootstrap-rotate($degrees)
229
+ =ctb-rotate($degrees)
182
230
  -webkit-transform: rotate($degrees)
183
231
  -moz-transform: rotate($degrees)
184
232
  -ms-transform: rotate($degrees)
185
233
  -o-transform: rotate($degrees)
186
234
  transform: rotate($degrees)
187
235
 
188
- =bootstrap-scale($ratio)
236
+ =ctb-scale($ratio)
189
237
  -webkit-transform: scale($ratio)
190
238
  -moz-transform: scale($ratio)
191
239
  -ms-transform: scale($ratio)
192
240
  -o-transform: scale($ratio)
193
241
  transform: scale($ratio)
194
242
 
195
- =bootstrap-translate($x, $y)
243
+ =ctb-translate($x, $y)
196
244
  -webkit-transform: translate($x, $y)
197
245
  -moz-transform: translate($x, $y)
198
246
  -ms-transform: translate($x, $y)
199
247
  -o-transform: translate($x, $y)
200
248
  transform: translate($x, $y)
201
249
 
202
- =bootstrap-skew($x, $y)
250
+ =ctb-skew($x, $y)
203
251
  -webkit-transform: skew($x, $y)
204
252
  -moz-transform: skew($x, $y)
205
253
  -ms-transform: skew($x, $y)
206
254
  -o-transform: skew($x, $y)
207
255
  transform: skew($x, $y)
208
256
 
209
- =bootstrap-translate3d($x, $y, $z)
210
- -webkit-transform: translate($x, $y, $z)
211
- -moz-transform: translate($x, $y, $z)
212
- -ms-transform: translate($x, $y, $z)
213
- -o-transform: translate($x, $y, $z)
214
- transform: translate($x, $y, $z)
257
+ =ctb-translate3d($x, $y, $z)
258
+ -webkit-transform: translate3d($x, $y, $z)
259
+ -moz-transform: translate3d($x, $y, $z)
260
+ -o-transform: translate3d($x, $y, $z)
261
+ transform: translate3d($x, $y, $z)
215
262
 
216
263
  // Backface visibility
217
264
  // Prevent browsers from flickering when using CSS 3D transforms.
218
265
  // Default value is `visible`, but can be changed to `hidden
219
266
  // See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
220
- =bootstrap-backface-visibility($visibility)
267
+ =ctb-backface-visibility($visibility)
221
268
  -webkit-backface-visibility: $visibility
222
269
  -moz-backface-visibility: $visibility
223
- -ms-backface-visibility: $visibility
224
270
  backface-visibility: $visibility
225
271
 
226
272
  // Background clipping
227
273
  // Heads up: FF 3.6 and under need "padding" instead of "padding-box"
228
- =bootstrap-background-clip($clip)
274
+ =ctb-background-clip($clip)
229
275
  -webkit-background-clip: $clip
230
276
  -moz-background-clip: $clip
231
277
  background-clip: $clip
232
278
 
233
279
  // Background sizing
234
- =bootstrap-background-size($size)
280
+ =ctb-background-size($size)
235
281
  -webkit-background-size: $size
236
282
  -moz-background-size: $size
237
283
  -o-background-size: $size
238
284
  background-size: $size
239
285
 
240
286
  // Box sizing
241
- =bootstrap-box-sizing($boxmodel)
287
+ =ctb-box-sizing($boxmodel)
242
288
  -webkit-box-sizing: $boxmodel
243
289
  -moz-box-sizing: $boxmodel
244
- -ms-box-sizing: $boxmodel
245
290
  box-sizing: $boxmodel
246
291
 
247
292
  // User select
248
293
  // For selecting text on the page
249
- =bootstrap-user-select($select)
294
+ =ctb-user-select($select)
250
295
  -webkit-user-select: $select
251
296
  -moz-user-select: $select
252
297
  -ms-user-select: $select
@@ -254,14 +299,14 @@
254
299
  user-select: $select
255
300
 
256
301
  // Resize anything
257
- =bootstrap-resizable($direction)
302
+ =ctb-resizable($direction)
258
303
  resize: $direction
259
304
  // Options: horizontal, vertical, both
260
305
  overflow: auto
261
306
  // Safari fix
262
307
 
263
308
  // CSS3 Content Columns
264
- =bootstrap-content-columns($columnCount, $columnGap: $gridGutterWidth)
309
+ =ctb-content-columns($columnCount, $columnGap: $gridGutterWidth)
265
310
  -webkit-column-count: $columnCount
266
311
  -moz-column-count: $columnCount
267
312
  column-count: $columnCount
@@ -269,112 +314,114 @@
269
314
  -moz-column-gap: $columnGap
270
315
  column-gap: $columnGap
271
316
 
317
+ // Optional hyphenation
318
+ =ctb-hyphens($mode: auto)
319
+ word-wrap: break-word
320
+ -webkit-hyphens: $mode
321
+ -moz-hyphens: $mode
322
+ -ms-hyphens: $mode
323
+ -o-hyphens: $mode
324
+ hyphens: $mode
325
+
272
326
  // Opacity
273
- =bootstrap-opacity($opacity)
274
- opacity: $opacity / 100
275
- filter: unquote("alpha(opacity=#{$opacity})")
327
+ =ctb-opacity($opacity)
328
+ opacity: $opacity
329
+ filter: alpha(opacity = $opacity * 100)
276
330
 
277
331
  // BACKGROUNDS
278
332
  // --------------------------------------------------
279
333
 
280
334
  // Add an alphatransparency value to any background or border color (via Elyse Holladay)
281
- =bootstrap-translucent-background($color: $white, $alpha: 1)
335
+ =ctb-translucent-background($color: $white, $alpha: 1)
282
336
  background-color: hsla(hue($color), saturation($color), lightness($color), $alpha)
283
337
 
284
- =bootstrap-translucent-border($color: $white, $alpha: 1)
338
+ =ctb-translucent-border($color: $white, $alpha: 1)
285
339
  border-color: hsla(hue($color), saturation($color), lightness($color), $alpha)
286
- +bootstrap-background-clip(padding-box)
340
+ +ctb-background-clip(padding-box)
287
341
 
288
342
  // Gradient Bar Colors for buttons and alerts
289
- =bootstrap-gradientBar($primaryColor, $secondaryColor)
290
- +bootstrap-gradient-vertical($primaryColor, $secondaryColor)
343
+ =ctb-gradientBar($primaryColor, $secondaryColor, $textColor: white, $textShadow: 0 -1px 0 rgba(0, 0, 0, 0.25))
344
+ color: $textColor
345
+ text-shadow: $textShadow
346
+ +ctb-gradient-vertical($primaryColor, $secondaryColor)
291
347
  border-color: $secondaryColor $secondaryColor darken($secondaryColor, 15%)
292
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) fadein(rgba(0, 0, 0, 0.1), 15%)
348
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) fade-in(rgba(0, 0, 0, 0.1), 0.15)
293
349
 
294
350
  // Gradients
295
- =bootstrap-gradient-horizontal($startColor: #555555, $endColor: #333333)
351
+ =ctb-gradient-horizontal($startColor: #555555, $endColor: #333333)
296
352
  background-color: $endColor
297
353
  background-image: -moz-linear-gradient(left, $startColor, $endColor)
298
354
  // FF 3.6+
299
- background-image: -ms-linear-gradient(left, $startColor, $endColor)
300
- // IE10
301
355
  background-image: -webkit-gradient(linear, 0 0, 100% 0, from($startColor), to($endColor))
302
356
  // Safari 4+, Chrome 2+
303
357
  background-image: -webkit-linear-gradient(left, $startColor, $endColor)
304
358
  // Safari 5.1+, Chrome 10+
305
359
  background-image: -o-linear-gradient(left, $startColor, $endColor)
306
360
  // Opera 11.10
307
- background-image: linear-gradient(left, $startColor, $endColor)
308
- // Le standard
361
+ background-image: linear-gradient(to right, $startColor, $endColor)
362
+ // Standard, IE10
309
363
  background-repeat: repeat-x
310
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$startColor}', endColorstr='#{$endColor}', GradientType=1)
364
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{darken($startColor, 1%)}', endColorstr='#{darken($endColor, 1%)}', GradientType=1)
311
365
  // IE9 and down
312
366
 
313
- =bootstrap-gradient-vertical($startColor: #555555, $endColor: #333333)
314
- background-color: mix($startColor, $endColor, 60%)
367
+ =ctb-gradient-vertical($startColor: #555555, $endColor: #333333)
368
+ background-color: mix($startColor, $endColor, 62.5%)
315
369
  background-image: -moz-linear-gradient(top, $startColor, $endColor)
316
370
  // FF 3.6+
317
- background-image: -ms-linear-gradient(top, $startColor, $endColor)
318
- // IE10
319
371
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), to($endColor))
320
372
  // Safari 4+, Chrome 2+
321
373
  background-image: -webkit-linear-gradient(top, $startColor, $endColor)
322
374
  // Safari 5.1+, Chrome 10+
323
375
  background-image: -o-linear-gradient(top, $startColor, $endColor)
324
376
  // Opera 11.10
325
- background-image: linear-gradient(top, $startColor, $endColor)
326
- // The standard
377
+ background-image: linear-gradient(to bottom, $startColor, $endColor)
378
+ // Standard, IE10
327
379
  background-repeat: repeat-x
328
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$startColor}', endColorstr='#{$endColor}', GradientType=0)
380
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{darken($startColor, 1%)}', endColorstr='#{darken($endColor, 1%)}', GradientType=0)
329
381
  // IE9 and down
330
382
 
331
- =bootstrap-gradient-directional($startColor: #555555, $endColor: #333333, $deg: 45deg)
383
+ =ctb-gradient-directional($startColor: #555555, $endColor: #333333, $deg: 45deg)
332
384
  background-color: $endColor
333
385
  background-repeat: repeat-x
334
386
  background-image: -moz-linear-gradient($deg, $startColor, $endColor)
335
387
  // FF 3.6+
336
- background-image: -ms-linear-gradient($deg, $startColor, $endColor)
337
- // IE10
338
388
  background-image: -webkit-linear-gradient($deg, $startColor, $endColor)
339
389
  // Safari 5.1+, Chrome 10+
340
390
  background-image: -o-linear-gradient($deg, $startColor, $endColor)
341
391
  // Opera 11.10
342
392
  background-image: linear-gradient($deg, $startColor, $endColor)
343
- // The standard
393
+ // Standard, IE10
344
394
 
345
- =bootstrap-gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f)
395
+ =ctb-gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f)
346
396
  background-color: mix($midColor, $endColor, 80%)
347
397
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor))
348
398
  background-image: -webkit-linear-gradient($startColor, $midColor $colorStop, $endColor)
349
- background-image: -moz-linear-gradient(top, $startColor, $midColor $colorStop, $endColor)
350
- background-image: -ms-linear-gradient($startColor, $midColor $colorStop, $endColor)
399
+ background-image: -moz-linear-gradient(top, $startColor, $midColor $colorStop * 100%, $endColor)
351
400
  background-image: -o-linear-gradient($startColor, $midColor $colorStop, $endColor)
352
401
  background-image: linear-gradient($startColor, $midColor $colorStop, $endColor)
353
402
  background-repeat: no-repeat
354
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$startColor}', endColorstr='#{$endColor}', GradientType=0)
403
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{darken($startColor, 1%)}', endColorstr='#{darken($endColor, 1%)}', GradientType=0)
355
404
  // IE9 and down, gets no color-stop at all for proper fallback
356
405
 
357
- =bootstrap-gradient-radial($innerColor: #555555, $outerColor: #333333)
406
+ =ctb-gradient-radial($innerColor: #555555, $outerColor: #333333)
358
407
  background-color: $outerColor
359
408
  background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($innerColor), to($outerColor))
360
409
  background-image: -webkit-radial-gradient(circle, $innerColor, $outerColor)
361
410
  background-image: -moz-radial-gradient(circle, $innerColor, $outerColor)
362
- background-image: -ms-radial-gradient(circle, $innerColor, $outerColor)
363
411
  background-image: -o-radial-gradient(circle, $innerColor, $outerColor)
364
412
  background-repeat: no-repeat
365
413
 
366
- =bootstrap-gradient-striped($color, $angle: -45deg)
414
+ =ctb-gradient-striped($color, $angle: 45deg)
367
415
  background-color: $color
368
416
  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent))
369
417
  background-image: -webkit-linear-gradient($angle, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)
370
418
  background-image: -moz-linear-gradient($angle, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)
371
- background-image: -ms-linear-gradient($angle, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)
372
419
  background-image: -o-linear-gradient($angle, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)
373
420
  background-image: linear-gradient($angle, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)
374
421
 
375
422
  // Reset filters for IE
376
- =bootstrap-reset-filter
377
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false)
423
+ =ctb-gradient-reset-filter
424
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false)
378
425
 
379
426
  // COMPONENT MIXINS
380
427
  // --------------------------------------------------
@@ -382,7 +429,7 @@
382
429
  // Horizontal dividers
383
430
  // -------------------------
384
431
  // Dividers (basically an hr) within dropdowns and nav lists
385
- =bootstrap-nav-divider
432
+ =ctb-nav-divider($top: #e5e5e5, $bottom: $white)
386
433
  // IE7 needs a set width since we gave a height. Restricting just
387
434
  // to IE7 to keep the 1px left/right space in other browsers.
388
435
  // It is unclear where IE is getting the extra space that we need
@@ -393,19 +440,20 @@
393
440
  // 8px 1px
394
441
  *margin: -5px 0 5px
395
442
  overflow: hidden
396
- background-color: #e5e5e5
397
- border-bottom: 1px solid $white
443
+ background-color: $top
444
+ border-bottom: 1px solid $bottom
398
445
 
399
446
  // Button backgrounds
400
447
  // ------------------
401
- =bootstrap-buttonBackground($startColor, $endColor)
448
+ =ctb-buttonBackground($startColor, $endColor, $textColor: white, $textShadow: 0 -1px 0 rgba(0, 0, 0, 0.25))
402
449
  // gradientBar will set the background to a pleasing blend of these, to support IE<=9
403
- +bootstrap-gradientBar($startColor, $endColor)
450
+ +ctb-gradientBar($startColor, $endColor, $textColor, $textShadow)
404
451
  *background-color: $endColor
405
452
  /* Darken IE7 buttons by default so they stand out more given they won't have borders
406
- +bootstrap-reset-filter
453
+ +ctb-gradient-reset-filter
407
454
  // in these cases the gradient won't cover the background, so we override
408
455
  &:hover, &:active, &.active, &.disabled, &[disabled]
456
+ color: $textColor
409
457
  background-color: $endColor
410
458
  *background-color: darken($endColor, 5%)
411
459
  // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
@@ -417,55 +465,20 @@
417
465
  // -------------------------
418
466
  // Vertically center elements in the navbar.
419
467
  // Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin.
420
- =bootstrap-navbarVerticalAlign($elementHeight)
468
+ =ctb-navbarVerticalAlign($elementHeight)
421
469
  margin-top: ($navbarHeight - $elementHeight) / 2
422
470
 
423
- // Popover arrows
424
- // -------------------------
425
- // For tipsies and popovers
426
- =bootstrap-popoverArrow-top($arrowWidth: 5px, $color: $black)
427
- bottom: 0
428
- left: 50%
429
- margin-left: -$arrowWidth
430
- border-left: $arrowWidth solid transparent
431
- border-right: $arrowWidth solid transparent
432
- border-top: $arrowWidth solid $color
433
-
434
- =bootstrap-popoverArrow-left($arrowWidth: 5px, $color: $black)
435
- top: 50%
436
- right: 0
437
- margin-top: -$arrowWidth
438
- border-top: $arrowWidth solid transparent
439
- border-bottom: $arrowWidth solid transparent
440
- border-left: $arrowWidth solid $color
441
-
442
- =bootstrap-popoverArrow-bottom($arrowWidth: 5px, $color: $black)
443
- top: 0
444
- left: 50%
445
- margin-left: -$arrowWidth
446
- border-left: $arrowWidth solid transparent
447
- border-right: $arrowWidth solid transparent
448
- border-bottom: $arrowWidth solid $color
449
-
450
- =bootstrap-popoverArrow-right($arrowWidth: 5px, $color: $black)
451
- top: 50%
452
- left: 0
453
- margin-top: -$arrowWidth
454
- border-top: $arrowWidth solid transparent
455
- border-bottom: $arrowWidth solid transparent
456
- border-right: $arrowWidth solid $color
457
-
458
471
  // Grid System
459
472
  // -----------
460
473
 
461
474
  // Centered container element
462
- =bootstrap-container-fixed
475
+ =ctb-container-fixed
463
476
  margin-right: auto
464
477
  margin-left: auto
465
- +bootstrap-clearfix
478
+ +ctb-clearfix
466
479
 
467
480
  // Table columns
468
- =bootstrap-tableColumns($columnSpan: 1)
481
+ =ctb-tableColumns($columnSpan: 1)
469
482
  float: none
470
483
  // undo default grid column styles
471
484
  width: $gridColumnWidth * $columnSpan + $gridGutterWidth * ($columnSpan - 1) - 16
@@ -475,70 +488,98 @@
475
488
 
476
489
  // Make a Grid
477
490
  // Use .makeRow and .makeColumn to assign semantic layouts grid system behavior
478
- =bootstrap-makeRow
491
+ =ctb-makeRow
479
492
  margin-left: $gridGutterWidth * -1
480
- +bootstrap-clearfix
493
+ +ctb-clearfix
481
494
 
482
- =bootstrap-makeColumn($columns: 1, $offset: 0)
495
+ =ctb-makeColumn($columns: 1, $offset: 0)
483
496
  float: left
484
497
  margin-left: $gridColumnWidth * $offset + $gridGutterWidth * ($offset - 1) + $gridGutterWidth * 2
485
498
  width: $gridColumnWidth * $columns + $gridGutterWidth * ($columns - 1)
486
499
 
487
500
  // The Grid
488
- =bootstrap-grid-core-offset($columns, $gridColumnWidth, $gridGutterWidth)
489
- margin-left: $gridColumnWidth * $columns + $gridGutterWidth * ($columns + 1)
501
+ =ctb-core-offset($columns, $columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth)
502
+ margin-left: $columnWidth * $columns + $gutterWidth * ($columns + 1)
490
503
 
491
- =bootstrap-grid-core-span($columns, $gridColumnWidth, $gridGutterWidth)
492
- width: $gridColumnWidth * $columns + $gridGutterWidth * ($columns - 1)
504
+ =ctb-core-span($columns, $columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth)
505
+ width: $columnWidth * $columns + $gutterWidth * ($columns - 1)
493
506
 
494
- =bootstrap-grid-core($gridColumnWidth, $gridGutterWidth)
507
+ =ctb-grid-core($columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth)
495
508
  .row
496
- margin-left: $gridGutterWidth * -1
497
- +bootstrap-clearfix
509
+ margin-left: $gutterWidth * -1
510
+ +ctb-clearfix
498
511
  [class*="span"]
499
512
  float: left
500
- margin-left: $gridGutterWidth
513
+ margin-left: $gutterWidth
501
514
  // Set the container width, and override it for fixed navbars in media queries
502
515
  .container,
516
+ .navbar-static-top .container,
503
517
  .navbar-fixed-top .container,
504
518
  .navbar-fixed-bottom .container
505
- +bootstrap-grid-core-span($gridColumns, $gridColumnWidth, $gridGutterWidth)
519
+ +ctb-core-span($gridColumns, $columnWidth, $gutterWidth)
506
520
  // generate .spanX and .offsetX
507
- @for $i from 1 through $gridColumns
521
+ $i: $gridColumns
522
+ @while $i > 0
508
523
  .span#{$i}
509
- +bootstrap-grid-core-span($i, $gridColumnWidth, $gridGutterWidth)
524
+ +ctb-core-span($i, $columnWidth, $gutterWidth)
525
+ $i: $i - 1
526
+ $i: $gridColumns
527
+ @while $i > 0
510
528
  .offset#{$i}
511
- +bootstrap-grid-core-offset($i, $gridColumnWidth, $gridGutterWidth)
529
+ +ctb-core-offset($i, $columnWidth, $gutterWidth)
530
+ $i: $i - 1
531
+
532
+ =ctb-fluid-offset($columns, $columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth)
533
+ margin-left: $columnWidth * $columns + $gutterWidth * ($columns - 1) + $gutterWidth * 2
534
+ *margin-left: $columnWidth * $columns + $gutterWidth * ($columns - 1) - 0.5 / $gridRowWidth * 100px * 1% + $gutterWidth * 2 - 0.5 / $gridRowWidth * 100px * 1%
535
+
536
+ =ctb-fluid-offset-first-child($columns, $columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth)
537
+ margin-left: $columnWidth * $columns + $gutterWidth * ($columns - 1) + $gutterWidth
538
+ *margin-left: $columnWidth * $columns + $gutterWidth * ($columns - 1) - 0.5 / $gridRowWidth * 100px * 1% + $gutterWidth - 0.5 / $gridRowWidth * 100px * 1%
512
539
 
513
- =bootstrap-grid-fluid-span($columns, $fluidGridColumnWidth, $fluidGridGutterWidth)
514
- width: $fluidGridColumnWidth * $columns + $fluidGridGutterWidth * ($columns - 1)
515
- *width: $fluidGridColumnWidth * $columns + $fluidGridGutterWidth * ($columns - 1) - 0.5 / ($gridRowWidth / 1px) * 100 * 1%
540
+ =ctb-fluid-span($columns, $columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth)
541
+ width: $columnWidth * $columns + $gutterWidth * ($columns - 1)
542
+ *width: $columnWidth * $columns + $gutterWidth * ($columns - 1) - 0.5 / $gridRowWidth * 100px * 1%
516
543
 
517
- =bootstrap-grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth)
544
+ =ctb-grid-fluid($columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth)
518
545
  .row-fluid
519
546
  width: 100%
520
- +bootstrap-clearfix
547
+ +ctb-clearfix
521
548
  [class*="span"]
522
- +bootstrap-input-block-level
549
+ +ctb-input-block-level
523
550
  float: left
524
- margin-left: $fluidGridGutterWidth
525
- *margin-left: $fluidGridGutterWidth - 0.5 / ($gridRowWidth / 1px) * 100 * 1%
551
+ margin-left: $gutterWidth
552
+ *margin-left: $gutterWidth - 0.5 / $gridRowWidth * 100px * 1%
526
553
  [class*="span"]:first-child
527
554
  margin-left: 0
528
- // generate .spanX
529
- @for $i from 1 through $gridColumns
555
+ // generate .spanX and .offsetX
556
+ $i: $gridColumns
557
+ @while $i > 0
530
558
  .span#{$i}
531
- +bootstrap-grid-fluid-span($i, $fluidGridColumnWidth, $fluidGridGutterWidth)
559
+ +ctb-fluid-span($i, $columnWidth, $gutterWidth)
560
+ .offset#{$i}
561
+ +ctb-fluid-offset($i, $columnWidth, $gutterWidth)
562
+ .offset#{$i}:first-child
563
+ +ctb-fluid-offset-first-child($i, $columnWidth, $gutterWidth)
564
+ $i: $i - 1
532
565
 
533
- =bootstrap-grid-input-span($columns, $gridColumnWidth, $gridGutterWidth)
534
- width: $gridColumnWidth * $columns + $gridGutterWidth * ($columns - 1) - 10
566
+ =ctb-input-span($columns, $columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth)
567
+ width: $columnWidth * $columns + $gutterWidth * ($columns - 1) - 14
535
568
 
536
- =bootstrap-grid-input($gridColumnWidth, $gridGutterWidth)
569
+ =ctb-grid-input($columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth)
537
570
  input,
538
571
  textarea,
539
572
  .uneditable-input
540
573
  margin-left: 0
541
574
  // override margin-left from core grid system
542
- @for $i from 1 through $gridColumns
543
- input.span#{$i}, textarea.span#{$i}, .uneditable-input.span#{$i}
544
- +bootstrap-grid-input-span($i, $gridColumnWidth, $gridGutterWidth)
575
+ // Space grid-sized controls properly if multiple per line
576
+ .controls-row [class*="span"] + [class*="span"]
577
+ margin-left: $gutterWidth
578
+ // generate .spanX
579
+ $i: $gridColumns
580
+ @while $i > 0
581
+ input.span#{$i},
582
+ textarea.span#{$i},
583
+ .uneditable-input.span#{$i}
584
+ +ctb-input-span($i, $columnWidth, $gutterWidth)
585
+ $i: $i - 1