bootstrap-generators 3.0.0.1 → 3.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (96) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +8 -8
  3. data/Rakefile +3 -7
  4. data/lib/bootstrap/generators/version.rb +1 -1
  5. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +57 -40
  6. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss +57 -40
  7. data/lib/generators/bootstrap/install/templates/layouts/starter.html.erb +1 -1
  8. data/lib/generators/bootstrap/install/templates/layouts/starter.html.haml +1 -1
  9. data/readme-template.md.erb +1 -1
  10. data/vendor/assets/fonts/glyphicons-halflings-regular.eot +0 -0
  11. data/vendor/assets/fonts/glyphicons-halflings-regular.svg +200 -199
  12. data/vendor/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
  13. data/vendor/assets/fonts/glyphicons-halflings-regular.woff +0 -0
  14. data/vendor/assets/javascripts/bootstrap.js +5 -5
  15. data/vendor/assets/javascripts/bootstrap/affix.js +4 -4
  16. data/vendor/assets/javascripts/bootstrap/alert.js +3 -3
  17. data/vendor/assets/javascripts/bootstrap/button.js +3 -3
  18. data/vendor/assets/javascripts/bootstrap/carousel.js +4 -4
  19. data/vendor/assets/javascripts/bootstrap/collapse.js +4 -4
  20. data/vendor/assets/javascripts/bootstrap/dropdown.js +4 -4
  21. data/vendor/assets/javascripts/bootstrap/modal.js +4 -4
  22. data/vendor/assets/javascripts/bootstrap/popover.js +4 -4
  23. data/vendor/assets/javascripts/bootstrap/scrollspy.js +4 -4
  24. data/vendor/assets/javascripts/bootstrap/tab.js +5 -5
  25. data/vendor/assets/javascripts/bootstrap/tooltip.js +4 -4
  26. data/vendor/assets/javascripts/bootstrap/transition.js +3 -3
  27. data/vendor/assets/stylesheets/bootstrap.css +1039 -746
  28. data/vendor/twitter/bootstrap/less/alerts.less +1 -1
  29. data/vendor/twitter/bootstrap/less/bootstrap.less +0 -10
  30. data/vendor/twitter/bootstrap/less/breadcrumbs.less +2 -2
  31. data/vendor/twitter/bootstrap/less/button-groups.less +6 -1
  32. data/vendor/twitter/bootstrap/less/buttons.less +2 -4
  33. data/vendor/twitter/bootstrap/less/carousel.less +32 -10
  34. data/vendor/twitter/bootstrap/less/code.less +5 -8
  35. data/vendor/twitter/bootstrap/less/dropdowns.less +1 -2
  36. data/vendor/twitter/bootstrap/less/forms.less +21 -10
  37. data/vendor/twitter/bootstrap/less/glyphicons.less +20 -15
  38. data/vendor/twitter/bootstrap/less/grid.less +32 -285
  39. data/vendor/twitter/bootstrap/less/input-groups.less +9 -0
  40. data/vendor/twitter/bootstrap/less/jumbotron.less +2 -2
  41. data/vendor/twitter/bootstrap/less/list-group.less +12 -12
  42. data/vendor/twitter/bootstrap/less/mixins.less +164 -29
  43. data/vendor/twitter/bootstrap/less/modals.less +2 -11
  44. data/vendor/twitter/bootstrap/less/navbar.less +10 -7
  45. data/vendor/twitter/bootstrap/less/navs.less +53 -20
  46. data/vendor/twitter/bootstrap/less/normalize.less +16 -6
  47. data/vendor/twitter/bootstrap/less/pagination.less +2 -0
  48. data/vendor/twitter/bootstrap/less/panels.less +31 -7
  49. data/vendor/twitter/bootstrap/less/print.less +6 -1
  50. data/vendor/twitter/bootstrap/less/progress-bars.less +4 -7
  51. data/vendor/twitter/bootstrap/less/responsive-utilities.less +57 -68
  52. data/vendor/twitter/bootstrap/less/scaffolding.less +1 -12
  53. data/vendor/twitter/bootstrap/less/tables.less +40 -40
  54. data/vendor/twitter/bootstrap/less/theme.less +32 -17
  55. data/vendor/twitter/bootstrap/less/thumbnails.less +14 -15
  56. data/vendor/twitter/bootstrap/less/tooltip.less +8 -8
  57. data/vendor/twitter/bootstrap/less/type.less +71 -30
  58. data/vendor/twitter/bootstrap/less/utilities.less +15 -1
  59. data/vendor/twitter/bootstrap/less/variables.less +56 -39
  60. data/vendor/twitter/bootstrap/sass/_alerts.scss +1 -1
  61. data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +2 -2
  62. data/vendor/twitter/bootstrap/sass/_button-groups.scss +6 -1
  63. data/vendor/twitter/bootstrap/sass/_buttons.scss +2 -4
  64. data/vendor/twitter/bootstrap/sass/_carousel.scss +32 -10
  65. data/vendor/twitter/bootstrap/sass/_close.scss +2 -0
  66. data/vendor/twitter/bootstrap/sass/_code.scss +5 -8
  67. data/vendor/twitter/bootstrap/sass/_dropdowns.scss +1 -2
  68. data/vendor/twitter/bootstrap/sass/_forms.scss +23 -10
  69. data/vendor/twitter/bootstrap/sass/_glyphicons.scss +20 -15
  70. data/vendor/twitter/bootstrap/sass/_grid.scss +32 -285
  71. data/vendor/twitter/bootstrap/sass/_input-groups.scss +9 -0
  72. data/vendor/twitter/bootstrap/sass/_jumbotron.scss +2 -2
  73. data/vendor/twitter/bootstrap/sass/_list-group.scss +16 -16
  74. data/vendor/twitter/bootstrap/sass/_mixins.scss +167 -34
  75. data/vendor/twitter/bootstrap/sass/_modals.scss +2 -15
  76. data/vendor/twitter/bootstrap/sass/_navbar.scss +10 -7
  77. data/vendor/twitter/bootstrap/sass/_navs.scss +53 -20
  78. data/vendor/twitter/bootstrap/sass/_normalize.scss +16 -6
  79. data/vendor/twitter/bootstrap/sass/_pagination.scss +2 -0
  80. data/vendor/twitter/bootstrap/sass/_panels.scss +31 -7
  81. data/vendor/twitter/bootstrap/sass/_print.scss +6 -1
  82. data/vendor/twitter/bootstrap/sass/_progress-bars.scss +4 -7
  83. data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +37 -48
  84. data/vendor/twitter/bootstrap/sass/_scaffolding.scss +1 -12
  85. data/vendor/twitter/bootstrap/sass/_tables.scss +52 -44
  86. data/vendor/twitter/bootstrap/sass/_theme.scss +26 -11
  87. data/vendor/twitter/bootstrap/sass/_thumbnails.scss +13 -12
  88. data/vendor/twitter/bootstrap/sass/_tooltip.scss +8 -8
  89. data/vendor/twitter/bootstrap/sass/_type.scss +71 -30
  90. data/vendor/twitter/bootstrap/sass/_utilities.scss +15 -1
  91. data/vendor/twitter/bootstrap/sass/_variables.scss +56 -39
  92. data/vendor/twitter/bootstrap/sass/bootstrap.scss +0 -10
  93. metadata +2 -5
  94. data/vendor/assets/javascripts/bootstrap-ie.js +0 -2
  95. data/vendor/assets/javascripts/bootstrap-ie/html5shiv.js +0 -8
  96. data/vendor/assets/javascripts/bootstrap-ie/respond.min.js +0 -6
