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,5 +1,6 @@
1
- // PROGRESS BARS
2
- // -------------
1
+ //
2
+ // Progress bars
3
+ // --------------------------------------------------
3
4
 
4
5
  // ANIMATIONS
5
6
  // ----------
@@ -50,29 +51,33 @@
50
51
  // Outer container
51
52
  .progress
52
53
  overflow: hidden
53
- height: 18px
54
- margin-bottom: 18px
55
- +bootstrap-gradient-vertical(#f5f5f5, #f9f9f9)
56
- +bootstrap-box-shadow(inset 0 1px 2px rgba(0, 0, 0, 0.1))
57
- +bootstrap-border-radius(4px)
54
+ height: $baseLineHeight
55
+ margin-bottom: $baseLineHeight
56
+ +ctb-gradient-vertical(whitesmoke, #f9f9f9)
57
+ +ctb-box-shadow(inset 0 1px 2px rgba(0, 0, 0, 0.1))
58
+ +ctb-border-radius($baseBorderRadius)
58
59
 
59
60
  // Bar of progress
60
61
  .progress .bar
61
62
  width: 0%
62
- height: 18px
63
+ height: 100%
63
64
  color: $white
65
+ float: left
64
66
  font-size: 12px
65
67
  text-align: center
66
68
  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25)
67
- +bootstrap-gradient-vertical(#149bdf, #0480be)
68
- +bootstrap-box-shadow(inset 0 -1px 0 rgba(0, 0, 0, 0.15))
69
- +bootstrap-box-sizing(border-box)
70
- +bootstrap-transition(width 0.6s ease)
69
+ +ctb-gradient-vertical(#149bdf, #0480be)
70
+ +ctb-box-shadow(inset 0 -1px 0 rgba(0, 0, 0, 0.15))
71
+ +ctb-box-sizing(border-box)
72
+ +ctb-transition(width 0.6s ease)
73
+
74
+ .progress .bar + .bar
75
+ +ctb-box-shadow(#{inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15)})
71
76
 
72
77
  // Striped bars
73
78
  .progress-striped .bar
74
- +bootstrap-gradient-striped(#149bdf)
75
- +bootstrap-background-size(40px 40px)
79
+ +ctb-gradient-striped(#149bdf)
80
+ +ctb-background-size(40px 40px)
76
81
 
77
82
  // Call animation for the active one
78
83
  .progress.active .bar
@@ -86,29 +91,29 @@
86
91
  // ------
87
92
 
88
93
  // Danger (red)
89
- .progress-danger .bar
90
- +bootstrap-gradient-vertical(#ee5f5b, #c43c35)
94
+ .progress-danger .bar, .progress .bar-danger
95
+ +ctb-gradient-vertical(#ee5f5b, #c43c35)
91
96
 
92
- .progress-danger.progress-striped .bar
93
- +bootstrap-gradient-striped(#ee5f5b)
97
+ .progress-danger.progress-striped .bar, .progress-striped .bar-danger
98
+ +ctb-gradient-striped(#ee5f5b)
94
99
 
95
100
  // Success (green)
96
- .progress-success .bar
97
- +bootstrap-gradient-vertical(#62c462, #57a957)
101
+ .progress-success .bar, .progress .bar-success
102
+ +ctb-gradient-vertical(#62c462, #57a957)
98
103
 
99
- .progress-success.progress-striped .bar
100
- +bootstrap-gradient-striped(#62c462)
104
+ .progress-success.progress-striped .bar, .progress-striped .bar-success
105
+ +ctb-gradient-striped(#62c462)
101
106
 
102
107
  // Info (teal)
103
- .progress-info .bar
104
- +bootstrap-gradient-vertical(#5bc0de, #339bb9)
108
+ .progress-info .bar, .progress .bar-info
109
+ +ctb-gradient-vertical(#5bc0de, #339bb9)
105
110
 
106
- .progress-info.progress-striped .bar
107
- +bootstrap-gradient-striped(#5bc0de)
111
+ .progress-info.progress-striped .bar, .progress-striped .bar-info
112
+ +ctb-gradient-striped(#5bc0de)
108
113
 
109
114
  // Warning (orange)
110
- .progress-warning .bar
111
- +bootstrap-gradient-vertical(lighten($orange, 15%), $orange)
115
+ .progress-warning .bar, .progress .bar-warning
116
+ +ctb-gradient-vertical(lighten($orange, 15%), $orange)
112
117
 
113
- .progress-warning.progress-striped .bar
114
- +bootstrap-gradient-striped(lighten($orange, 15%))
118
+ .progress-warning.progress-striped .bar, .progress-striped .bar-warning
119
+ +ctb-gradient-striped(lighten($orange, 15%))
@@ -1,6 +1,7 @@
1
- // Reset.less
2
- // Adapted from Normalize.css http://github.com/necolas/normalize.css
3
- // ------------------------------------------------------------------------
1
+ //
2
+ // Reset CSS
3
+ // Adapted from http://github.com/necolas/normalize.css
4
+ // --------------------------------------------------
4
5
 
5
6
  // Display in IE6-9 and FF3
6
7
  // -------------------------
@@ -43,7 +44,7 @@ html
43
44
 
44
45
  // Focus states
45
46
  a:focus
46
- +bootstrap-tab-focus
47
+ +ctb-tab-focus
47
48
 
48
49
  // Hover & Active
49
50
 
@@ -71,12 +72,23 @@ sub
71
72
  // -------------------------
72
73
 
73
74
  img
75
+ /* Responsive images (ensure images don't scale beyond their parents)
74
76
  max-width: 100%
75
- // Make images inherently responsive
77
+ /* Part 1: Set a maxium relative to the parent
78
+ width: auto\9
79
+ /* IE7-8 need help adjusting responsive images
80
+ height: auto
81
+ /* Part 2: Scale the height according to the width, otherwise you get stretching
76
82
  vertical-align: middle
77
83
  border: 0
78
84
  -ms-interpolation-mode: bicubic
79
85
 
86
+ // Prevent max-width from affecting Google Maps
87
+
88
+ #map_canvas img,
89
+ .google-maps img
90
+ max-width: none
91
+
80
92
  // Forms
81
93
  // -------------------------
82
94
 
@@ -104,19 +116,28 @@ input::-moz-focus-inner
104
116
  border: 0
105
117
 
106
118
  button,
107
- input[type="button"],
119
+ html input[type="button"],
108
120
  input[type="reset"],
109
121
  input[type="submit"]
110
- cursor: pointer
111
- // Cursors on all buttons applied consistently
112
122
  -webkit-appearance: button
113
- // Style clickable inputs in iOS
123
+ // Corrects inability to style clickable `input` types in iOS.
124
+ cursor: pointer
125
+ // Improves usability and consistency of cursor style between image-type `input` and others.
126
+
127
+ label,
128
+ select,
129
+ button,
130
+ input[type="button"],
131
+ input[type="reset"],
132
+ input[type="submit"],
133
+ input[type="radio"],
134
+ input[type="checkbox"]
135
+ cursor: pointer
136
+ // Improves usability and consistency of cursor style between image-type `input` and others.
114
137
 
115
138
  input[type="search"]
116
139
  // Appearance in Safari/Chrome
117
- -webkit-box-sizing: content-box
118
- -moz-box-sizing: content-box
119
- box-sizing: content-box
140
+ +ctb-box-sizing(content-box)
120
141
  -webkit-appearance: textfield
121
142
 
122
143
  input[type="search"]::-webkit-search-decoration,
@@ -129,3 +150,50 @@ textarea
129
150
  // Remove vertical scrollbar in IE6-9
130
151
  vertical-align: top
131
152
  // Readability and alignment cross-browser
153
+
154
+ // Printing
155
+ // -------------------------
156
+ // Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
157
+
158
+ @media print
159
+ *
160
+ text-shadow: none !important
161
+ color: #000 !important
162
+ // Black prints faster: h5bp.com/s
163
+ background: transparent !important
164
+ box-shadow: none !important
165
+ a,
166
+ a:visited
167
+ text-decoration: underline
168
+ a[href]:after
169
+ content: " (" attr(href) ")"
170
+ abbr[title]:after
171
+ content: " (" attr(title) ")"
172
+ // Don't show links for images, or javascript/internal links
173
+ .ir a:after,
174
+ a[href^="javascript:"]:after,
175
+ a[href^="#"]:after
176
+ content: ""
177
+ pre,
178
+ blockquote
179
+ border: 1px solid #999
180
+ page-break-inside: avoid
181
+ thead
182
+ display: table-header-group
183
+ // h5bp.com/t
184
+ tr,
185
+ img
186
+ page-break-inside: avoid
187
+ img
188
+ max-width: 100% !important
189
+ @page
190
+ margin: 0.5cm
191
+
192
+ p,
193
+ h2,
194
+ h3
195
+ orphans: 3
196
+ widows: 3
197
+ h2,
198
+ h3
199
+ page-break-after: avoid
@@ -1,17 +1,18 @@
1
- // LARGE DESKTOP & UP
2
- // ------------------
1
+ //
2
+ // Responsive: Large desktop and up
3
+ // --------------------------------------------------
3
4
 
4
5
  @media (min-width: 1200px)
5
6
  // Fixed grid
6
- +bootstrap-grid-core(70px, 30px)
7
+ +ctb-grid-core($gridColumnWidth1200, $gridGutterWidth1200)
7
8
  // Fluid grid
8
- +bootstrap-grid-fluid(5.983%, 2.564%)
9
+ +ctb-grid-fluid($fluidGridColumnWidth1200, $fluidGridGutterWidth1200)
9
10
  // Input grid
10
- +bootstrap-grid-input(70px, 30px)
11
+ +ctb-grid-input($gridColumnWidth1200, $gridGutterWidth1200)
11
12
  // Thumbnails
12
13
  .thumbnails
13
- margin-left: -30px
14
+ margin-left: -$gridGutterWidth1200
14
15
  .thumbnails > li
15
- margin-left: 30px
16
+ margin-left: $gridGutterWidth1200
16
17
  .row-fluid .thumbnails
17
18
  margin-left: 0
@@ -1,54 +1,5 @@
1
- // UP TO LANDSCAPE PHONE
2
- // ---------------------
3
-
4
- @media (max-width: 480px)
5
- // Smooth out the collapsing/expanding nav
6
- .nav-collapse
7
- -webkit-transform: translate3d(0, 0, 0)
8
- // activate the GPU
9
- // Block level the page header small tag for readability
10
- .page-header h1 small
11
- display: block
12
- line-height: $baseLineHeight
13
- // Update checkboxes for iOS
14
- input[type="checkbox"],
15
- input[type="radio"]
16
- border: 1px solid #ccc
17
- // Remove the horizontal form styles
18
- .form-horizontal .control-group > label
19
- float: none
20
- width: auto
21
- padding-top: 0
22
- text-align: left
23
- // Move over all input controls and content
24
- .form-horizontal .controls
25
- margin-left: 0
26
- // Move the options list down to align with labels
27
- .form-horizontal .control-list
28
- padding-top: 0
29
- // has to be padding because margin collaspes
30
- // Move over buttons in .form-actions to align with .controls
31
- .form-horizontal .form-actions
32
- padding-left: 10px
33
- padding-right: 10px
34
- // Modals
35
- .modal
36
- position: absolute
37
- top: 10px
38
- left: 10px
39
- right: 10px
40
- width: auto
41
- margin: 0
42
- &.fade.in
43
- top: auto
44
- .modal-header .close
45
- padding: 10px
46
- margin: -10px
47
- // Carousel
48
- .carousel-caption
49
- position: static
50
-
51
- // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
1
+ //
2
+ // Responsive: Landscape phone to desktop/tablet
52
3
  // --------------------------------------------------
53
4
 
54
5
  @media (max-width: 767px)
@@ -58,7 +9,8 @@
58
9
  padding-right: 20px
59
10
  // Negative indent the now static "fixed" navbar
60
11
  .navbar-fixed-top,
61
- .navbar-fixed-bottom
12
+ .navbar-fixed-bottom,
13
+ .navbar-static-top
62
14
  margin-left: -20px
63
15
  margin-right: -20px
64
16
  // Remove padding on container given explicit padding set on body
@@ -87,12 +39,24 @@
87
39
  .row,
88
40
  .thumbnails
89
41
  margin-left: 0
42
+ .thumbnails > li
43
+ float: none
44
+ margin-left: 0
45
+ // Reset the default margin for all li elements when no .span* classes are present
90
46
  // Make all grid-sized elements block level again
91
47
  [class*="span"],
48
+ .uneditable-input[class*="span"],
92
49
  .row-fluid [class*="span"]
93
50
  float: none
94
51
  display: block
95
- width: auto
52
+ width: 100%
53
+ margin-left: 0
54
+ +ctb-box-sizing(border-box)
55
+ .span12,
56
+ .row-fluid .span12
57
+ width: 100%
58
+ +ctb-box-sizing(border-box)
59
+ .row-fluid [class*="offset"]:first-child
96
60
  margin-left: 0
97
61
  // FORM FIELDS
98
62
  // -----------
@@ -104,7 +68,7 @@
104
68
  select[class*="span"],
105
69
  textarea[class*="span"],
106
70
  .uneditable-input
107
- +bootstrap-input-block-level
71
+ +ctb-input-block-level
108
72
  // But don't let it screw up prepend/append inputs
109
73
  .input-prepend input,
110
74
  .input-append input,
@@ -113,3 +77,74 @@
113
77
  display: inline-block
114
78
  // redeclare so they don't wrap to new lines
115
79
  width: auto
80
+ .controls-row [class*="span"] + [class*="span"]
81
+ margin-left: 0
82
+ // Modals
83
+ .modal
84
+ position: fixed
85
+ top: 20px
86
+ left: 20px
87
+ right: 20px
88
+ width: auto
89
+ margin: 0
90
+ &.fade
91
+ top: -100px
92
+ &.fade.in
93
+ top: 20px
94
+
95
+ // UP TO LANDSCAPE PHONE
96
+ // ---------------------
97
+
98
+ @media (max-width: 480px)
99
+ // Smooth out the collapsing/expanding nav
100
+ .nav-collapse
101
+ -webkit-transform: translate3d(0, 0, 0)
102
+ // activate the GPU
103
+ // Block level the page header small tag for readability
104
+ .page-header h1 small
105
+ display: block
106
+ line-height: $baseLineHeight
107
+ // Update checkboxes for iOS
108
+ input[type="checkbox"],
109
+ input[type="radio"]
110
+ border: 1px solid #ccc
111
+ // Remove the horizontal form styles
112
+ .form-horizontal
113
+ .control-label
114
+ float: none
115
+ width: auto
116
+ padding-top: 0
117
+ text-align: left
118
+ // Move over all input controls and content
119
+ .controls
120
+ margin-left: 0
121
+ // Move the options list down to align with labels
122
+ .control-list
123
+ padding-top: 0
124
+ // has to be padding because margin collaspes
125
+ // Move over buttons in .form-actions to align with .controls
126
+ .form-actions
127
+ padding-left: 10px
128
+ padding-right: 10px
129
+ // Medias
130
+ // Reset float and spacing to stack
131
+ .media .pull-left,
132
+ .media .pull-right
133
+ float: none
134
+ display: block
135
+ margin-bottom: 10px
136
+ // Remove side margins since we stack instead of indent
137
+ .media-object
138
+ margin-right: 0
139
+ margin-left: 0
140
+ // Modals
141
+ .modal
142
+ top: 10px
143
+ left: 10px
144
+ right: 10px
145
+ .modal-header .close
146
+ padding: 10px
147
+ margin: -10px
148
+ // Carousel
149
+ .carousel-caption
150
+ position: static
@@ -1,11 +1,12 @@
1
- // PORTRAIT TABLET TO DEFAULT DESKTOP
2
- // ----------------------------------
1
+ //
2
+ // Responsive: Tablet to desktop
3
+ // --------------------------------------------------
3
4
 
4
5
  @media (min-width: 768px) and (max-width: 979px)
5
6
  // Fixed grid
6
- +bootstrap-grid-core(42px, 20px)
7
+ +ctb-grid-core($gridColumnWidth768, $gridGutterWidth768)
7
8
  // Fluid grid
8
- +bootstrap-grid-fluid(5.801%, 2.762%)
9
+ +ctb-grid-fluid($fluidGridColumnWidth768, $fluidGridGutterWidth768)
9
10
  // Input grid
10
- +bootstrap-grid-input(42px, 20px)
11
- // No need to reset .thumbnails here since it's the same @gridGutterWidth
11
+ +ctb-grid-input($gridColumnWidth768, $gridGutterWidth768)
12
+ // No need to reset .thumbnails here since it's the same $gridGutterWidth