bootstrap-generators 2.1.1 → 2.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (84) hide show
  1. data/README.md +48 -3
  2. data/lib/bootstrap/generators/version.rb +1 -1
  3. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss +25 -2
  4. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +23 -1
  5. data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css.scss +1 -1
  6. data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.scss +1 -1
  7. data/vendor/assets/javascripts/bootstrap-affix.js +4 -2
  8. data/vendor/assets/javascripts/bootstrap-alert.js +2 -4
  9. data/vendor/assets/javascripts/bootstrap-button.js +5 -7
  10. data/vendor/assets/javascripts/bootstrap-carousel.js +12 -12
  11. data/vendor/assets/javascripts/bootstrap-collapse.js +9 -11
  12. data/vendor/assets/javascripts/bootstrap-dropdown.js +9 -11
  13. data/vendor/assets/javascripts/bootstrap-modal.js +20 -25
  14. data/vendor/assets/javascripts/bootstrap-popover.js +1 -1
  15. data/vendor/assets/javascripts/bootstrap-scrollspy.js +1 -1
  16. data/vendor/assets/javascripts/bootstrap-tab.js +5 -7
  17. data/vendor/assets/javascripts/bootstrap-tooltip.js +12 -11
  18. data/vendor/assets/javascripts/bootstrap-transition.js +5 -5
  19. data/vendor/assets/javascripts/bootstrap-typeahead.js +19 -9
  20. data/vendor/twitter/bootstrap/less/accordion.less +1 -1
  21. data/vendor/twitter/bootstrap/less/alerts.less +1 -1
  22. data/vendor/twitter/bootstrap/less/bootstrap.less +2 -1
  23. data/vendor/twitter/bootstrap/less/breadcrumbs.less +1 -1
  24. data/vendor/twitter/bootstrap/less/button-groups.less +5 -8
  25. data/vendor/twitter/bootstrap/less/buttons.less +17 -16
  26. data/vendor/twitter/bootstrap/less/code.less +1 -1
  27. data/vendor/twitter/bootstrap/less/dropdowns.less +32 -5
  28. data/vendor/twitter/bootstrap/less/forms.less +47 -14
  29. data/vendor/twitter/bootstrap/less/hero-unit.less +6 -5
  30. data/vendor/twitter/bootstrap/less/labels-badges.less +4 -2
  31. data/vendor/twitter/bootstrap/less/media.less +55 -0
  32. data/vendor/twitter/bootstrap/less/mixins.less +15 -10
  33. data/vendor/twitter/bootstrap/less/modals.less +7 -11
  34. data/vendor/twitter/bootstrap/less/navbar.less +6 -6
  35. data/vendor/twitter/bootstrap/less/navs.less +3 -2
  36. data/vendor/twitter/bootstrap/less/pager.less +10 -9
  37. data/vendor/twitter/bootstrap/less/pagination.less +69 -12
  38. data/vendor/twitter/bootstrap/less/popovers.less +2 -2
  39. data/vendor/twitter/bootstrap/less/progress-bars.less +2 -2
  40. data/vendor/twitter/bootstrap/less/reset.less +5 -4
  41. data/vendor/twitter/bootstrap/less/responsive-767px-max.less +20 -1
  42. data/vendor/twitter/bootstrap/less/responsive-navbar.less +12 -4
  43. data/vendor/twitter/bootstrap/less/responsive.less +1 -1
  44. data/vendor/twitter/bootstrap/less/sprites.less +3 -3
  45. data/vendor/twitter/bootstrap/less/tables.less +20 -29
  46. data/vendor/twitter/bootstrap/less/thumbnails.less +1 -1
  47. data/vendor/twitter/bootstrap/less/tooltip.less +1 -1
  48. data/vendor/twitter/bootstrap/less/type.less +30 -24
  49. data/vendor/twitter/bootstrap/less/variables.less +23 -1
  50. data/vendor/twitter/bootstrap/less/wells.less +3 -3
  51. data/vendor/twitter/bootstrap/sass/_accordion.scss +1 -1
  52. data/vendor/twitter/bootstrap/sass/_alerts.scss +1 -1
  53. data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +1 -1
  54. data/vendor/twitter/bootstrap/sass/_button-groups.scss +5 -8
  55. data/vendor/twitter/bootstrap/sass/_buttons.scss +18 -17
  56. data/vendor/twitter/bootstrap/sass/_code.scss +1 -1
  57. data/vendor/twitter/bootstrap/sass/_component-animations.scss +2 -2
  58. data/vendor/twitter/bootstrap/sass/_dropdowns.scss +32 -5
  59. data/vendor/twitter/bootstrap/sass/_forms.scss +46 -14
  60. data/vendor/twitter/bootstrap/sass/_hero-unit.scss +6 -5
  61. data/vendor/twitter/bootstrap/sass/_labels-badges.scss +4 -2
  62. data/vendor/twitter/bootstrap/sass/_media.scss +55 -0
  63. data/vendor/twitter/bootstrap/sass/_mixins.scss +12 -7
  64. data/vendor/twitter/bootstrap/sass/_modals.scss +8 -11
  65. data/vendor/twitter/bootstrap/sass/_navbar.scss +8 -10
  66. data/vendor/twitter/bootstrap/sass/_navs.scss +5 -4
  67. data/vendor/twitter/bootstrap/sass/_pager.scss +10 -9
  68. data/vendor/twitter/bootstrap/sass/_pagination.scss +69 -12
  69. data/vendor/twitter/bootstrap/sass/_popovers.scss +2 -2
  70. data/vendor/twitter/bootstrap/sass/_progress-bars.scss +2 -2
  71. data/vendor/twitter/bootstrap/sass/_reset.scss +6 -4
  72. data/vendor/twitter/bootstrap/sass/_responsive-767px-max.scss +20 -1
  73. data/vendor/twitter/bootstrap/sass/_responsive-navbar.scss +12 -4
  74. data/vendor/twitter/bootstrap/sass/_scaffolding.scss +1 -3
  75. data/vendor/twitter/bootstrap/sass/_sprites.scss +3 -3
  76. data/vendor/twitter/bootstrap/sass/_tables.scss +12 -8
  77. data/vendor/twitter/bootstrap/sass/_thumbnails.scss +1 -1
  78. data/vendor/twitter/bootstrap/sass/_tooltip.scss +1 -1
  79. data/vendor/twitter/bootstrap/sass/_type.scss +30 -24
  80. data/vendor/twitter/bootstrap/sass/_variables.scss +25 -2
  81. data/vendor/twitter/bootstrap/sass/_wells.scss +3 -3
  82. data/vendor/twitter/bootstrap/sass/bootstrap.scss +2 -1
  83. data/vendor/twitter/bootstrap/sass/responsive.scss +1 -1
  84. metadata +12 -10