@@ -9,6 +9,9 @@
9
9
  .clearfix {
10
10
  .clearfix();
11
11
  }
12
+ .center-block {
13
+ .center-block();
14
+ }
12
15
  .pull-right {
13
16
  float: right !important;
14
17
  }
@@ -20,6 +23,7 @@
20
23
  // Toggling content
21
24
  // -------------------------
22
25
 
26
+ // Note: Deprecated .hide in favor of .hidden or .sr-only (as appropriate) in v3.0.1
23
27
  .hide {
24
28
  display: none !important;
25
29
  }
@@ -30,7 +34,17 @@
30
34
  visibility: hidden;
31
35
  }
32
36
  .text-hide {
33
- .hide-text();
37
+ .text-hide();
38
+ }
39
+
40
+
41
+ // Hide from screenreaders and browsers
42
+ //
43
+ // Credit: HTML5 Boilerplate
44
+
45
+ .hidden {
46
+ display: none !important;
47
+ visibility: hidden !important;
34
48
  }
35
49
 
36
50
 
@@ -48,12 +48,21 @@
48
48
  @font-size-large: ceil(@font-size-base * 1.25); // ~18px
49
49
  @font-size-small: ceil(@font-size-base * 0.85); // ~12px
50
50
 
51
+ @font-size-h1: floor(@font-size-base * 2.6); // ~36px
52
+ @font-size-h2: floor(@font-size-base * 2.15); // ~30px
53
+ @font-size-h3: ceil(@font-size-base * 1.7); // ~24px
54
+ @font-size-h4: ceil(@font-size-base * 1.25); // ~18px
55
+ @font-size-h5: @font-size-base;
56
+ @font-size-h6: ceil(@font-size-base * 0.85); // ~12px
57
+
51
58
  @line-height-base: 1.428571429; // 20/14
