Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

update stylesheets to 2.0.4-wip

  • Loading branch information...
commit 2e84ca7482b42a35a4f09ac4425b891c2deceb49 1 parent ad1bbd3
authored May 17, 2012

Showing 40 changed files with 144 additions and 308 deletions. Show diff stats Hide diff stats

  1. 3  lib/_accordion.scss
  2. 4  lib/_alerts.scss
  3. 5  lib/_breadcrumbs.scss
  4. 10  lib/_button-groups.scss
  5. 10  lib/_buttons.scss
  6. 4  lib/_carousel.scss
  7. 4  lib/_close.scss
  8. 7  lib/_code.scss
  9. 3  lib/_component-animations.scss
  10. 4  lib/_dropdowns.scss
  11. 177  lib/_forms.scss
  12. 5  lib/_grid.scss
  13. 4  lib/_hero-unit.scss
  14. 27  lib/_labels-badges.scss
  15. 3  lib/_layouts.scss
  16. 50  lib/_mixins.scss
  17. 8  lib/_modals.scss
  18. 16  lib/_navbar.scss
  19. 4  lib/_navs.scss
  20. 4  lib/_pager.scss
  21. 4  lib/_pagination.scss
  22. 4  lib/_popovers.scss
  23. 3  lib/_progress-bars.scss
  24. 5  lib/_reset.scss
  25. 3  lib/_responsive-1200px-min.scss
  26. 6  lib/_responsive-767px-max.scss
  27. 3  lib/_responsive-768px-979px.scss
  28. 18  lib/_responsive-navbar.scss
  29. 3  lib/_responsive-utilities.scss
  30. 2  lib/_scaffolding.scss
  31. 3  lib/_sprites.scss
  32. 8  lib/_tables.scss
  33. 4  lib/_thumbnails.scss
  34. 4  lib/_tooltip.scss
  35. 8  lib/_type.scss
  36. 3  lib/_utilities.scss
  37. 8  lib/_variables.scss
  38. 3  lib/_wells.scss
  39. 4  lib/bootstrap.scss
  40. 4  lib/responsive.scss
3  lib/_accordion.scss
... ...
@@ -1,9 +1,6 @@
1 1
 // ACCORDION
2 2
 // ---------
3 3
 
4  
-// Updated for SASS:
5  
-//  - replace @ with $
6  
-//  - replace .border-radius with @include border-radius
7 4
 
8 5
 // Parent container
9 6
 .accordion {
4  lib/_alerts.scss
... ...
@@ -1,10 +1,6 @@
1 1
 // ALERT STYLES
2 2
 // ------------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace $ with $
6  
-//  - replace .border-radius with $include border-radius
7  
-
8 4
 // Base alert styles
9 5
 .alert {
10 6
   padding: 8px 35px 8px 14px;
5  lib/_breadcrumbs.scss
... ...
@@ -1,11 +1,6 @@
1 1
 // BREADCRUMBS
2 2
 // -----------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace @ with $
6  
-//  - replace . with @include for mixins
7  
-//  - replace #gradient > .vertical with @include gradient-vertical
8  
-
9 4
 .breadcrumb {
10 5
   padding: 7px 14px;
11 6
   margin: 0 0 $baseLineHeight;
10  lib/_button-groups.scss
... ...
@@ -1,10 +1,6 @@
1 1
 // BUTTON GROUPS
2 2
 // -------------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace $ with $
6  
-//  - replace . with @include for mixins
7  
-//  - pull complex shadow definitions into variables
8 4
 
9 5
 // Make the div behave like a button
10 6
 .btn-group {
@@ -98,8 +94,7 @@
98 94
 .btn-group > .dropdown-toggle {
99 95
   padding-left: 8px;
100 96
   padding-right: 8px;
101  
-  $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);
102  
-  @include box-shadow($shadow);
  97
+  @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)});
103 98
   *padding-top: 4px;
104 99
   *padding-bottom: 4px;
105 100
 }
@@ -122,8 +117,7 @@
122 117
   // Remove the gradient and set the same inset shadow as the :active state