@@ -30,8 +30,6 @@
30
30
 
31
31
  /* White icons with optional class, or on hover/active states of certain elements */
32
32
  .icon-white,
33
- .nav-tabs > .active > a > [class^="icon-"],
34
- .nav-tabs > .active > a > [class*=" icon-"],
35
33
  .nav-pills > .active > a > [class^="icon-"],
36
34
  .nav-pills > .active > a > [class*=" icon-"],
37
35
  .nav-list > .active > a > [class^="icon-"],
@@ -41,7 +39,9 @@
41
39
  .dropdown-menu > li > a:hover > [class^="icon-"],
42
40
  .dropdown-menu > li > a:hover > [class*=" icon-"],
43
41
  .dropdown-menu > .active > a > [class^="icon-"],
44
- .dropdown-menu > .active > a > [class*=" icon-"] {
42
+ .dropdown-menu > .active > a > [class*=" icon-"],
43
+ .dropdown-submenu:hover > a > [class^="icon-"],
44
+ .dropdown-submenu:hover > a > [class*=" icon-"] {
45
45
  background-image: url("@{iconWhiteSpritePath}");
46
46
  }
47
47
 
@@ -71,7 +71,7 @@ table {
71
71
  border-collapse: separate; // Done so we can round those corners!
72
72
  *border-collapse: collapse; // IE7 can't round corners anyway
73
73
  border-left: 0;
74
- .border-radius(4px);
74
+ .border-radius(@baseBorderRadius);
75
75
  th,
76
76
  td {
77
77
  border-left: 1px solid @tableBorder;
@@ -133,7 +133,7 @@ table {
133
133
  colgroup + tbody tr:first-child td:last-child {
134
134
  -webkit-border-top-right-radius: 4px;
135
135
  border-top-right-radius: 4px;
136
- -moz-border-radius-topleft: 4px;
136
+ -moz-border-radius-topright: 4px;
137
137
  }
138
138
 
139
139
  }
@@ -172,39 +172,30 @@ table {
172
172
  // -----------------
173
173
 
174
174
  // Reset default grid behavior
175
- table [class*=span],
176
- .row-fluid table [class*=span] {
175
+ table td[class*="span"],
176
+ table th[class*="span"],
177
+ .row-fluid table td[class*="span"],
178
+ .row-fluid table th[class*="span"] {
177
179
  display: table-cell;
178
180
  float: none; // undo default grid column styles
179
181
  margin-left: 0; // undo default grid column styles
180
182
  }
181
183
 
182
184
  // Change the column widths to account for td/th padding
183
- .table {
184
- .span1 { .tableColumns(1); }
185
- .span2 { .tableColumns(2); }
186
- .span3 { .tableColumns(3); }
187
- .span4 { .tableColumns(4); }
188
- .span5 { .tableColumns(5); }
189
- .span6 { .tableColumns(6); }
190
- .span7 { .tableColumns(7); }
191
- .span8 { .tableColumns(8); }
192
- .span9 { .tableColumns(9); }
193
- .span10 { .tableColumns(10); }
194
- .span11 { .tableColumns(11); }
195
- .span12 { .tableColumns(12); }
196
- .span13 { .tableColumns(13); }
197
- .span14 { .tableColumns(14); }
198
- .span15 { .tableColumns(15); }
199
- .span16 { .tableColumns(16); }
200
- .span17 { .tableColumns(17); }
201
- .span18 { .tableColumns(18); }
202
- .span19 { .tableColumns(19); }
203
- .span20 { .tableColumns(20); }
204
- .span21 { .tableColumns(21); }
205
- .span22 { .tableColumns(22); }
206
- .span23 { .tableColumns(23); }
207
- .span24 { .tableColumns(24); }
185
+ .table td,
186
+ .table th {
187
+ &.span1 { .tableColumns(1); }
188
+ &.span2 { .tableColumns(2); }
189
+ &.span3 { .tableColumns(3); }
190
+ &.span4 { .tableColumns(4); }
191
+ &.span5 { .tableColumns(5); }
192
+ &.span6 { .tableColumns(6); }
193
+ &.span7 { .tableColumns(7); }
194
+ &.span8 { .tableColumns(8); }
195
+ &.span9 { .tableColumns(9); }
196
+ &.span10 { .tableColumns(10); }
197
+ &.span11 { .tableColumns(11); }
198
+ &.span12 { .tableColumns(12); }
208
199
  }
209
200
 
210
201
 
@@ -29,7 +29,7 @@
29
29
  padding: 4px;
30
30
  line-height: @baseLineHeight;
31
31
  border: 1px solid #ddd;
32
- .border-radius(4px);
32
+ .border-radius(@baseBorderRadius);
33
33
  .box-shadow(0 1px 3px rgba(0,0,0,.055));
34
34
  .transition(all .2s ease-in-out);
35
35
  }
@@ -27,7 +27,7 @@
27
27
  text-align: center;
28
28
  text-decoration: none;
29
29
  background-color: @tooltipBackground;
30
- .border-radius(4px);
30
+ .border-radius(@baseBorderRadius);
31
31
  }
32
32
 
33
33
  // Arrows
@@ -37,18 +37,17 @@ cite {
37
37
  .muted {
38
38
  color: @grayLight;
39
39
  }
40
- .text-warning {
41
- color: @warningText;
42
- }
43
- .text-error {
44
- color: @errorText;
45
- }
46
- .text-info {
47
- color: @infoText;
48
- }
49
- .text-success {
50
- color: @successText;
51
- }
40
+ .text-warning { color: @warningText; }
41
+ a.text-warning:hover { color: darken(@warningText, 10%); }
42
+
43
+ .text-error { color: @errorText; }
44
+ a.text-error:hover { color: darken(@errorText, 10%); }
45
+
46
+ .text-info { color: @infoText; }
47
+ a.text-info:hover { color: darken(@infoText, 10%); }
48
+
49
+ .text-success { color: @successText; }
50
+ a.text-success:hover { color: darken(@successText, 10%); }
52
51
 
53
52
 
54
53
  // Headings
@@ -58,7 +57,7 @@ h1, h2, h3, h4, h5, h6 {
58
57
  margin: (@baseLineHeight / 2) 0;
59
58
  font-family: @headingsFontFamily;
60
59
  font-weight: @headingsFontWeight;
61
- line-height: 1;
60
+ line-height: @baseLineHeight;
62
61
  color: @headingsColor;
63
62
  text-rendering: optimizelegibility; // Fix the character spacing for headings
64
63
  small {
@@ -67,17 +66,22 @@ h1, h2, h3, h4, h5, h6 {
67
66
  color: @grayLight;
68
67
  }
69
68
  }
70
- h1 { font-size: 36px; line-height: 40px; }
71
- h2 { font-size: 30px; line-height: 40px; }
72
- h3 { font-size: 24px; line-height: 40px; }
73
- h4 { font-size: 18px; line-height: 20px; }
74
- h5 { font-size: 14px; line-height: 20px; }
75
- h6 { font-size: 12px; line-height: 20px; }
76
69
 
77
- h1 small { font-size: 24px; }
78
- h2 small { font-size: 18px; }
79
- h3 small { font-size: 14px; }
80
- h4 small { font-size: 14px; }
70
+ h1,
71
+ h2,
72
+ h3 { line-height: @baseLineHeight * 2; }
73
+
74
+ h1 { font-size: @baseFontSize * 2.75; } // ~38px
75
+ h2 { font-size: @baseFontSize * 2.25; } // ~32px
76
+ h3 { font-size: @baseFontSize * 1.75; } // ~24px
77
+ h4 { font-size: @baseFontSize * 1.25; } // ~18px
78
+ h5 { font-size: @baseFontSize; }
79
+ h6 { font-size: @baseFontSize * 0.85; } // ~12px
80
+
81
+ h1 small { font-size: @baseFontSize * 1.75; } // ~24px
82
+ h2 small { font-size: @baseFontSize * 1.25; } // ~18px
83
+ h3 small { font-size: @baseFontSize; }
84
+ h4 small { font-size: @baseFontSize; }
81
85
 
82
86
 
83
87
  // Page header
@@ -155,7 +159,9 @@ hr {
155
159
  }
156
160
 
157
161
  // Abbreviations and acronyms
158
- abbr[title] {
162
+ abbr[title],
163
+ // Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
164
+ abbr[data-original-title] {
159
165
  cursor: help;
160
166
  border-bottom: 1px dotted @grayLight;
161
167
  }
@@ -57,6 +57,24 @@
57
57
  @headingsFontWeight: bold; // instead of browser default, bold
58
58
  @headingsColor: inherit; // empty to use BS default, @textColor
59
59
 
60
+
61
+ // Component sizing
62
+ // -------------------------
63
+ // Based on 14px font-size and 20px line-height
64
+
65
+ @fontSizeLarge: @baseFontSize * 1.25; // ~18px
66
+ @fontSizeSmall: @baseFontSize * 0.85; // ~12px
67
+ @fontSizeMini: @baseFontSize * 0.75; // ~11px
68
+
69
+ @paddingLarge: 11px 19px; // 44px
70
+ @paddingSmall: 2px 10px; // 26px
71
+ @paddingMini: 1px 6px; // 24px
72
+
73
+ @baseBorderRadius: 4px;
74
+ @borderRadiusLarge: 6px;
75
+ @borderRadiusSmall: 3px;
76
+
77
+
60
78
  // Tables
61
79
  // -------------------------
62
80
  @tableBackground: transparent; // overall background-color
@@ -93,9 +111,11 @@
93
111
  // -------------------------
94
112
  @inputBackground: @white;
95
113
  @inputBorder: #ccc;
96
- @inputBorderRadius: 3px;
114
+ @inputBorderRadius: @baseBorderRadius;
97
115
  @inputDisabledBackground: @grayLighter;
98
116
  @formActionsBackground: #f5f5f5;
117
+ @inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
118
+
99
119
 
100
120
  // Dropdowns
101
121
  // -------------------------
@@ -116,6 +136,7 @@
116
136
  // COMPONENT VARIABLES
117
137
  // --------------------------------------------------
118
138
 
139
+
119
140
  // Z-index master list
120
141
  // -------------------------
121
142
  // Used for a bird's eye view of components dependent on the z-axis
@@ -157,6 +178,7 @@
157
178
  // Navbar
158
179
  // -------------------------
159
180
  @navbarCollapseWidth: 979px;
181
+ @navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;
160
182
 
161
183
  @navbarHeight: 40px;
162
184
  @navbarBackgroundHighlight: #ffffff;
@@ -10,7 +10,7 @@
10
10
  margin-bottom: 20px;
11
11
  background-color: @wellBackground;
12
12
  border: 1px solid darken(@wellBackground, 7%);
13
- .border-radius(4px);
13
+ .border-radius(@baseBorderRadius);
14
14
  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
15
15
  blockquote {
16
16
  border-color: #ddd;
@@ -21,9 +21,9 @@
21
21
  // Sizes
22
22
  .well-large {
23
23
  padding: 24px;
24
- .border-radius(6px);
24
+ .border-radius(@borderRadiusLarge);
25
25
  }
26
26
  .well-small {
27
27
  padding: 9px;
28
- .border-radius(3px);
28
+ .border-radius(@borderRadiusSmall);
29
29
  }
@@ -12,7 +12,7 @@
12
12
  .accordion-group {
13
13
  margin-bottom: 2px;
14
14
  border: 1px solid #e5e5e5;
15
- @include border-radius(4px);
15
+ @include border-radius($baseBorderRadius);
16
16
  }
17
17
  .accordion-heading {
18
18
  border-bottom: 0;
@@ -12,7 +12,7 @@
12
12
  text-shadow: 0 1px 0 rgba(255,255,255,.5);
13
13
  background-color: $warningBackground;
14
14
  border: 1px solid $warningBorder;
15
- @include border-radius(4px);
15
+ @include border-radius($baseBorderRadius);
16
16
  color: $warningText;
17
17
  }
18
18
  .alert h4 {
@@ -8,7 +8,7 @@
8
8
  margin: 0 0 $baseLineHeight;
9
9
  list-style: none;
10
10
  background-color: #f5f5f5;
11
- @include border-radius(4px);
11
+ @include border-radius($baseBorderRadius);
12
12
  li {
13
13
  display: inline-block;
14
14
  @include ie7-inline-block();
@@ -6,6 +6,8 @@
6
6
  // Make the div behave like a button
7
7
  .btn-group {
8
8
  position: relative;
9
+ display: inline-block;
10
+ @include ie7-inline-block();
9
11
  font-size: 0; // remove as part 1 of font-size inline-block hack
10
12
  vertical-align: middle; // match .btn alignment given font-size hack above
11
13
  white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
@@ -22,10 +24,6 @@
22
24
  font-size: 0; // Hack to remove whitespace that results from using inline-block
23
25
  margin-top: $baseLineHeight / 2;
24
26
  margin-bottom: $baseLineHeight / 2;
25
- .btn-group {
26
- display: inline-block;
27
- @include ie7-inline-block();
28
- }
29
27
  .btn + .btn,
30
28
  .btn-group + .btn,
31
29
  .btn + .btn-group {
@@ -120,7 +118,7 @@
120
118
  .btn-group > .btn + .dropdown-toggle {
121
119
  padding-left: 8px;
122
120
  padding-right: 8px;
123
- @include box-shadow(#{inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)});
121
+ @include box-shadow(inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
124
122
  *padding-top: 5px;
125
123
  *padding-bottom: 5px;
126
124
  }
@@ -147,7 +145,7 @@
147
145
  // Remove the gradient and set the same inset shadow as the :active state
148
146
  .dropdown-toggle {
149
147
  background-image: none;
150
- @include box-shadow(#{inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)});
148
+ @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
151
149
  }
152
150
 
153
151
  // Keep the hover's background when dropdown is open
@@ -193,8 +191,7 @@
193
191
  }
194
192
  // Upside down carets for .dropup
195
193
  .dropup .btn-large .caret {
196
- border-bottom: 5px solid $black;
197
- border-top: 0;
194
+ border-bottom-width: 5px;
198
195
  }
199
196
 
200
197
 
@@ -10,7 +10,7 @@
10
10
  .btn {
11
11
  display: inline-block;
12
12
  @include ie7-inline-block();
13
- padding: 4px 14px;
13
+ padding: 4px 12px;
14
14
  margin-bottom: 0; // For input.btn
15
15
  font-size: $baseFontSize;
16
16
  line-height: $baseLineHeight;
@@ -22,9 +22,9 @@
22
22
  border: 1px solid $btnBorder;
23
23
  *border: 0; // Remove the border to prevent IE7's black border on input:focus
24
24
  border-bottom-color: darken($btnBorder, 10%);
25
- @include border-radius(4px);
25
+ @include border-radius($baseBorderRadius);
26
26
  @include ie7-restore-left-whitespace(); // Give IE7 some love
27
- @include box-shadow(#{inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)});
27
+ @include box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
28
28
 
29
29
  // Hover state
30
30
  &:hover {
@@ -51,7 +51,7 @@
51
51
  background-color: darken($white, 15%) \9;
52
52
  background-image: none;
53
53
  outline: 0;
54
- @include box-shadow(#{inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)});
54
+ @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
55
55
  }
56
56
 
57
57
  // Disabled state
@@ -73,30 +73,31 @@
73
73
 
74
74
  // Large
75
75
  .btn-large {
76
- padding: 9px 14px;
77
- font-size: $baseFontSize + 2px;
78
- line-height: normal;
79
- @include border-radius(5px);
76
+ padding: $paddingLarge;
77
+ font-size: $fontSizeLarge;
78
+ @include border-radius($borderRadiusLarge);
80
79
  }
81
- .btn-large [class^="icon-"] {
80
+ .btn-large [class^="icon-"],
81
+ .btn-large [class*=" icon-"] {
82
82
  margin-top: 2px;
83
83
  }
84
84
 
85
85
  // Small
86
86
  .btn-small {
87
- padding: 3px 9px;
88
- font-size: $baseFontSize - 2px;
89
- line-height: $baseLineHeight - 2px;
87
+ padding: $paddingSmall;
88
+ font-size: $fontSizeSmall;
89
+ @include border-radius($borderRadiusSmall);
90
90
  }
91
- .btn-small [class^="icon-"] {
92
- margin-top: 0px;
91
+ .btn-small [class^="icon-"],
92
+ .btn-small [class*=" icon-"] {
93
+ margin-top: 0;
93
94
  }
94
95
 
95
96
  // Mini
96
97
  .btn-mini {
97
- padding: 2px 6px;
98
- font-size: $baseFontSize - 3px;
99
- line-height: $baseLineHeight - 3px;
98
+ padding: $paddingMini;
99
+ font-size: $fontSizeMini;
100
+ @include border-radius($borderRadiusSmall);
100
101
  }
101
102
 
102
103
 
@@ -35,7 +35,7 @@ pre {
35
35
  background-color: #f5f5f5;
36
36
  border: 1px solid #ccc; // fallback for IE7-8
37
37
  border: 1px solid rgba(0,0,0,.15);
38
- @include border-radius(4px);
38
+ @include border-radius($baseBorderRadius);
39
39
 
40
40
  // Make prettyprint styles more spaced out for readability
41
41
  &.prettyprint {
@@ -4,10 +4,10 @@
4
4
 
5
5
 
6
6
  .fade {
7
- @include opacity(0);
7
+ opacity: 0;
8
8
  @include transition(opacity .15s linear);
9
9
  &.in {
10
- @include opacity(100);
10
+ opacity: 1;
11
11
  }
12
12
  }
13
13