52
59
  @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px
53
60
 
54
61
  @headings-font-family: @font-family-base;
55
62
  @headings-font-weight: 500;
56
63
  @headings-line-height: 1.1;
64
+ @headings-color: inherit;
65
+
57
66
 
58
67
  // Iconography
59
68
  // -------------------------
@@ -82,6 +91,7 @@
82
91
  @border-radius-large: 6px;
83
92
  @border-radius-small: 3px;
84
93
 
94
+ @component-active-color: #fff;
85
95
  @component-active-bg: @brand-primary;
86
96
 
87
97
  @caret-width-base: 4px;
@@ -165,12 +175,12 @@
165
175
  @dropdown-fallback-border: #ccc;
166
176
  @dropdown-divider-bg: #e5e5e5;
167
177
 
168
- @dropdown-link-active-color: #fff;
169
- @dropdown-link-active-bg: @component-active-bg;
170
-
171
178
  @dropdown-link-color: @gray-dark;
172
- @dropdown-link-hover-color: #fff;
173
- @dropdown-link-hover-bg: @dropdown-link-active-bg;
179
+ @dropdown-link-hover-color: darken(@gray-dark, 5%);
180
+ @dropdown-link-hover-bg: #f5f5f5;
181
+
182
+ @dropdown-link-active-color: @component-active-color;
183
+ @dropdown-link-active-bg: @component-active-bg;
174
184
 
175
185
  @dropdown-link-disabled-color: @gray-light;
176
186
 
@@ -200,25 +210,33 @@
200
210
  // --------------------------------------------------
201
211
 
202
212
  // Extra small screen / phone
213
+ // Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
203
214
  @screen-xs: 480px;
204
- @screen-phone: @screen-xs;
215
+ @screen-xs-min: @screen-xs;
216
+ @screen-phone: @screen-xs-min;
205
217
 
206
218
  // Small screen / tablet
219
+ // Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1
207
220
  @screen-sm: 768px;
208
- @screen-tablet: @screen-sm;
221
+ @screen-sm-min: @screen-sm;
222
+ @screen-tablet: @screen-sm-min;
209
223
 
210
224
  // Medium screen / desktop
225
+ // Note: Deprecated @screen-md and @screen-desktop as of v3.0.1
211
226
  @screen-md: 992px;
212
- @screen-desktop: @screen-md;
227
+ @screen-md-min: @screen-md;
228
+ @screen-desktop: @screen-md-min;
213
229
 
214
230
  // Large screen / wide desktop
231
+ // Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1
215
232
  @screen-lg: 1200px;
216
- @screen-lg-desktop: @screen-lg;
233
+ @screen-lg-min: @screen-lg;
234
+ @screen-lg-desktop: @screen-lg-min;
217
235
 
218
236
  // So media queries don't overlap when required, provide a maximum
219
- @screen-xs-max: (@screen-sm - 1);
220
- @screen-sm-max: (@screen-md - 1);
221
- @screen-md-max: (@screen-lg - 1);
237
+ @screen-xs-max: (@screen-sm-min - 1);
238
+ @screen-sm-max: (@screen-md-min - 1);
239
+ @screen-md-max: (@screen-lg-min - 1);
222
240
 