123 118
   .dropdown-toggle {
124 119
     background-image: none;
125  
-    $shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
126  
-    @include box-shadow($shadow);
  120
+    @include box-shadow(#{inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)});
127 121
   }
128 122
 
129 123
   // Keep the hover's background when dropdown is open
10  lib/_buttons.scss
... ...
@@ -1,10 +1,6 @@
1 1
 // BUTTON STYLES
2 2
 // -------------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace $ with $
6  
-//  - replace . with @include for mixins
7  
-//  - pull complex shadow definitions into variables
8 4
 
9 5
 // Base styles
10 6
 // --------------------------------------------------
@@ -29,8 +25,7 @@
29 25
   border-bottom-color: darken($btnBorder, 10%);
30 26
   @include border-radius(4px);
31 27
   @include ie7-restore-left-whitespace(); // Give IE7 some love
32  
-  $shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
33  
-  @include box-shadow($shadow);
  28
+  @include box-shadow(#{inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)});
34 29
 }
35 30
 
36 31
 // Hover state
@@ -58,8 +53,7 @@
58 53
   background-color: darken($white, 15%) \9;
59 54
   background-image: none;
60 55
   outline: 0;
61  
-  $shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
62  
-  @include box-shadow($shadow);
  56
+  @include box-shadow(#{inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)});
63 57
 }
64 58
 
65 59
 // Disabled state
4  lib/_carousel.scss
... ...
@@ -1,10 +1,6 @@
4  lib/_close.scss
... ...
@@ -1,10 +1,6 @@
1 1
 // CLOSE ICONS
2 2
 // -----------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace @ with $
6  
-//  - replace . with @include for mixins
7  
-
8 4
 .close {
9 5
   float: right;
10 6
   font-size: 20px;
7  lib/_code.scss
... ...
@@ -1,12 +1,7 @@
1  
-// Code.less
  1
+// Code
2 2
 // Code typography styles for the <code> and <pre> elements
3 3
 // --------------------------------------------------------
4 4
 
5  
-// Updates for SASS:
6  
-//  - replace $ with $
7  
-//  - replace . with @include for mixins
8  
-//  - replace font definition with mixin
9  
-
10 5
 // Inline and block code styles
11 6
 code,
12 7
 pre {
3  lib/_component-animations.scss
... ...
@@ -1,9 +1,6 @@
1 1
 // COMPONENT ANIMATIONS
2 2
 // --------------------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace . with @include for mixins
6  
-
7 4
 .fade {
8 5
   @include opacity(0);
9 6
   @include transition(opacity .15s linear);
4  lib/_dropdowns.scss
... ...
@@ -1,10 +1,6 @@
1 1
 // DROPDOWN MENUS
2 2
 // --------------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace @ with $
6  
-//  - replace . with @include for mixins
7  
-
8 4
 // Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
9 5
 .dropup,
10 6
 .dropdown {
177  lib/_forms.scss
... ...
@@ -1,11 +1,7 @@
1  
-// Forms.less
  1
+// Forms
2 2
 // Base styles for various input types, form layouts, and states
3 3
 // -------------------------------------------------------------
4 4
 
5  
-// Updates for SASS:
6  
-//  - replace @ with $
7  
-//  - replace . with @include for mixins
8  
-//  - use grid generator mixin
9 5
 
10 6
 // GENERAL STYLES
11 7
 // --------------
@@ -31,7 +27,7 @@ legend {
31 27
   line-height: $baseLineHeight * 2;
32 28
   color: $grayDark;
33 29
   border: 0;
34  
-  border-bottom: 1px solid #eee;
  30
+  border-bottom: 1px solid #e5e5e5;
35 31
 
36 32
   // Small
37 33
   small {
@@ -46,7 +42,7 @@ input,
46 42
 button,
47 43
 select,
48 44
 textarea {
49  
-  @include font-shorthand($baseFontSize,normal,$baseLineHeight); // Set size, weight, line-height here
  45
+  @include font-shorthand($baseFontSize, normal, $baseLineHeight); // Set size, weight, line-height here
50 46
 }
51 47
 input,
52 48
 button,
@@ -62,69 +58,94 @@ label {
62 58
   color: $grayDark;
63 59
 }
64 60
 
65  
-// Inputs, Textareas, Selects
66  
-input,
67  
-textarea,
  61
+// Form controls
  62
+// -------------------------
  63
+
  64
+// Shared size and type resets
68 65
 select,
  66
+textarea,
  67
+input[type="text"],
  68
+input[type="password"],
  69
+input[type="datetime"],
  70
+input[type="datetime-local"],
  71
+input[type="date"],
  72
+input[type="month"],
  73
+input[type="time"],
  74
+input[type="week"],
  75
+input[type="number"],
  76
+input[type="email"],
  77
+input[type="url"],
  78
+input[type="search"],
  79
+input[type="tel"],
  80
+input[type="color"],
69 81
 .uneditable-input {
70 82
   display: inline-block;
71  
-  width: 210px;
72 83
   height: $baseLineHeight;
73 84
   padding: 4px;
74 85
   margin-bottom: 9px;
75 86
   font-size: $baseFontSize;
76 87
   line-height: $baseLineHeight;
77 88
   color: $gray;
  89
+}
  90
+
  91
+// Reset appearance properties for textual inputs and textarea
  92
+// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
  93
+input,
  94
+textarea {
  95
+  width: 210px;
  96
+}
  97
+// Everything else
  98
+textarea,
  99
+input[type="text"],
  100
+input[type="password"],
  101
+input[type="datetime"],
  102
+input[type="datetime-local"],
  103
+input[type="date"],
  104
+input[type="month"],
  105
+input[type="time"],
  106
+input[type="week"],
  107
+input[type="number"],
  108
+input[type="email"],
  109
+input[type="url"],
  110
+input[type="search"],
  111
+input[type="tel"],
  112
+input[type="color"],
  113
+.uneditable-input {
78 114
   background-color: $inputBackground;
79 115
   border: 1px solid $inputBorder;
80 116
   @include border-radius($inputBorderRadius);
81  
-}
82  
-.uneditable-textarea {
83  
-  width: auto;
84  
-  height: auto;
85  
-}
  117
+  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
  118
+  @include transition(#{border linear .2s, box-shadow linear .2s});
86 119
 
87  
-// Inputs within a label
88  
-label input,
89  
-label textarea,
90  
-label select {
91  
-  display: block;
  120
+  // Focus state
  121
+  &:focus {
  122
+    border-color: rgba(82,168,236,.8);
  123
+    outline: 0;
  124
+    outline: thin dotted \9; /* IE6-9 */
  125
+    @include box-shadow(#{inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)});
  126
+  }
92 127
 }
93 128
 
94  
-// Mini reset for unique input types
95  
-input[type="image"],
96  
-input[type="checkbox"],
97  
-input[type="radio"] {
98  
-  width: auto;
99  
-  height: auto;
100  
-  padding: 0;
  129
+// Position radios and checkboxes better
  130
+input[type="radio"],
  131
+input[type="checkbox"] {
101 132
   margin: 3px 0;
102 133
   *margin-top: 0; /* IE7 */
103 134
   line-height: normal;
104 135
   cursor: pointer;
105  
-  background-color: transparent;
106  
-  border: 0 \9; /* IE9 and down */
107  
-  @include border-radius(0);
108  
-}
109  
-input[type="image"] {
110  
-  border: 0;
111 136
 }
112 137
 
113  
-// Reset the file input to browser defaults
114  
-input[type="file"] {
115  
-  width: auto;
116  
-  padding: initial;
117  
-  line-height: initial;
118  
-  background-color: $inputBackground;
119  
-  background-color: initial;
120  
-  border: initial;
121  
-  @include box-shadow(none);
  138
+// Reset width of input buttons, radios, checkboxes
  139
+input[type="submit"],
  140
+input[type="reset"],
  141
+input[type="button"],
  142
+input[type="radio"],
  143
+input[type="checkbox"] {
  144
+  width: auto; // Override of generic input selector
122 145
 }
123 146
 
124  
-// Help out input buttons
125  
-input[type="button"],
126  
-input[type="reset"],
127  
-input[type="submit"] {
  147
+// Make uneditable textareas behave like a textarea
  148
+.uneditable-textarea {
128 149
   width: auto;
129 150
   height: auto;
130 151
 }
@@ -137,15 +158,10 @@ input[type="file"] {
137 158
   line-height: 28px;
138 159
 }
139 160
 
140  
-// Reset line-height for IE
141  
-input[type="file"] {
142  
-  line-height: 18px \9;
143  
-}
144  
-
145  
-// Chrome on Linux and Mobile Safari need background-color
  161
+// Make select elements obey height by applying a border
146 162
 select {
147 163
   width: 220px; // default input width + 10px of padding that doesn't get applied
148  
-  background-color: $inputBackground;
  164
+  border: 1px solid #bbb;
149 165
 }
150 166
 
151 167
 // Make multiple select elements height not fixed
@@ -154,19 +170,12 @@ select[size] {
154 170
   height: auto;
155 171
 }
156 172
 
157  
-// Remove shadow from image inputs
158  
-input[type="image"] {
159  
-  @include box-shadow(none);
160  
-}
161  
-
162  
-// Make textarea height behave
163  
-textarea {
164  
-  height: auto;
165  
-}
166  
-
167  
-// Hidden inputs
168  
-input[type="hidden"] {
169  
-  display: none;
  173
+// Focus for select, file, radio, and checkbox
  174
+select:focus,
  175
+input[type="file"]:focus,
  176
+input[type="radio"]:focus,
  177
+input[type="checkbox"]:focus {
  178
+  @include tab-focus();
170 179
 }
171 180
 
172 181
 
@@ -208,33 +217,6 @@ input[type="hidden"] {
208 217
 
209 218
 
210 219
 
211  
-// FOCUS STATE
212  
-// -----------
213  
-
214  
-input,
215  
-textarea {
216  
-  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
217  
-  $transition: border linear .2s, box-shadow linear .2s;
218  
-  @include transition($transition);
219  
-}
220  
-input:focus,
221  
-textarea:focus {
222  
-  border-color: rgba(82,168,236,.8);
223  
-  outline: 0;
224  
-  outline: thin dotted \9; /* IE6-9 */
225  
-  $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
226  
-  @include box-shadow($shadow);
227  
-}
228  
-input[type="file"]:focus,
229  
-input[type="radio"]:focus,
230  
-input[type="checkbox"]:focus,
231  
-select:focus {
232  
-  @include tab-focus();
233  
-  @include box-shadow(none); // override for file inputs
234  
-}
235  
-
236  
-
237  
-
238 220
 // INPUT SIZES
239 221
 // -----------
240 222
 
@@ -269,7 +251,6 @@ textarea[class*="span"],
269 251
 
270 252
 
271 253
 
272  
-
273 254
 // DISABLED STATE
274 255
 // --------------
275 256
 
@@ -334,7 +315,7 @@ select:focus:required:invalid {
334 315
   margin-top: $baseLineHeight;
335 316
   margin-bottom: $baseLineHeight;
336 317
   background-color: $formActionsBackground;
337  
-  border-top: 1px solid #ddd;
  318
+  border-top: 1px solid #e5e5e5;
338 319
   @include clearfix(); // Adding clearfix to allow for .pull-right button containers
339 320
 }
340 321
 
@@ -349,7 +330,7 @@ select:focus:required:invalid {
349 330
 }
350 331
 
351 332
 // Placeholder text gets special styles; can't be bundled together though for some reason
352  
-@include placeholder($grayLight);
  333
+@include placeholder();
353 334
 
354 335
 
355 336
 
@@ -499,8 +480,8 @@ select:focus:required:invalid {
499 480
   .input-prepend,
500 481
   .input-append {
501 482
     display: inline-block;
502  
-    margin-bottom: 0;
503 483
     @include ie7-inline-block();
  484
+    margin-bottom: 0;
504 485
   }
505 486
   // Re-hide hidden elements due to specifity
506 487
   .hide {
5  lib/_grid.scss
... ...
@@ -1,8 +1,3 @@
1  
-// Updates for SASS:
2  
-// - replace @ with $
3  
-// - use grid-core and grid-fluid mixins instead of #grid > .core and
4  
-//   #grid > .fluid
5  
-
6 1
 // Fixed (940px)
7 2
 @include grid-core($gridColumnWidth, $gridGutterWidth);
8 3
 
4  lib/_hero-unit.scss
... ...
@@ -1,10 +1,6 @@
1 1
 // HERO UNIT
2 2
 // ---------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace @ with $
6  
-//  - replace . with @include for mixins
7  
-
8 4
 .hero-unit {
9 5
   padding: 60px;
10 6
   margin-bottom: 30px;
27  lib/_labels-badges.scss
... ...
@@ -1,11 +1,6 @@
1 1
 // LABELS & BADGES
2 2
 // ---------------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace @ with $
6  
-//  - replace . with @include for mixins
7  
-//  - manually set up .label- and .badge- classes
8  
-
9 4
 // Base classes
10 5
 .label,
11 6
 .badge {
@@ -39,19 +34,19 @@ a {
39 34
 }
40 35
 
41 36
 // Colors
42  
-// Only give background-color difference to links (and to simplify, we don't qualify with `a` but [href] attribute)
  37
+// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
43 38
 // Important (red)
44  
-.label-important, .badge-important { background-color: $errorText; }
45  
-.label-important[href], .badge-important[href] { background-color: darken($errorText, 10%); }
  39
+.label-important, .badge-important               { background-color: $errorText; }
  40
+.label-important[href], .badge-important[href]   { background-color: darken($errorText, 10%); }
46 41
 // Warnings (orange)
47  
-.label-warning, .badge-warning { background-color: $orange; }
48  
-.label-warning[href], .badge-warning[href] { background-color: darken($orange, 10%); }
  42
+.label-warning, .badge-warning                   { background-color: $orange; }
  43
+.label-warning[href], .badge-warning[href]       { background-color: darken($orange, 10%); }
49 44
 // Success (green)
50  
-.label-success, .badge-success { background-color: $successText; }
51  
-.label-success[href], .badge-success[href] { background-color: darken($successText, 10%); }
  45
+.label-success, .badge-success                   { background-color: $successText; }
  46
+.label-success[href], .badge-success[href]       { background-color: darken($successText, 10%); }
52 47
 // Info (turquoise)
53  
-.label-info, .badge-info { background-color: $infoText; }
54  
-.label-info[href], .badge-info[href] { background-color: darken($infoText, 10%); }
  48
+.label-info, .badge-info                         { background-color: $infoText; }
  49
+.label-info[href], .badge-info[href]             { background-color: darken($infoText, 10%); }
55 50
 // Inverse (black)
56  
-.label-inverse, .badge-inverse { background-color: $grayDark; }
57  
-.label-inverse[href], .badge-inverse[href] { background-color: darken($grayDark, 10%); }
  51
+.label-inverse, .badge-inverse                   { background-color: $grayDark; }
  52
+.label-inverse[href], .badge-inverse[href]       { background-color: darken($grayDark, 10%); }
3  lib/_layouts.scss
@@ -3,9 +3,6 @@
3 3
 // Fixed-width and fluid (with sidebar) layouts
4 4
 // --------------------------------------------
5 5
 
6  
-// Updates for SASS:
7  
-//  - replace @ with $
8  
-//  - replace . with @include for mixins
9 6
 
10 7
 // Container (centered, fixed-width layouts)
11 8
 .container {
50  lib/_mixins.scss
... ...
@@ -1,17 +1,7 @@
1  
-// Mixins.less
  1
+// Mixins
2 2
 // Snippets of reusable CSS to develop faster and keep code readable
3 3
 // -----------------------------------------------------------------
4 4
 
5  
-// Updates for SASS:
6  
-//  - use @mixin instead of class definitions
7  
-//  - replace @ with $
8  
-//  - add default of 5px for @size and @square mixins
9  
-//  - replace grid generation loops with for $i from 1 to $gridColumns
10  
-//  - explicitly provide .clearfix, .hide-text and .input-block-level
11  
-//    (line 304) for compatibility with LESS output
12  
-//  - replace fadein with fade-in
13  
-//  - pass grid-* mixin arguments to generators, because otherwise the
14  
-//    generator mixins will use the default variables
15 5
 
16 6
 // UTILITY MIXINS
17 7
 // --------------------------------------------------
@@ -84,11 +74,11 @@
84 74
 
85 75
 // Sizing shortcuts
86 76
 // -------------------------
87  
-@mixin size($height: 5px, $width: 5px) {
  77
+@mixin size($height, $width) {
88 78
   width: $width;
89 79
   height: $height;
90 80
 }
91  
-@mixin square($size: 5px) {
  81
+@mixin square($size) {
92 82
   @include size($size, $size);
93 83
 }
94 84
 
@@ -130,24 +120,20 @@
130 120
 // FONTS
131 121
 // --------------------------------------------------
132 122
 
133  
-@mixin font-family-serif {
  123
+@mixin font-family-serif() {
134 124
   font-family: $serifFontFamily;
135 125
 }
136  
-
137  
-@mixin font-family-sans-serif {
  126
+@mixin font-family-sans-serif() {
138 127
   font-family: $sansFontFamily;
139 128
 }
140  
-
141  
-@mixin font-family-monospace {
  129
+@mixin font-family-monospace() {
142 130
   font-family: $monoFontFamily;
143 131
 }
144  
-
145  
-@mixin font-shorthand ($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
  132
+@mixin font-shorthand($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
146 133
   font-size: $size;
147 134
   font-weight: $weight;
148 135
   line-height: $lineHeight;
149 136
 }
150  
-
151 137
 @mixin font-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
152 138
   @include font-family-serif();
153 139
   @include font-shorthand($size, $weight, $lineHeight);
@@ -208,14 +194,14 @@
208 194
 // --------------------------------------------------
209 195
 
210 196
 // Border Radius
211  
-@mixin border-radius($radius: 5px) {
  197
+@mixin border-radius($radius) {
212 198
   -webkit-border-radius: $radius;
213 199
      -moz-border-radius: $radius;
214 200
           border-radius: $radius;
215 201
 }
216 202
 
217 203
 // Drop shadows
218  
-@mixin box-shadow($shadow: 0 1px 3px rgba(0,0,0,.25)) {
  204
+@mixin box-shadow($shadow) {
219 205
   -webkit-box-shadow: $shadow;
220 206
      -moz-box-shadow: $shadow;
221 207
           box-shadow: $shadow;
@@ -252,6 +238,7 @@
252 238
        -o-transform: translate($x, $y);
253 239
           transform: translate($x, $y);
254 240
 }
  241
+
255 242
 @mixin skew($x, $y) {
256 243
   -webkit-transform: skew($x, $y);
257 244
      -moz-transform: skew($x, $y);
@@ -259,6 +246,7 @@
259 246
        -o-transform: skew($x, $y);
260 247
           transform: skew($x, $y);
261 248
 }
  249
+
262 250
 @mixin translate3d($x, $y, $z) {
263 251
   -webkit-transform: translate($x, $y, $z);
264 252
      -moz-transform: translate($x, $y, $z);
@@ -334,6 +322,16 @@
334 322
           column-gap: $columnGap;
335 323
 }
336 324
 
  325
+// Optional hyphenation
  326
+@mixin hyphens($mode: auto) {
  327
+  word-wrap: break-word;
  328
+  -webkit-hyphens: $mode;
  329
+     -moz-hyphens: $mode;
  330
+      -ms-hyphens: $mode;
  331
+       -o-hyphens: $mode;
  332
+          hyphens: $mode;
  333
+}
  334
+
337 335
 // Opacity
338 336
 @mixin opacity($opacity) {
339 337
   opacity: $opacity / 100;
@@ -437,7 +435,7 @@
437 435
 // Horizontal dividers
438 436
 // -------------------------
439 437
 // Dividers (basically an hr) within dropdowns and nav lists
440  
-@mixin nav-divider {
  438
+@mixin nav-divider($top: #e5e5e5, $bottom: $white) {
441 439
   // IE7 needs a set width since we gave a height. Restricting just
442 440
   // to IE7 to keep the 1px left/right space in other browsers.
443 441
   // It is unclear where IE is getting the extra space that we need
@@ -447,8 +445,8 @@
447 445
   margin: (($baseLineHeight / 2) - 1) 1px; // 8px 1px
448 446
   *margin: -5px 0 5px;
449 447
   overflow: hidden;
450  
-  background-color: #e5e5e5;
451  
-  border-bottom: 1px solid $white;
  448
+  background-color: $top;
  449
+  border-bottom: 1px solid $bottom;
452 450
 }
453 451
 
454 452
 // Button backgrounds
8  lib/_modals.scss
... ...
@@ -1,11 +1,6 @@
1 1
 // MODALS
2 2
 // ------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace @ with $
6  
-//  - replace . with @include for mixins
7  
-//  - pull transition definition into variable
8  
-
9 4
 // Recalculate z-index where appropriate
10 5
 .modal-open {
11 6
   .dropdown-menu {  z-index: $zindexDropdown + $zindexModal; }
@@ -49,8 +44,7 @@
49 44
   @include box-shadow(0 3px 7px rgba(0,0,0,0.3));
50 45
   @include background-clip(padding-box);
51 46
   &.fade {
52  
-    $transition: opacity .3s linear, top .3s ease-out;
53  
-    @include transition($transition);
  47
+    @include transition(#{opacity .3s linear, top .3s ease-out});
54 48
     top: -25%;
55 49
   }
56 50
   &.fade.in { top: 50%; }
16  lib/_navbar.scss
... ...
@@ -1,9 +1,6 @@
1 1
 // NAVBAR (FIXED AND STATIC)
2 2
 // -------------------------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace @ with $
6  
-//  - replace . with @include for mixins
7 4
 
8 5
 // COMMON STYLES
9 6
 // -------------
@@ -24,8 +21,7 @@
24 21
   padding-right: 20px;
25 22
   @include gradient-vertical($navbarBackgroundHighlight, $navbarBackground);
26 23
   @include border-radius(4px);
27  
-  $shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
28  
-  @include box-shadow($shadow);
  24
+  @include box-shadow(#{0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1)});
29 25
 }
30 26
 
31 27
 // Set width to auto for default container
@@ -124,8 +120,7 @@
124 120
     color: $white;
125 121
     background-color: $navbarSearchBackground;
126 122
     border: 1px solid $navbarSearchBorder;
127  
-    $shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
128  
-    @include box-shadow($shadow);
  123
+    @include box-shadow(#{inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)});
129 124
     @include transition(none);
130 125
 
131 126
     // Placeholder text gets special styles; can't be a grouped selector
@@ -223,9 +218,7 @@
223 218
   padding: 4px 10px 4px;
224 219
   // Vertically center the button given @navbarHeight
225 220
   $elementHeight: 28px;
226  
-  $topMargin: ($navbarHeight - $elementHeight) / 2 - 1;
227  
-  $bottomMargin: ($navbarHeight - $elementHeight) / 2;
228  
-  margin: $topMargin 5px $bottomMargin;
  221
+  margin: (($navbarHeight - $elementHeight) / 2 - 1) 5px (($navbarHeight - $elementHeight) / 2);
229 222
   line-height: $baseLineHeight;
230 223
 }
231 224
 .navbar .btn-group {
@@ -274,8 +267,7 @@
274 267
   margin-left: 5px;
275 268
   margin-right: 5px;
276 269
   @include buttonBackground($navbarBackgroundHighlight, $navbarBackground);
277  
-  $shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
278  
-  @include box-shadow($shadow);
  270
+  @include box-shadow(#{inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)});
279 271
 }
280 272
 .navbar .btn-navbar .icon-bar {
281 273
   display: block;
4  lib/_navs.scss
... ...
@@ -1,9 +1,7 @@
1 1
 // NAVIGATIONS
2 2
 // -----------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace @ with $
6  
-//  - replace . with @include for mixins
  4
+
7 5
 
8 6
 // BASE CLASS
9 7
 // ----------
4  lib/_pager.scss
... ...
@@ -1,10 +1,6 @@
1 1
 // PAGER
2 2
 // -----
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace @ with $
6  
-//  - replace . with @include for mixins
7  
-
8 4
 .pager {
9 5
   margin-left: 0;
10 6
   margin-bottom: $baseLineHeight;
4  lib/_pagination.scss
... ...
@@ -1,10 +1,6 @@
1 1
 // PAGINATION
2 2
 // ----------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace $ with $
6  
-//  - replace . with @include for mixins
7  
-
8 4
 .pagination {
9 5
   height: $baseLineHeight * 2;
10 6
   margin: $baseLineHeight 0;
4  lib/_popovers.scss
... ...
@@ -1,10 +1,6 @@
1 1
 // POPOVERS
2 2
 // --------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace @ with $
6  
-//  - replace . with @include for mixins
7  
-
8 4
 .popover {
9 5
   position: absolute;
10 6
   top: 0;
3  lib/_progress-bars.scss
... ...
@@ -1,9 +1,6 @@
1 1
 // PROGRESS BARS
2 2
 // -------------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace @ with $
6  
-//  - replace . with @include for mixins
7 4
 
8 5
 // ANIMATIONS
9 6
 // ----------
5  lib/_reset.scss
... ...
@@ -1,10 +1,7 @@
1  
-// Reset.less
  1
+// Reset
2 2
 // Adapted from Normalize.css http://github.com/necolas/normalize.css
3 3
 // ------------------------------------------------------------------------
4 4
 
5  
-// Updates for SASS:
6  
-//  - none!
7  
-
8 5
 // Display in IE6-9 and FF3
9 6
 // -------------------------
10 7
 
3  lib/_responsive-1200px-min.scss
... ...
@@ -1,9 +1,6 @@
1 1
 // LARGE DESKTOP & UP
2 2
 // ------------------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace #grid > .style with @include grid-style
6  
-
7 4
 @media (min-width: 1200px) {
8 5
 
9 6
   // Fixed grid
6  lib/_responsive-767px-max.scss
... ...
@@ -1,10 +1,6 @@
1 1
 // UP TO LANDSCAPE PHONE
2 2
 // ---------------------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace @ with $
6  
-//  - replace . with @include for mixins
7  
-
8 4
 @media (max-width: 480px) {
9 5
 
10 6
   // Smooth out the collapsing/expanding nav
@@ -124,7 +120,7 @@
124 120
   [class*="span"],
125 121
   .row-fluid [class*="span"] {
126 122
     float: none;
127  
-    display: block;
  123
+    display: inline-block;
128 124
     width: auto;
129 125
     margin-left: 0;
130 126
   }
3  lib/_responsive-768px-979px.scss
... ...
@@ -1,9 +1,6 @@
1 1
 // PORTRAIT TABLET TO DEFAULT DESKTOP
2 2
 // ----------------------------------
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace #grid > .style with @include grid-style
6  
-
7 4
 @media (min-width: 768px) and (max-width: 979px) {
8 5
 
9 6
   // Fixed grid
18  lib/_responsive-navbar.scss
... ...
@@ -1,7 +1,3 @@
1  
-// Updates for SASS:
2  
-//  - replace @ with $
3  
-//  - replace . with @include for mixins
4  
-
5 1
 // TABLETS AND BELOW
6 2
 // -----------------
7 3
 @media (max-width: 979px) {
@@ -13,11 +9,18 @@
13 9
     padding-top: 0;
14 10
   }
15 11
   // Unfix the navbar
16  
-  .navbar-fixed-top {
  12
+  .navbar-fixed-top,
  13
+  .navbar-fixed-bottom {
17 14
     position: static;
  15
+  }
  16
+  .navbar-fixed-top {
18 17
     margin-bottom: $baseLineHeight;
19 18
   }
20  
-  .navbar-fixed-top .navbar-inner {
  19
+  .navbar-fixed-bottom {
  20
+    margin-top: $baseLineHeight;
  21
+  }
  22
+  .navbar-fixed-top .navbar-inner,
  23
+  .navbar-fixed-bottom .navbar-inner {
21 24
     padding: 5px;
22 25
   }
23 26
   .navbar .container {
@@ -111,8 +114,7 @@
111 114
     margin: ($baseLineHeight / 2) 0;
112 115
     border-top: 1px solid $navbarBackground;
113 116
     border-bottom: 1px solid $navbarBackground;
114  
-    $shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
115  
-    @include box-shadow($shadow);
  117
+    @include box-shadow(#{inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)});
116 118
   }
117 119
   // Pull right (secondary) nav content
118 120
   .navbar .nav-collapse .nav.pull-right {
3  lib/_responsive-utilities.scss
... ...
@@ -1,9 +1,6 @@
1 1
 // RESPONSIVE CLASSES
2 2
 // ------------------
3 3
 
4  
-// Updates for SASS:
5  
-//  - none!
6  
-
7 4
 // Hide from screenreaders and browsers
8 5
 // Credit: HTML5 Boilerplate
9 6
 .hidden {
2  lib/_scaffolding.scss
@@ -2,8 +2,6 @@
2 2
 // Basic and global styles for generating a grid system, structural layout, and page templates
3 3
 // -------------------------------------------------------------------------------------------
4 4
 
5  
-// Updates for SASS:
6  
-//  - replace @ with $
7 5
 
8 6
 // Body reset
9 7
 // ----------
3  lib/_sprites.scss
@@ -2,9 +2,6 @@
2 2
 // Glyphs and icons for buttons, nav, and more
3 3
 // -------------------------------------------
4 4
 
5  
-// Updates for SASS:
6  
-//  - replace $ with $
7  
-//  - replace . with @include for mixins
8 5
 
9 6
 // ICONS
10 7
 // -----
8  lib/_tables.scss
... ...
@@ -1,12 +1,8 @@
1 1
 //
2  
-// Tables.less
  2
+// Tables
3 3
 // Tables for, you guessed it, tabular data
4 4
 // ----------------------------------------
5 5
 
6  
-// Updates for SASS:
7  
-//  - replace @ with $
8  
-//  - replace . with @include for mixins
9  
-//  - use an iterator to generate table column .spanX classes
10 6
 
11 7
 // BASE TABLES
12 8
 // -----------------
@@ -153,7 +149,7 @@ table {
153 149
 
154 150
 // Change the columns
155 151
 table {
156  
-  @for $i from 1 through 24 {
  152
+  @for $i from 1 through $gridColumns {
157 153
     .span#{$i} { @include tableColumns($i); }
158 154
   }
159 155
 }
4  lib/_thumbnails.scss
@@ -2,10 +2,6 @@
2 2
 // ----------
3 3
 // Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
4 4
 
5  
-// Updates for SASS:
6  
-//  - replace @ with $
7  
-//  - replace . with @include for mixins
8  
-
9 5
 // Make wrapper ul behave like the grid
10 6
 .thumbnails {
11 7
   margin-left: -$gridGutterWidth;
4  lib/_tooltip.scss
... ...
@@ -1,10 +1,6 @@
1 1
 // TOOLTIP
2 2
 // ------=
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace @ with $
6  
-//  - replace . with @include for mixins
7  
-
8 4
 .tooltip {
9 5
   position: absolute;
10 6
   z-index: $zindexTooltip;
8  lib/_type.scss
... ...
@@ -1,11 +1,7 @@
1  
-// Typography.less
  1
+// Typography
2 2
 // Headings, body text, lists, code, and more for a versatile and durable typography system
3 3
 // ----------------------------------------------------------------------------------------
4 4
 
5  
-// Updates for SASS:
6  
-//  - replace @ with $
7  
-//  - replace . with @include for mixins
8  
-//  - use font-shorthand instead of #font > .shorthand
9 5
 
10 6
 // BODY TEXT
11 7
 // ---------
@@ -175,7 +171,7 @@ em {
175 171
 // Abbreviations and acronyms
176 172
 abbr[title] {
177 173
   cursor: help;
178  
-  border-bottom: 1px dotted #ddd;
  174
+  border-bottom: 1px dotted $grayLight;
179 175
 }
180 176
 abbr.initialism {
181 177
   font-size: 90%;
3  lib/_utilities.scss
... ...
@@ -1,9 +1,6 @@
1 1
 // UTILITY CLASSES
2 2
 // ---------------
3 3
 
4  
-// Updates for SASS:
5  
-//  - none!
6  
-
7 4
 // Quick floats
8 5
 .pull-right {
9 6
   float: right;
8  lib/_variables.scss
... ...
@@ -1,11 +1,8 @@
1  
-// Variables.less
  1
+// Variables
2 2
 // Variables to customize the look and feel of Bootstrap
3 3
 // -----------------------------------------------------
4 4
 
5  
-// Updated for SASS:
6  
-//  - replace @ with $
7  
-//  - replace `spin` with `adjust-hue`
8  
-//  - add !default to variable definitions
  5
+
9 6
 
10 7
 // GLOBAL VALUES
11 8
 // --------------------------------------------------
@@ -113,7 +110,6 @@ $dropdownLinkBackgroundHover:   $linkColor !default;
113 110
 
114 111
 
115 112
 
116  
-
117 113
 // COMPONENT VARIABLES
118 114
 // --------------------------------------------------
119 115
 
3  lib/_wells.scss
... ...
@@ -1,9 +1,6 @@
1 1
 // WELLS
2 2
 // -----
3 3
 
4  
-// Updates for SASS:
5  
-//  - replace . with @include for mixins
6  
-
7 4
 .well {
8 5
   min-height: 20px;
9 6
   padding: 19px;
4  lib/bootstrap.scss
@@ -8,10 +8,6 @@
8 8
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
9 9
  */
10 10
 
11  
-// Updated for SASS:
12  
-//  - remove .less on import filenames
13  
-//  - move @import for reset below mixins, because it uses tab-focus mixin
14  
-
15 11
 // Core variables and mixins
16 12
 @import "variables"; // Modify this for custom colors, font-sizes, etc
17 13
 @import "mixins";
4  lib/responsive.scss
@@ -9,12 +9,10 @@
9 9
  */
10 10
 
11 11
 
12  
-// Responsive.less
  12
+// Responsive
13 13
 // For phone and tablet devices
14 14
 // -------------------------------------------------------------
15 15
 
16  
-// Updates for SASS:
17  
-//  - remove .less from import filenames
18 16
 
19 17
 // REPEAT VARIABLES & MIXINS
20 18
 // -------------------------

0 notes on commit 2e84ca7

Please sign in to comment.
Something went wrong with that request. Please try again.