223
241
 
224
242
  // Grid system
@@ -229,7 +247,7 @@
229
247
  // Padding, to be divided by two and applied to the left and right of all columns
230
248
  @grid-gutter-width: 30px;
231
249
  // Point at which the navbar stops collapsing
232
- @grid-float-breakpoint: @screen-tablet;
250
+ @grid-float-breakpoint: @screen-sm-min;
233
251
 
234
252
 
235
253
  // Navbar
@@ -238,13 +256,14 @@
238
256
  // Basics of a navbar
239
257
  @navbar-height: 50px;
240
258
  @navbar-margin-bottom: @line-height-computed;
241
- @navbar-default-color: #777;
242
- @navbar-default-bg: #f8f8f8;
243
- @navbar-default-border: darken(@navbar-default-bg, 6.5%);
244
259
  @navbar-border-radius: @border-radius-base;
245
260
  @navbar-padding-horizontal: floor(@grid-gutter-width / 2);
246
261
  @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
247
262
 
263
+ @navbar-default-color: #777;
264
+ @navbar-default-bg: #f8f8f8;
265
+ @navbar-default-border: darken(@navbar-default-bg, 6.5%);
266
+
248
267
  // Navbar links
249
268
  @navbar-default-link-color: #777;
250
269
  @navbar-default-link-hover-color: #333;
@@ -256,7 +275,7 @@
256
275
 
257
276
  // Navbar brand label
258
277
  @navbar-default-brand-color: @navbar-default-link-color;
259
- @navbar-default-brand-hover-color: darken(@navbar-default-link-color, 10%);
278
+ @navbar-default-brand-hover-color: darken(@navbar-default-brand-color, 10%);
260
279
  @navbar-default-brand-hover-bg: transparent;
261
280
 
262
281
  // Navbar toggle
@@ -286,13 +305,6 @@
286
305
  @navbar-inverse-brand-hover-color: #fff;
287
306
  @navbar-inverse-brand-hover-bg: transparent;
288
307
 
289
- // Inverted navbar search
290
- // Normal navbar needs no special styles or vars
291
- @navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%);
292
- @navbar-inverse-search-bg-focus: #fff;
293
- @navbar-inverse-search-border: @navbar-inverse-bg;
294
- @navbar-inverse-search-placeholder-color: #ccc;
295
-
296
308
  // Inverted navbar toggle
297
309
  @navbar-inverse-toggle-hover-bg: #333;
298
310
  @navbar-inverse-toggle-icon-bar-bg: #fff;
@@ -324,8 +336,9 @@
324
336
  @nav-tabs-justified-active-link-border-color: @body-bg;
325
337
 
326
338
  // Pills
339
+ @nav-pills-border-radius: @border-radius-base;
327
340
  @nav-pills-active-link-hover-bg: @component-active-bg;
328
- @nav-pills-active-link-hover-color: #fff;
341
+ @nav-pills-active-link-hover-color: @component-active-color;
329
342
 
330
343
 
331
344
  // Pagination
@@ -355,21 +368,13 @@
355
368
  @jumbotron-padding: 30px;
356
369
  @jumbotron-color: inherit;
357
370
  @jumbotron-bg: @gray-lighter;
358
-
359
371
  @jumbotron-heading-color: inherit;
372
+ @jumbotron-font-size: ceil(@font-size-base * 1.5);
360
373
 
361
374
 
362
375
  // Form states and alerts
363
376
  // -------------------------
364
377
 
365
- @state-warning-text: #c09853;
366
- @state-warning-bg: #fcf8e3;
367
- @state-warning-border: darken(spin(@state-warning-bg, -10), 3%);
368
-
369
- @state-danger-text: #b94a48;
370
- @state-danger-bg: #f2dede;
371
- @state-danger-border: darken(spin(@state-danger-bg, -10), 3%);
372
-
373
378
  @state-success-text: #468847;
374
379
  @state-success-bg: #dff0d8;
375
380
  @state-success-border: darken(spin(@state-success-bg, -10), 5%);
@@ -378,6 +383,14 @@
378
383
  @state-info-bg: #d9edf7;
379
384
  @state-info-border: darken(spin(@state-info-bg, -10), 7%);
380
385
 
386
+ @state-warning-text: #c09853;
387
+ @state-warning-bg: #fcf8e3;
388
+ @state-warning-border: darken(spin(@state-warning-bg, -10), 5%);
389
+
390
+ @state-danger-text: #b94a48;
391
+ @state-danger-bg: #f2dede;
392
+ @state-danger-border: darken(spin(@state-danger-bg, -10), 5%);
393
+
381
394
 
382
395
  // Tooltips
383
396
  // -------------------------
@@ -478,7 +491,7 @@
478
491
  @list-group-border-radius: @border-radius-base;
479
492
 
480
493
  @list-group-hover-bg: #f5f5f5;
481
- @list-group-active-color: #fff;
494
+ @list-group-active-color: @component-active-color;
482
495
  @list-group-active-bg: @component-active-bg;
483
496
  @list-group-active-border: @list-group-active-bg;
484
497
 
@@ -553,6 +566,7 @@
553
566
  @breadcrumb-bg: #f5f5f5;
554
567
  @breadcrumb-color: #ccc;
555
568
  @breadcrumb-active-color: @gray-light;
569
+ @breadcrumb-separator: "/";
556
570
 
557
571
 
558
572
  // Carousel
@@ -573,8 +587,8 @@
573
587
 
574
588
  // Close
575
589
  // ------------------------
576
- @close-color: #000;
577
590
  @close-font-weight: bold;
591
+ @close-color: #000;
578
592
  @close-text-shadow: 0 1px 0 #fff;
579
593
 
580
594
 
@@ -611,10 +625,13 @@
611
625
  // --------------------------------------------------
612
626
 
613
627
  // Small screen / tablet
614
- @container-tablet: ((720px + @grid-gutter-width));
628
+ @container-tablet: ((720px + @grid-gutter-width));
629
+ @container-sm: @container-tablet;
615
630
 
616
631
  // Medium screen / desktop
617
- @container-desktop: ((940px + @grid-gutter-width));
632
+ @container-desktop: ((940px + @grid-gutter-width));
633
+ @container-md: @container-desktop;
618
634
 
619
635
  // Large screen / wide desktop
620
- @container-lg-desktop: ((1140px + @grid-gutter-width));
636
+ @container-large-desktop: ((1140px + @grid-gutter-width));
637
+ @container-lg: @container-large-desktop;
@@ -15,7 +15,7 @@
15
15
  // Headings for larger alerts
16
16
  h4 {
17
17
  margin-top: 0;
18
- // Specified for the h4 to prevent conflicts of changing $headingsColor
18
+ // Specified for the h4 to prevent conflicts of changing $headings-color
19
19
  color: inherit;
20
20
  }
21
21
  // Provide class for links that match alerts
@@ -11,8 +11,8 @@
11
11
  border-radius: $border-radius-base;
12
12
  > li {
13
13
  display: inline-block;
14
- &+li:before {
15
- content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space
14
+ + li:before {
15
+ content: "#{$breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
16
16
  padding: 0 5px;
17
17
  color: $breadcrumb-color;
18
18
  }
@@ -19,7 +19,7 @@
19
19
  }
20
20
  }
21
21
  .dropup {
22
- & .btn-default .caret {
22
+ .btn-default .caret {
23
23
  border-bottom-color: $btn-default-color;
24
24
  }
25
25
  .btn-primary,
@@ -150,6 +150,11 @@
150
150
  // Remove the gradient and set the same inset shadow as the :active state
151
151
  .btn-group.open .dropdown-toggle {
152
152
  @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
153
+
154
+ // Show no shadow for `.btn-link` since it has no other button styles.
155
+ &.btn-link {
156
+ @include box-shadow(none);
157
+ }
153
158
  }
154
159
 
155
160
 
@@ -9,17 +9,15 @@
9
9
  // Core styles
10
10
  .btn {
11
11
  display: inline-block;
12
- padding: $padding-base-vertical $padding-base-horizontal;
13
12
  margin-bottom: 0; // For input.btn
14
- font-size: $font-size-base;
15
13
  font-weight: $btn-font-weight;
16
- line-height: $line-height-base;
17
14
  text-align: center;
18
15
  vertical-align: middle;
19
16
  cursor: pointer;
17
+ background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
20
18
  border: 1px solid transparent;
21
- border-radius: $border-radius-base;
22
19
  white-space: nowrap;
20
+ @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
23
21
  @include user-select(none);
24
22
 
25
23
  &:focus {
@@ -75,7 +75,7 @@
75
75
  color: $carousel-control-color;
76
76
  text-align: center;
77
77
  text-shadow: $carousel-text-shadow;
78
- // We can't have this transition here because webkit cancels the carousel
78
+ // We can't have this transition here because WebKit cancels the carousel
79
79
  // animation if you trip this while in the middle of another animation.
80
80
 
81
81
  // Set gradients for backgrounds
@@ -103,11 +103,18 @@
103
103
  .glyphicon-chevron-right {
104
104
  position: absolute;
105
105
  top: 50%;
106
- left: 50%;
107
106
  z-index: 5;
108
107
  display: inline-block;
109
108
  }
110
109
  .icon-prev,
110
+ .glyphicon-chevron-left {
111
+ left: 50%;
112
+ }
113
+ .icon-next,
114
+ .glyphicon-chevron-right {
115
+ right: 50%;
116
+ }
117
+ .icon-prev,
111
118
  .icon-next {
112
119
  width: 20px;
113
120
  height: 20px;
@@ -153,6 +160,17 @@
153
160
  border: 1px solid $carousel-indicator-border-color;
154
161
  border-radius: 10px;
155
162
  cursor: pointer;
163
+
164
+ // IE8-9 hack for event handling
165
+ //
166
+ // Internet Explorer 8-9 does not support clicks on elements without a set
167
+ // `background-color`. We cannot use `filter` since that's not viewed as a
168
+ // background color by the browser. Thus, a hack is needed.
169
+ //
170
+ // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
171
+ // set alpha transparency for the best results possible.
172
+ background-color: #000 \9; // IE8
173
+ background-color: rgba(0,0,0,0); // IE9
156
174
  }
157
175
  .active {
158
176
  margin: 0;
@@ -183,16 +201,20 @@
183
201
 
184
202
 
185
203
  // Scale up controls for tablets and up
186
- @media screen and (min-width: $screen-tablet) {
204
+ @media screen and (min-width: $screen-sm-min) {
187
205
 
188
206
  // Scale up the controls a smidge
189
- .carousel-control .icon-prev,
190
- .carousel-control .icon-next {
191
- width: 30px;
192
- height: 30px;
193
- margin-top: -15px;
194
- margin-left: -15px;
195
- font-size: 30px;
207
+ .carousel-control {
208
+ .glyphicons-chevron-left,
209
+ .glyphicons-chevron-right,
210
+ .icon-prev,
211
+ .icon-next {
212
+ width: 30px;
213
+ height: 30px;
214
+ margin-top: -15px;
215
+ margin-left: -15px;
216
+ font-size: 30px;
217
+ }
196
218
  }
197
219
 
198
220
  // Show and left align the captions
@@ -19,6 +19,8 @@
19
19
  cursor: pointer;
20
20
  @include opacity(.5);
21
21
  }
22
+
23
+ // [converter] extracted button& to button.close
22
24
  }
23
25
 
24
26
  // Additional properties for button version
@@ -1,11 +1,13 @@
1
1
  //
2
- // Code (inline and blocK)
2
+ // Code (inline and block)
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
6
  // Inline and block code styles
7
7
  code,
8
- pre {
8
+ kbd,
9
+ pre,
10
+ samp {
9
11
  font-family: $font-family-monospace;
10
12
  }
11
13
 
@@ -33,11 +35,6 @@ pre {
33
35
  border: 1px solid $pre-border-color;
34
36
  border-radius: $border-radius-base;
35
37
 
36
- // Make prettyprint styles more spaced out for readability
37
- &.prettyprint {
38
- margin-bottom: $line-height-computed;
39
- }
40
-
41
38
  // Account for some code outputs that place code tags in pre tags
42
39
  code {
43
40
  padding: 0;
@@ -45,7 +42,7 @@ pre {
45
42
  color: inherit;
46
43
  white-space: pre-wrap;
47
44
  background-color: transparent;
48
- border: 0;
45
+ border-radius: 0;
49
46
  }
50
47
  }
51
48