sass-twitter-bootstrap 0.1.0 → 2.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (245) hide show
  1. data/lib/{sass-twitter-bootstrap.rb → sass/twitter/bootstrap.rb} +1 -1
  2. data/lib/sass/twitter/bootstrap/rails.rb +1 -5
  3. data/lib/sass/twitter/bootstrap/rails/engine.rb +12 -0
  4. data/lib/sass/twitter/bootstrap/version.rb +1 -1
  5. data/vendor/assets/images/glyphicons-halflings-white.png +0 -0
  6. data/vendor/assets/images/glyphicons-halflings.png +0 -0
  7. data/vendor/assets/javascripts/twitter/bootstrap-alert.js +32 -28
  8. data/vendor/assets/javascripts/twitter/bootstrap-button.js +33 -29
  9. data/vendor/assets/javascripts/twitter/bootstrap-carousel.js +21 -33
  10. data/vendor/assets/javascripts/twitter/bootstrap-collapse.js +26 -47
  11. data/vendor/assets/javascripts/twitter/bootstrap-dropdown.js +10 -18
  12. data/vendor/assets/javascripts/twitter/bootstrap-modal.js +17 -25
  13. data/vendor/assets/javascripts/twitter/bootstrap-popover.js +10 -13
  14. data/vendor/assets/javascripts/twitter/bootstrap-scrollspy.js +18 -44
  15. data/vendor/assets/javascripts/twitter/bootstrap-tab.js +7 -12
  16. data/vendor/assets/javascripts/twitter/bootstrap-tooltip.js +35 -40
  17. data/vendor/assets/javascripts/twitter/bootstrap-transition.js +20 -30
  18. data/vendor/assets/javascripts/twitter/bootstrap-typeahead.js +15 -29
  19. data/vendor/assets/stylesheets/tests/buttons.html +139 -0
  20. data/vendor/assets/stylesheets/tests/css-tests.css +99 -1
  21. data/vendor/assets/stylesheets/tests/css-tests.html +519 -37
  22. data/vendor/assets/stylesheets/tests/forms-responsive.html +71 -0
  23. data/vendor/assets/stylesheets/tests/navbar-fixed-top.html +104 -0
  24. data/vendor/assets/stylesheets/tests/navbar-static-top.html +107 -0
  25. data/vendor/assets/stylesheets/tests/navbar.html +38 -39
  26. data/vendor/assets/stylesheets/twitter/_accordion.scss +0 -5
  27. data/vendor/assets/stylesheets/twitter/_alerts.scss +15 -3
  28. data/vendor/assets/stylesheets/twitter/_breadcrumbs.scss +0 -2
  29. data/vendor/assets/stylesheets/twitter/_button-groups.scss +32 -76
  30. data/vendor/assets/stylesheets/twitter/_buttons.scss +25 -33
  31. data/vendor/assets/stylesheets/twitter/_close.scss +1 -12
  32. data/vendor/assets/stylesheets/twitter/_code.scss +8 -8
  33. data/vendor/assets/stylesheets/twitter/_component-animations.scss +7 -9
  34. data/vendor/assets/stylesheets/twitter/_dropdowns.scss +45 -58
  35. data/vendor/assets/stylesheets/twitter/_forms.scss +146 -206
  36. data/vendor/assets/stylesheets/twitter/_grid.scss +5 -2
  37. data/vendor/assets/stylesheets/twitter/_hero-unit.scss +1 -3
  38. data/vendor/assets/stylesheets/twitter/_labels.scss +32 -0
  39. data/vendor/assets/stylesheets/twitter/_layouts.scss +2 -2
  40. data/vendor/assets/stylesheets/twitter/_mixins.scss +208 -273
  41. data/vendor/assets/stylesheets/twitter/_modals.scss +8 -14
  42. data/vendor/assets/stylesheets/twitter/_navbar.scss +73 -132
  43. data/vendor/assets/stylesheets/twitter/_navs.scss +43 -53
  44. data/vendor/assets/stylesheets/twitter/_pager.scss +0 -6
  45. data/vendor/assets/stylesheets/twitter/_pagination.scss +0 -1
  46. data/vendor/assets/stylesheets/twitter/_progress-bars.scss +6 -28
  47. data/vendor/assets/stylesheets/twitter/_reset.scss +4 -9
  48. data/vendor/assets/stylesheets/twitter/_scaffolding.scss +8 -4
  49. data/vendor/assets/stylesheets/twitter/_sprites.scss +7 -40
  50. data/vendor/assets/stylesheets/twitter/_tables.scss +33 -38
  51. data/vendor/assets/stylesheets/twitter/_thumbnails.scss +2 -14
  52. data/vendor/assets/stylesheets/twitter/_tooltip.scss +1 -1
  53. data/vendor/assets/stylesheets/twitter/_type.scss +14 -28
  54. data/vendor/assets/stylesheets/twitter/_variables.scss +19 -116
  55. data/vendor/assets/stylesheets/twitter/_wells.scss +0 -10
  56. data/vendor/assets/stylesheets/twitter/bootstrap.scss +7 -3
  57. data/vendor/assets/stylesheets/twitter/responsive.scss +301 -15
  58. metadata +25 -190
  59. data/.gitignore +0 -4
  60. data/Gemfile +0 -3
  61. data/Gemfile.lock +0 -14
  62. data/LICENSE +0 -176
  63. data/Makefile +0 -94
  64. data/README.md +0 -217
  65. data/Rakefile +0 -52
  66. data/bootstrap-2.0.4.css +0 -4661
  67. data/bootstrap-2.0.4.min.css +0 -9
  68. data/bootstrap-responsive-2.0.4.css +0 -932
  69. data/bootstrap-responsive-2.0.4.min.css +0 -9
  70. data/docs/assets/css/bootstrap-responsive.css +0 -932
  71. data/docs/assets/css/bootstrap.css +0 -4661
  72. data/docs/assets/css/docs.css +0 -846
  73. data/docs/assets/ico/apple-touch-icon-114-precomposed.png +0 -0
  74. data/docs/assets/ico/apple-touch-icon-144-precomposed.png +0 -0
  75. data/docs/assets/ico/apple-touch-icon-57-precomposed.png +0 -0
  76. data/docs/assets/ico/apple-touch-icon-72-precomposed.png +0 -0
  77. data/docs/assets/ico/favicon.ico +0 -0
  78. data/docs/assets/img/bird.png +0 -0
  79. data/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg +0 -0
  80. data/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg +0 -0
  81. data/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg +0 -0
  82. data/docs/assets/img/browsers.png +0 -0
  83. data/docs/assets/img/example-sites/fleetio.png +0 -0
  84. data/docs/assets/img/example-sites/jshint.png +0 -0
  85. data/docs/assets/img/example-sites/kippt.png +0 -0
  86. data/docs/assets/img/example-sites/soundready.png +0 -0
  87. data/docs/assets/img/examples/bootstrap-example-fluid.jpg +0 -0
  88. data/docs/assets/img/examples/bootstrap-example-hero.jpg +0 -0
  89. data/docs/assets/img/examples/bootstrap-example-starter.jpg +0 -0
  90. data/docs/assets/img/github-16px.png +0 -0
  91. data/docs/assets/img/glyphicons-halflings-white.png +0 -0
  92. data/docs/assets/img/glyphicons-halflings.png +0 -0
  93. data/docs/assets/img/glyphicons/glyphicons_009_magic.png +0 -0
  94. data/docs/assets/img/glyphicons/glyphicons_042_group.png +0 -0
  95. data/docs/assets/img/glyphicons/glyphicons_079_podium.png +0 -0
  96. data/docs/assets/img/glyphicons/glyphicons_082_roundabout.png +0 -0
  97. data/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png +0 -0
  98. data/docs/assets/img/glyphicons/glyphicons_163_iphone.png +0 -0
  99. data/docs/assets/img/glyphicons/glyphicons_214_resize_small.png +0 -0
  100. data/docs/assets/img/glyphicons/glyphicons_266_book_open.png +0 -0
  101. data/docs/assets/img/grid-18px-masked.png +0 -0
  102. data/docs/assets/img/icon-css3.png +0 -0
  103. data/docs/assets/img/icon-github.png +0 -0
  104. data/docs/assets/img/icon-html5.png +0 -0
  105. data/docs/assets/img/icon-twitter.png +0 -0
  106. data/docs/assets/img/less-logo-large.png +0 -0
  107. data/docs/assets/img/less-small.png +0 -0
  108. data/docs/assets/img/responsive-illustrations.png +0 -0
  109. data/docs/assets/js/README.md +0 -106
  110. data/docs/assets/js/application.js +0 -184
  111. data/docs/assets/js/bootstrap-alert.js +0 -90
  112. data/docs/assets/js/bootstrap-button.js +0 -96
  113. data/docs/assets/js/bootstrap-carousel.js +0 -169
  114. data/docs/assets/js/bootstrap-collapse.js +0 -157
  115. data/docs/assets/js/bootstrap-dropdown.js +0 -100
  116. data/docs/assets/js/bootstrap-modal.js +0 -218
  117. data/docs/assets/js/bootstrap-popover.js +0 -98
  118. data/docs/assets/js/bootstrap-scrollspy.js +0 -151
  119. data/docs/assets/js/bootstrap-tab.js +0 -135
  120. data/docs/assets/js/bootstrap-tooltip.js +0 -275
  121. data/docs/assets/js/bootstrap-transition.js +0 -61
  122. data/docs/assets/js/bootstrap-typeahead.js +0 -285
  123. data/docs/assets/js/bootstrap.js +0 -1825
  124. data/docs/assets/js/bootstrap.min.js +0 -6
  125. data/docs/assets/js/google-code-prettify/prettify.css +0 -30
  126. data/docs/assets/js/google-code-prettify/prettify.js +0 -28
  127. data/docs/assets/js/jquery.js +0 -9252
  128. data/docs/base-css.html +0 -1710
  129. data/docs/build/index.js +0 -44
  130. data/docs/build/node_modules/.bin/hulk +0 -93
  131. data/docs/build/node_modules/hogan.js/.git_ignore +0 -1
  132. data/docs/build/node_modules/hogan.js/.gitmodules +0 -3
  133. data/docs/build/node_modules/hogan.js/LICENSE +0 -177
  134. data/docs/build/node_modules/hogan.js/Makefile +0 -62
  135. data/docs/build/node_modules/hogan.js/README.md +0 -93
  136. data/docs/build/node_modules/hogan.js/bin/hulk +0 -93
  137. data/docs/build/node_modules/hogan.js/lib/compiler.js +0 -348
  138. data/docs/build/node_modules/hogan.js/lib/hogan.js +0 -20
  139. data/docs/build/node_modules/hogan.js/lib/template.js +0 -233
  140. data/docs/build/node_modules/hogan.js/package.json +0 -20
  141. data/docs/build/node_modules/hogan.js/test/html/list.html +0 -8
  142. data/docs/build/node_modules/hogan.js/test/index.html +0 -13
  143. data/docs/build/node_modules/hogan.js/test/index.js +0 -848
  144. data/docs/build/node_modules/hogan.js/test/mustache.js +0 -90
  145. data/docs/build/node_modules/hogan.js/test/spec.js +0 -77
  146. data/docs/build/node_modules/hogan.js/test/spec/Changes +0 -31
  147. data/docs/build/node_modules/hogan.js/test/spec/README.md +0 -65
  148. data/docs/build/node_modules/hogan.js/test/spec/Rakefile +0 -27
  149. data/docs/build/node_modules/hogan.js/test/spec/TESTING.md +0 -46
  150. data/docs/build/node_modules/hogan.js/test/spec/specs/comments.json +0 -1
  151. data/docs/build/node_modules/hogan.js/test/spec/specs/comments.yml +0 -103
  152. data/docs/build/node_modules/hogan.js/test/spec/specs/delimiters.json +0 -1
  153. data/docs/build/node_modules/hogan.js/test/spec/specs/delimiters.yml +0 -158
  154. data/docs/build/node_modules/hogan.js/test/spec/specs/interpolation.json +0 -1
  155. data/docs/build/node_modules/hogan.js/test/spec/specs/interpolation.yml +0 -230
  156. data/docs/build/node_modules/hogan.js/test/spec/specs/inverted.json +0 -1
  157. data/docs/build/node_modules/hogan.js/test/spec/specs/inverted.yml +0 -193
  158. data/docs/build/node_modules/hogan.js/test/spec/specs/partials.json +0 -1
  159. data/docs/build/node_modules/hogan.js/test/spec/specs/partials.yml +0 -109
  160. data/docs/build/node_modules/hogan.js/test/spec/specs/sections.json +0 -1
  161. data/docs/build/node_modules/hogan.js/test/spec/specs/sections.yml +0 -256
  162. data/docs/build/node_modules/hogan.js/test/spec/specs/~lambdas.json +0 -1
  163. data/docs/build/node_modules/hogan.js/test/spec/specs/~lambdas.yml +0 -149
  164. data/docs/build/node_modules/hogan.js/test/templates/list.mustache +0 -8
  165. data/docs/build/node_modules/hogan.js/tools/release.js +0 -74
  166. data/docs/build/node_modules/hogan.js/tools/web_templates.js +0 -32
  167. data/docs/build/node_modules/hogan.js/web/1.0.0/hogan.js +0 -500
  168. data/docs/build/node_modules/hogan.js/web/1.0.0/hogan.min.js +0 -14
  169. data/docs/build/node_modules/hogan.js/web/builds/1.0.0/hogan.js +0 -500
  170. data/docs/build/node_modules/hogan.js/web/builds/1.0.0/hogan.min.js +0 -14
  171. data/docs/build/node_modules/hogan.js/web/builds/1.0.3/hogan.js +0 -545
  172. data/docs/build/node_modules/hogan.js/web/builds/1.0.3/hogan.min.js +0 -5
  173. data/docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.amd.js +0 -576
  174. data/docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.common.js +0 -576
  175. data/docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.js +0 -572
  176. data/docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.min.amd.js +0 -5
  177. data/docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.min.common.js +0 -5
  178. data/docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.min.js +0 -5
  179. data/docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.min.mustache.js +0 -5
  180. data/docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.mustache.js +0 -619
  181. data/docs/build/node_modules/hogan.js/web/builds/1.0.5/template-1.0.5.js +0 -233
  182. data/docs/build/node_modules/hogan.js/web/builds/1.0.5/template-1.0.5.min.js +0 -5
  183. data/docs/build/node_modules/hogan.js/web/favicon.ico +0 -0
  184. data/docs/build/node_modules/hogan.js/web/images/logo.png +0 -0
  185. data/docs/build/node_modules/hogan.js/web/images/noise.png +0 -0
  186. data/docs/build/node_modules/hogan.js/web/images/small-hogan-icon.png +0 -0
  187. data/docs/build/node_modules/hogan.js/web/images/stripes.png +0 -0
  188. data/docs/build/node_modules/hogan.js/web/index.html.mustache +0 -139
  189. data/docs/build/node_modules/hogan.js/web/stylesheets/layout.css +0 -206
  190. data/docs/build/node_modules/hogan.js/web/stylesheets/skeleton.css +0 -236
  191. data/docs/build/node_modules/hogan.js/wrappers/amd.js.mustache +0 -21
  192. data/docs/build/node_modules/hogan.js/wrappers/common.js.mustache +0 -21
  193. data/docs/build/node_modules/hogan.js/wrappers/js.mustache +0 -17
  194. data/docs/build/node_modules/hogan.js/wrappers/mustache.js.mustache +0 -64
  195. data/docs/build/package.json +0 -6
  196. data/docs/components.html +0 -1931
  197. data/docs/download.html +0 -454
  198. data/docs/examples.html +0 -147
  199. data/docs/examples/fluid.html +0 -162
  200. data/docs/examples/hero.html +0 -109
  201. data/docs/examples/starter-template.html +0 -79
  202. data/docs/index.html +0 -259
  203. data/docs/javascript.html +0 -1520
  204. data/docs/less.html +0 -1060
  205. data/docs/scaffolding.html +0 -671
  206. data/docs/templates/layout.mustache +0 -146
  207. data/docs/templates/pages/base-css.mustache +0 -1594
  208. data/docs/templates/pages/components.mustache +0 -1815
  209. data/docs/templates/pages/download.mustache +0 -338
  210. data/docs/templates/pages/examples.mustache +0 -31
  211. data/docs/templates/pages/index.mustache +0 -144
  212. data/docs/templates/pages/javascript.mustache +0 -1405
  213. data/docs/templates/pages/less.mustache +0 -944
  214. data/docs/templates/pages/scaffolding.mustache +0 -555
  215. data/docs/templates/pages/upgrading.mustache +0 -194
  216. data/docs/upgrading.html +0 -310
  217. data/js/tests/index.html +0 -54
  218. data/js/tests/phantom.js +0 -63
  219. data/js/tests/server.js +0 -14
  220. data/js/tests/unit/bootstrap-alert.js +0 -56
  221. data/js/tests/unit/bootstrap-button.js +0 -77
  222. data/js/tests/unit/bootstrap-carousel.js +0 -28
  223. data/js/tests/unit/bootstrap-collapse.js +0 -54
  224. data/js/tests/unit/bootstrap-dropdown.js +0 -87
  225. data/js/tests/unit/bootstrap-modal.js +0 -114
  226. data/js/tests/unit/bootstrap-phantom.js +0 -21
  227. data/js/tests/unit/bootstrap-popover.js +0 -93
  228. data/js/tests/unit/bootstrap-scrollspy.js +0 -31
  229. data/js/tests/unit/bootstrap-tab.js +0 -61
  230. data/js/tests/unit/bootstrap-tooltip.js +0 -155
  231. data/js/tests/unit/bootstrap-transition.js +0 -13
  232. data/js/tests/unit/bootstrap-typeahead.js +0 -148
  233. data/js/tests/vendor/jquery.js +0 -9252
  234. data/js/tests/vendor/qunit.css +0 -232
  235. data/js/tests/vendor/qunit.js +0 -1510
  236. data/package.json +0 -25
  237. data/sass-twitter-bootstrap.gemspec +0 -19
  238. data/vendor/assets/javascripts/README.md +0 -112
  239. data/vendor/assets/javascripts/twitter/bootstrap.js +0 -12
  240. data/vendor/assets/stylesheets/twitter/_labels-badges.scss +0 -52
  241. data/vendor/assets/stylesheets/twitter/_responsive-1200px-min.scss +0 -26
  242. data/vendor/assets/stylesheets/twitter/_responsive-767px-max.scss +0 -149
  243. data/vendor/assets/stylesheets/twitter/_responsive-768px-979px.scss +0 -17
  244. data/vendor/assets/stylesheets/twitter/_responsive-navbar.scss +0 -153
  245. data/vendor/assets/stylesheets/twitter/_responsive-utilities.scss +0 -41
@@ -1,5 +1,8 @@
1
+ // GRID SYSTEM
2
+ // -----------
3
+
1
4
  // Fixed (940px)
2
- @include grid-core($gridColumnWidth, $gridGutterWidth);
5
+ @include gridSystem-generate($gridColumns, $gridColumnWidth, $gridGutterWidth);
3
6
 
4
7
  // Fluid (940px)
5
- @include grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth);
8
+ @include fluidGridSystem-generate($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth);
@@ -4,19 +4,17 @@
4
4
  .hero-unit {
5
5
  padding: 60px;
6
6
  margin-bottom: 30px;
7
- background-color: $heroUnitBackground;
7
+ background-color: #f5f5f5;
8
8
  @include border-radius(6px);
9
9
  h1 {
10
10
  margin-bottom: 0;
11
11
  font-size: 60px;
12
12
  line-height: 1;
13
- color: $heroUnitHeadingColor;
14
13
  letter-spacing: -1px;
15
14
  }
16
15
  p {
17
16
  font-size: 18px;
18
17
  font-weight: 200;
19
18
  line-height: $baseLineHeight * 1.5;
20
- color: $heroUnitLeadColor;
21
19
  }
22
20
  }
@@ -0,0 +1,32 @@
1
+ // LABELS
2
+ // ------
3
+
4
+ // Base
5
+ .label {
6
+ padding: 2px 4px 3px;
7
+ font-size: $baseFontSize * .85;
8
+ font-weight: bold;
9
+ color: $white;
10
+ text-shadow: 0 -1px 0 rgba(0,0,0,.25);
11
+ background-color: $grayLight;
12
+ @include border-radius(3px);
13
+ }
14
+
15
+ // Hover state
16
+ .label:hover {
17
+ color: $white;
18
+ text-decoration: none;
19
+ }
20
+
21
+ // Colors
22
+ .label-important { background-color: $errorText; }
23
+ .label-important:hover { background-color: darken($errorText, 10%); }
24
+
25
+ .label-warning { background-color: $orange; }
26
+ .label-warning:hover { background-color: darken($orange, 10%); }
27
+
28
+ .label-success { background-color: $successText; }
29
+ .label-success:hover { background-color: darken($successText, 10%); }
30
+
31
+ .label-info { background-color: $infoText; }
32
+ .label-info:hover { background-color: darken($infoText, 10%); }
@@ -11,7 +11,7 @@
11
11
 
12
12
  // Fluid layouts (left aligned, with sidebar, min- & max-width content)
13
13
  .container-fluid {
14
- padding-right: $gridGutterWidth;
15
14
  padding-left: $gridGutterWidth;
15
+ padding-right: $gridGutterWidth;
16
16
  @include clearfix();
17
- }
17
+ }
@@ -1,4 +1,4 @@
1
- // Mixins
1
+ // Mixins.scss
2
2
  // Snippets of reusable CSS to develop faster and keep code readable
3
3
  // -----------------------------------------------------------------
4
4
 
@@ -9,7 +9,7 @@
9
9
  // Clearfix
10
10
  // --------
11
11
  // For clearing floats like a boss h5bp.com/q
12
- @mixin clearfix {
12
+ @mixin clearfix() {
13
13
  *zoom: 1;
14
14
  &:before,
15
15
  &:after {
@@ -21,10 +21,6 @@
21
21
  }
22
22
  }
23
23
 
24
- .clearfix {
25
- @include clearfix();
26
- }
27
-
28
24
  // Webkit-style focus
29
25
  // ------------------
30
26
  @mixin tab-focus() {
@@ -46,7 +42,7 @@
46
42
  // IE7 inline-block
47
43
  // ----------------
48
44
  @mixin ie7-inline-block() {
49
- *display: inline; // IE7 inline-block hack
45
+ *display: inline; /* IE7 inline-block hack */
50
46
  *zoom: 1;
51
47
  }
52
48
 
@@ -74,11 +70,11 @@
74
70
 
75
71
  // Sizing shortcuts
76
72
  // -------------------------
77
- @mixin size($height, $width) {
73
+ @mixin size($height: 5px, $width: 5px) {
78
74
  width: $width;
79
75
  height: $height;
80
76
  }
81
- @mixin square($size) {
77
+ @mixin square($size: 5px) {
82
78
  @include size($size, $size);
83
79
  }
84
80
 
@@ -88,9 +84,6 @@
88
84
  :-moz-placeholder {
89
85
  color: $color;
90
86
  }
91
- :-ms-input-placeholder {
92
- color: $color;
93
- }
94
87
  ::-webkit-input-placeholder {
95
88
  color: $color;
96
89
  }
@@ -105,32 +98,20 @@
105
98
  white-space: nowrap;
106
99
  }
107
100
 
108
- // CSS image replacement
109
- // -------------------------
110
- // Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
111
- @mixin hide-text {
112
- font: 0/0 a;
113
- color: transparent;
114
- text-shadow: none;
115
- background-color: transparent;
116
- border: 0;
117
- }
118
101
 
119
- .hide-text {
120
- @include hide-text();
121
- }
122
102
 
123
103
  // FONTS
124
104
  // --------------------------------------------------
125
105
 
126
- @mixin font-family-serif() {
127
- font-family: $serifFontFamily;
106
+ // Font Stacks
107
+ @mixin font-family-serif {
108
+ font-family: Georgia, "Times New Roman", Times, serif;
128
109
  }
129
- @mixin font-family-sans-serif() {
130
- font-family: $sansFontFamily;
110
+ @mixin font-family-sans-serif {
111
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
131
112
  }
132
- @mixin font-family-monospace() {
133
- font-family: $monoFontFamily;
113
+ @mixin font-family-monospace {
114
+ font-family: Menlo, Monaco, "Courier New", monospace;
134
115
  }
135
116
  @mixin font-shorthand($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
136
117
  font-size: $size;
@@ -138,31 +119,167 @@
138
119
  line-height: $lineHeight;
139
120
  }
140
121
  @mixin font-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
141
- @include font-family-serif();
122
+ @include font-family-serif;
142
123
  @include font-shorthand($size, $weight, $lineHeight);
143
124
  }
144
125
  @mixin font-sans-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
145
- @include font-family-sans-serif();
126
+ @include font-family-sans-serif;
146
127
  @include font-shorthand($size, $weight, $lineHeight);
147
128
  }
148
129
  @mixin font-monospace($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
149
- @include font-family-monospace();
130
+ @include font-family-monospace;
150
131
  @include font-shorthand($size, $weight, $lineHeight);
151
132
  }
152
133
 
153
134
 
154
- // FORMS
135
+
136
+ // GRID SYSTEM
155
137
  // --------------------------------------------------
156
138
 
157
- // Block level inputs
158
- @mixin input-block-level {
159
- display: block;
160
- width: 100%;
161
- min-height: 28px; // Make inputs at least the height of their button counterpart
162
- @include box-sizing(border-box); // Makes inputs behave like true block-level elements
139
+ // Site container
140
+ // -------------------------
141
+ @mixin container-fixed() {
142
+ width: $gridRowWidth;
143
+ margin-left: auto;
144
+ margin-right: auto;
145
+ @include clearfix();
146
+ }
147
+
148
+ // Le grid system
149
+ // -------------------------
150
+ @mixin gridSystem-columns ($gridGutterWidth, $gridColumnWidth, $gridRowWidth, $columns) {
151
+ width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
152
+ }
153
+ @mixin gridSystem-offset($gridColumnWidth, $gridGutterWidth, $columns) {
154
+ margin-left: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1)) + ($gridGutterWidth * 2);
155
+ }
156
+ @mixin gridSystem-gridColumn($gridGutterWidth) {
157
+ float: left;
158
+ margin-left: $gridGutterWidth;
159
+ }
160
+
161
+ // Take these values and mixins, and make 'em do their thang
162
+ @mixin gridSystem-generate($gridColumns, $gridColumnWidth, $gridGutterWidth) {
163
+ // Row surrounds the columns
164
+ .row {
165
+ margin-left: $gridGutterWidth * -1;
166
+ @include clearfix();
167
+ }
168
+ // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7, thanks $dhg)
169
+ [class*="span"] {
170
+ @include gridSystem-gridColumn($gridGutterWidth);
171
+ }
172
+ // Default columns
173
+ .span1 { @include gridSystem-columns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 1); }
174
+ .span2 { @include gridSystem-columns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 2); }
175
+ .span3 { @include gridSystem-columns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 3); }
176
+ .span4 { @include gridSystem-columns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 4); }
177
+ .span5 { @include gridSystem-columns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 5); }
178
+ .span6 { @include gridSystem-columns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 6); }
179
+ .span7 { @include gridSystem-columns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 7); }
180
+ .span8 { @include gridSystem-columns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 8); }
181
+ .span9 { @include gridSystem-columns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 9); }
182
+ .span10 { @include gridSystem-columns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 10); }
183
+ .span11 { @include gridSystem-columns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 11); }
184
+ .span12,
185
+ .container { @include gridSystem-columns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 12); }
186
+ // Offset column options
187
+ .offset1 { @include gridSystem-offset($gridColumnWidth, $gridGutterWidth, 1); }
188
+ .offset2 { @include gridSystem-offset($gridColumnWidth, $gridGutterWidth, 2); }
189
+ .offset3 { @include gridSystem-offset($gridColumnWidth, $gridGutterWidth, 3); }
190
+ .offset4 { @include gridSystem-offset($gridColumnWidth, $gridGutterWidth, 4); }
191
+ .offset5 { @include gridSystem-offset($gridColumnWidth, $gridGutterWidth, 5); }
192
+ .offset6 { @include gridSystem-offset($gridColumnWidth, $gridGutterWidth, 6); }
193
+ .offset7 { @include gridSystem-offset($gridColumnWidth, $gridGutterWidth, 7); }
194
+ .offset8 { @include gridSystem-offset($gridColumnWidth, $gridGutterWidth, 8); }
195
+ .offset9 { @include gridSystem-offset($gridColumnWidth, $gridGutterWidth, 9); }
196
+ .offset10 { @include gridSystem-offset($gridColumnWidth, $gridGutterWidth, 10); }
197
+ .offset11 { @include gridSystem-offset($gridColumnWidth, $gridGutterWidth, 11); }
198
+ }
199
+
200
+ // Fluid grid system
201
+ // -------------------------
202
+ @mixin fluidGridSystem-columns($fluidGridGutterWidth, $fluidGridColumnWidth, $columns) {
203
+ width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1));
204
+ }
205
+ @mixin fluidGridSystem-gridColumn($fluidGridGutterWidth) {
206
+ float: left;
207
+ margin-left: $fluidGridGutterWidth;
208
+ }
209
+ // Take these values and mixins, and make 'em do their thang
210
+ @mixin fluidGridSystem-generate($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
211
+ // Row surrounds the columns
212
+ .row-fluid {
213
+ width: 100%;
214
+ @include clearfix();
215
+
216
+ // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7, thanks $dhg)
217
+ > [class*="span"] {
218
+ @include fluidGridSystem-gridColumn($fluidGridGutterWidth);
219
+ }
220
+ > [class*="span"]:first-child {
221
+ margin-left: 0;
222
+ }
223
+ // Default columns
224
+ > .span1 { @include fluidGridSystem-columns($fluidGridGutterWidth, $fluidGridColumnWidth, 1); }
225
+ > .span2 { @include fluidGridSystem-columns($fluidGridGutterWidth, $fluidGridColumnWidth, 2); }
226
+ > .span3 { @include fluidGridSystem-columns($fluidGridGutterWidth, $fluidGridColumnWidth, 3); }
227
+ > .span4 { @include fluidGridSystem-columns($fluidGridGutterWidth, $fluidGridColumnWidth, 4); }
228
+ > .span5 { @include fluidGridSystem-columns($fluidGridGutterWidth, $fluidGridColumnWidth, 5); }
229
+ > .span6 { @include fluidGridSystem-columns($fluidGridGutterWidth, $fluidGridColumnWidth, 6); }
230
+ > .span7 { @include fluidGridSystem-columns($fluidGridGutterWidth, $fluidGridColumnWidth, 7); }
231
+ > .span8 { @include fluidGridSystem-columns($fluidGridGutterWidth, $fluidGridColumnWidth, 8); }
232
+ > .span9 { @include fluidGridSystem-columns($fluidGridGutterWidth, $fluidGridColumnWidth, 9); }
233
+ > .span10 { @include fluidGridSystem-columns($fluidGridGutterWidth, $fluidGridColumnWidth, 10); }
234
+ > .span11 { @include fluidGridSystem-columns($fluidGridGutterWidth, $fluidGridColumnWidth, 11); }
235
+ > .span12 { @include fluidGridSystem-columns($fluidGridGutterWidth, $fluidGridColumnWidth, 12); }
236
+ }
237
+ }
238
+
239
+
240
+
241
+ // Input grid system
242
+ // -------------------------
243
+ @mixin inputGridSystem-inputColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, $columns) {
244
+ width: (($gridColumnWidth) * $columns) + ($gridGutterWidth * ($columns - 1)) - 10;
163
245
  }
246
+ @mixin inputGridSystem-generate($gridColumns, $gridColumnWidth, $gridGutterWidth) {
247
+ input,
248
+ textarea,
249
+ .uneditable-input {
250
+ &.span1 { @include inputGridSystem-inputColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 1); }
251
+ &.span2 { @include inputGridSystem-inputColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 2); }
252
+ &.span3 { @include inputGridSystem-inputColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 3); }
253
+ &.span4 { @include inputGridSystem-inputColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 4); }
254
+ &.span5 { @include inputGridSystem-inputColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 5); }
255
+ &.span6 { @include inputGridSystem-inputColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 6); }
256
+ &.span7 { @include inputGridSystem-inputColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 7); }
257
+ &.span8 { @include inputGridSystem-inputColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 8); }
258
+ &.span9 { @include inputGridSystem-inputColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 9); }
259
+ &.span10 { @include inputGridSystem-inputColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 10); }
260
+ &.span11 { @include inputGridSystem-inputColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 11); }
261
+ &.span12 { @include inputGridSystem-inputColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, 12); }
262
+ }
263
+ }
264
+
265
+ // Make a Grid
266
+ // -------------------------
267
+ // Use .makeRow and .makeColumn to assign semantic layouts grid system behavior
268
+ @mixin makeRow() {
269
+ margin-left: $gridGutterWidth * -1;
270
+ @include clearfix();
271
+ }
272
+ @mixin makeColumn($columns: 1) {
273
+ float: left;
274
+ margin-left: $gridGutterWidth;
275
+ width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
276
+ }
277
+
164
278
 
165
279
 
280
+ // Form field states (used in forms.scss)
281
+ // --------------------------------------------------
282
+
166
283
  // Mixin for form field states
167
284
  @mixin formFieldState($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5) {
168
285
  // Set the text color
@@ -172,8 +289,6 @@
172
289
  color: $textColor;
173
290
  }
174
291
  // Style inputs accordingly
175
- .checkbox,
176
- .radio,
177
292
  input,
178
293
  select,
179
294
  textarea {
@@ -199,14 +314,14 @@
199
314
  // --------------------------------------------------
200
315
 
201
316
  // Border Radius
202
- @mixin border-radius($radius) {
317
+ @mixin border-radius($radius: 5px) {
203
318
  -webkit-border-radius: $radius;
204
319
  -moz-border-radius: $radius;
205
320
  border-radius: $radius;
206
321
  }
207
322
 
208
323
  // Drop shadows
209
- @mixin box-shadow($shadow) {
324
+ @mixin box-shadow($shadow: 0 1px 3px rgba(0,0,0,.25)) {
210
325
  -webkit-box-shadow: $shadow;
211
326
  -moz-box-shadow: $shadow;
212
327
  box-shadow: $shadow;
@@ -236,23 +351,21 @@
236
351
  -o-transform: scale($ratio);
237
352
  transform: scale($ratio);
238
353
  }
239
- @mixin translate($x, $y) {
354
+ @mixin translate($x: 0, $y: 0) {
240
355
  -webkit-transform: translate($x, $y);
241
356
  -moz-transform: translate($x, $y);
242
357
  -ms-transform: translate($x, $y);
243
358
  -o-transform: translate($x, $y);
244
359
  transform: translate($x, $y);
245
360
  }
246
-
247
- @mixin skew($x, $y) {
361
+ @mixin skew($x: 0, $y: 0) {
248
362
  -webkit-transform: skew($x, $y);
249
363
  -moz-transform: skew($x, $y);
250
364
  -ms-transform: skew($x, $y);
251
365
  -o-transform: skew($x, $y);
252
366
  transform: skew($x, $y);
253
367
  }
254
-
255
- @mixin translate3d($x, $y, $z) {
368
+ @mixin translate3d($x: 0, $y: 0, $z: 0) {
256
369
  -webkit-transform: translate($x, $y, $z);
257
370
  -moz-transform: translate($x, $y, $z);
258
371
  -ms-transform: translate($x, $y, $z);
@@ -260,17 +373,6 @@
260
373
  transform: translate($x, $y, $z);
261
374
  }
262
375
 
263
- // Backface visibility
264
- // Prevent browsers from flickering when using CSS 3D transforms.
265
- // Default value is `visible`, but can be changed to `hidden
266
- // See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
267
- @mixin backface-visibility($visibility){
268
- -webkit-backface-visibility: $visibility;
269
- -moz-backface-visibility: $visibility;
270
- -ms-backface-visibility: $visibility;
271
- backface-visibility: $visibility;
272
- }
273
-
274
376
  // Background clipping
275
377
  // Heads up: FF 3.6 and under need "padding" instead of "padding-box"
276
378
  @mixin background-clip($clip) {
@@ -280,7 +382,7 @@
280
382
  }
281
383
 
282
384
  // Background sizing
283
- @mixin background-size($size) {
385
+ @mixin background-size($size){
284
386
  -webkit-background-size: $size;
285
387
  -moz-background-size: $size;
286
388
  -o-background-size: $size;
@@ -292,33 +394,26 @@
292
394
  @mixin box-sizing($boxmodel) {
293
395
  -webkit-box-sizing: $boxmodel;
294
396
  -moz-box-sizing: $boxmodel;
295
- -ms-box-sizing: $boxmodel;
296
397
  box-sizing: $boxmodel;
297
398
  }
298
399
 
299
- // Uses box-sizing mixin, so must be defined here
300
- .input-block-level {
301
- @include input-block-level();
302
- }
303
-
304
400
  // User select
305
401
  // For selecting text on the page
306
402
  @mixin user-select($select) {
307
403
  -webkit-user-select: $select;
308
404
  -moz-user-select: $select;
309
- -ms-user-select: $select;
310
405
  -o-user-select: $select;
311
406
  user-select: $select;
312
407
  }
313
408
 
314
409
  // Resize anything
315
- @mixin resizable($direction) {
410
+ @mixin resizable($direction: both) {
316
411
  resize: $direction; // Options: horizontal, vertical, both
317
412
  overflow: auto; // Safari fix
318
413
  }
319
414
 
320
415
  // CSS3 Content Columns
321
- @mixin content-columns($columnCount, $columnGap: $gridGutterWidth) {
416
+ @mixin content-columns($columnCount, $columnGap: $gridColumnGutter) {
322
417
  -webkit-column-count: $columnCount;
323
418
  -moz-column-count: $columnCount;
324
419
  column-count: $columnCount;
@@ -327,20 +422,10 @@
327
422
  column-gap: $columnGap;
328
423
  }
329
424
 
330
- // Optional hyphenation
331
- @mixin hyphens($mode: auto) {
332
- word-wrap: break-word;
333
- -webkit-hyphens: $mode;
334
- -moz-hyphens: $mode;
335
- -ms-hyphens: $mode;
336
- -o-hyphens: $mode;
337
- hyphens: $mode;
338
- }
339
-
340
425
  // Opacity
341
- @mixin opacity($opacity) {
426
+ @mixin opacity($opacity: 100) {
342
427
  opacity: $opacity / 100;
343
- filter: alpha(opacity=$opacity);
428
+ filter: alpha(opacity=$opacity);
344
429
  }
345
430
 
346
431
 
@@ -350,20 +435,14 @@
350
435
 
351
436
  // Add an alphatransparency value to any background or border color (via Elyse Holladay)
352
437
  @mixin translucent-background($color: $white, $alpha: 1) {
353
- background-color: hsla(hue($color), saturation($color), lightness($color), $alpha);
438
+ background-color: hsla(hue($color), saturation($color), lightness($color), $alpha);
354
439
  }
355
-
356
440
  @mixin translucent-border($color: $white, $alpha: 1) {
357
441
  border-color: hsla(hue($color), saturation($color), lightness($color), $alpha);
358
442
  @include background-clip(padding-box);
359
443
  }
360
444
 
361
- // Gradient Bar Colors for buttons and alerts
362
- @mixin gradientBar($primaryColor, $secondaryColor) {
363
- @include gradient-vertical($primaryColor, $secondaryColor);
364
- border-color: $secondaryColor $secondaryColor darken($secondaryColor, 15%);
365
- border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fade-in(rgba(0,0,0,.1), 0.15);
366
- }
445
+
367
446
 
368
447
  // Gradients
369
448
  @mixin gradient-horizontal($startColor: #555, $endColor: #333) {
@@ -375,7 +454,7 @@
375
454
  background-image: -o-linear-gradient(left, $startColor, $endColor); // Opera 11.10
376
455
  background-image: linear-gradient(left, $startColor, $endColor); // Le standard
377
456
  background-repeat: repeat-x;
378
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{darken($startColor, 1%)}', endColorstr='#{darken($endColor, 1%)}', GradientType=1); // IE9 and down
457
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$startColor}', endColorstr='#{$endColor}', GradientType=1), $startColor, $endColor; // IE9 and down
379
458
  }
380
459
  @mixin gradient-vertical($startColor: #555, $endColor: #333) {
381
460
  background-color: mix($startColor, $endColor, 60%);
@@ -386,7 +465,7 @@
386
465
  background-image: -o-linear-gradient(top, $startColor, $endColor); // Opera 11.10
387
466
  background-image: linear-gradient(top, $startColor, $endColor); // The standard
388
467
  background-repeat: repeat-x;
389
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{darken($startColor, 1%)}', endColorstr='#{darken($endColor, 1%)}', GradientType=0); // IE9 and down
468
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$startColor}', endColorstr='#{$endColor}', GradientType=0),$startColor,$endColor; // IE9 and down
390
469
  }
391
470
  @mixin gradient-directional($startColor: #555, $endColor: #333, $deg: 45deg) {
392
471
  background-color: $endColor;
@@ -406,7 +485,7 @@
406
485
  background-image: -o-linear-gradient($startColor, $midColor $colorStop, $endColor);
407
486
  background-image: linear-gradient($startColor, $midColor $colorStop, $endColor);
408
487
  background-repeat: no-repeat;
409
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{darken($startColor, 1%)}', endColorstr='#{darken($endColor, 1%)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
488
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$startColor}', endColorstr='#{$endColor}', GradientType=0), $startColor, $endColor; // IE9 and down, gets no color-stop at all the proper fallback
410
489
  }
411
490
  @mixin gradient-radial($innerColor: #555, $outerColor: #333) {
412
491
  background-color: $outerColor;
@@ -414,230 +493,86 @@
414
493
  background-image: -webkit-radial-gradient(circle, $innerColor, $outerColor);
415
494
  background-image: -moz-radial-gradient(circle, $innerColor, $outerColor);
416
495
  background-image: -ms-radial-gradient(circle, $innerColor, $outerColor);
417
- background-image: -o-radial-gradient(circle, $innerColor, $outerColor);
418
496
  background-repeat: no-repeat;
419
- }
420
- @mixin gradient-striped($color, $angle: -45deg) {
421
- background-color: $color;
422
- background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
423
- background-image: -webkit-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
424
- background-image: -moz-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
425
- background-image: -ms-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
426
- background-image: -o-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
427
- background-image: linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
428
- }
497
+ // Opera cannot do radial gradients yet
498
+ }
499
+ @mixin gradient-striped($color,$angle: -45deg) {
500
+ background-color: $color;
501
+ background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
502
+ background-image: -webkit-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
503
+ background-image: -moz-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
504
+ background-image: -ms-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
505
+ background-image: -o-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
506
+ //background-image: linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
507
+ }
429
508
 
430
- // Reset filters for IE
431
- @mixin gradient-reset-filter() {
432
- filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
509
+ // Gradient Bar Colors for buttons and alerts
510
+ @mixin gradientBar($primaryColor, $secondaryColor) {
511
+ @include gradient-vertical($primaryColor, $secondaryColor);
512
+ border-color: $secondaryColor $secondaryColor darken($secondaryColor, 15%);
513
+ border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fade-in(rgba(0,0,0,.1), 0.15);
433
514
  }
434
515
 
435
-
436
-
437
- // COMPONENT MIXINS
438
- // --------------------------------------------------
439
-
440
- // Horizontal dividers
441
- // -------------------------
442
- // Dividers (basically an hr) within dropdowns and nav lists
443
- @mixin nav-divider($top: #e5e5e5, $bottom: $white) {
444
- // IE7 needs a set width since we gave a height. Restricting just
445
- // to IE7 to keep the 1px left/right space in other browsers.
446
- // It is unclear where IE is getting the extra space that we need
447
- // to negative-margin away, but so it goes.
448
- *width: 100%;
449
- height: 1px;
450
- margin: (($baseLineHeight / 2) - 1) 1px; // 8px 1px
451
- *margin: -5px 0 5px;
452
- overflow: hidden;
453
- background-color: $top;
454
- border-bottom: 1px solid $bottom;
516
+ // Reset filters for IE
517
+ @mixin reset-filter() {
518
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
455
519
  }
456
520
 
457
- // Button backgrounds
458
- // ------------------
521
+ // Mixin for generating button backgrounds
522
+ // ---------------------------------------
459
523
  @mixin buttonBackground($startColor, $endColor) {
460
524
  // gradientBar will set the background to a pleasing blend of these, to support IE<=9
461
525
  @include gradientBar($startColor, $endColor);
462
- *background-color: $endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
463
- @include gradient-reset-filter();
526
+ @include reset-filter();
464
527
 
465
528
  // in these cases the gradient won't cover the background, so we override
466
529
  &:hover, &:active, &.active, &.disabled, &[disabled] {
467
530
  background-color: $endColor;
468
- *background-color: darken($endColor, 5%);
469
531
  }
470
532
 
471
533
  // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
472
534
  &:active,
473
535
  &.active {
474
- background-color: darken($endColor, 10%) \9;
536
+ background-color: darken($endColor, 10%) #{"\9"};
475
537
  }
476
538
  }
477
539
 
478
- // Navbar vertical align
479
- // -------------------------
480
- // Vertically center elements in the navbar.
481
- // Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin.
482
- @mixin navbarVerticalAlign($elementHeight) {
483
- margin-top: ($navbarHeight - $elementHeight) / 2;
484
- }
485
540
 
486
- // Popover arrows
541
+ // COMPONENT MIXINS
542
+ // --------------------------------------------------
543
+
544
+ // POPOVER ARROWS
487
545
  // -------------------------
488
546
  // For tipsies and popovers
489
- @mixin popoverArrow-top($arrowWidth: 5px, $color: $black) {
547
+ @mixin popoverArrow-top($arrowWidth: 5px) {
490
548
  bottom: 0;
491
549
  left: 50%;
492
550
  margin-left: -$arrowWidth;
493
551
  border-left: $arrowWidth solid transparent;
494
552
  border-right: $arrowWidth solid transparent;
495
- border-top: $arrowWidth solid $color;
553
+ border-top: $arrowWidth solid $black;
496
554
  }
497
- @mixin popoverArrow-left($arrowWidth: 5px, $color: $black) {
555
+ @mixin popoverArrow-left($arrowWidth: 5px) {
498
556
  top: 50%;
499
557
  right: 0;
500
558
  margin-top: -$arrowWidth;
501
559
  border-top: $arrowWidth solid transparent;
502
560
  border-bottom: $arrowWidth solid transparent;
503
- border-left: $arrowWidth solid $color;
561
+ border-left: $arrowWidth solid $black;
504
562
  }
505
- @mixin popoverArrow-bottom($arrowWidth: 5px, $color: $black) {
563
+ @mixin popoverArrow-bottom($arrowWidth: 5px) {
506
564
  top: 0;
507
565
  left: 50%;
508
566
  margin-left: -$arrowWidth;
509
567
  border-left: $arrowWidth solid transparent;
510
568
  border-right: $arrowWidth solid transparent;
511
- border-bottom: $arrowWidth solid $color;
569
+ border-bottom: $arrowWidth solid $black;
512
570
  }
513
- @mixin popoverArrow-right($arrowWidth: 5px, $color: $black) {
571
+ @mixin popoverArrow-right($arrowWidth: 5px) {
514
572
  top: 50%;
515
573
  left: 0;
516
574
  margin-top: -$arrowWidth;
517
575
  border-top: $arrowWidth solid transparent;
518
576
  border-bottom: $arrowWidth solid transparent;
519
- border-right: $arrowWidth solid $color;
520
- }
521
-
522
- // Grid System
523
- // -----------
524
-
525
- // Centered container element
526
- @mixin container-fixed() {
527
- margin-right: auto;
528
- margin-left: auto;
529
- @include clearfix();
530
- }
531
-
532
- // Table columns
533
- @mixin tableColumns($columnSpan: 1) {
534
- float: none; // undo default grid column styles
535
- width: (($gridColumnWidth) * $columnSpan) + ($gridGutterWidth * ($columnSpan - 1)) - 16; // 16 is total padding on left and right of table cells
536
- margin-left: 0; // undo default grid column styles
537
- }
538
-
539
- // Make a Grid
540
- // Use .makeRow and .makeColumn to assign semantic layouts grid system behavior
541
- @mixin makeRow() {
542
- margin-left: $gridGutterWidth * -1;
543
- @include clearfix();
544
- }
545
- @mixin makeColumn($columns: 1, $offset: 0) {
546
- float: left;
547
- margin-left: ($gridColumnWidth * $offset) + ($gridGutterWidth * ($offset - 1)) + ($gridGutterWidth * 2);
548
- width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
549
- }
550
-
551
- // The Grid
552
- @mixin core-offset($columns, $gridColumnWidth, $gridGutterWidth) {
553
- margin-left: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns + 1));
554
- }
555
-
556
- @mixin core-span($columns, $gridColumnWidth, $gridGutterWidth) {
557
- width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
558
- }
559
-
560
- @mixin grid-core($gridColumnWidth, $gridGutterWidth) {
561
- .row {
562
- margin-left: $gridGutterWidth * -1;
563
- @include clearfix();
564
- }
565
-
566
- [class*="span"] {
567
- float: left;
568
- margin-left: $gridGutterWidth;
569
- }
570
-
571
- // Set the container width, and override it for fixed navbars in media queries
572
- .container,
573
- .navbar-fixed-top .container,
574
- .navbar-fixed-bottom .container {
575
- @include core-span($gridColumns, $gridColumnWidth, $gridGutterWidth);
576
- }
577
-
578
- // generate .spanX and .offsetX
579
- $i: $gridColumns;
580
- @while $i > 0 {
581
- .span#{$i} { @include core-span($i, $gridColumnWidth, $gridGutterWidth); }
582
- $i: $i - 1;
583
- }
584
-
585
- $i: $gridColumns;
586
- @while $i > 0 {
587
- .offset#{$i} { @include core-offset($i, $gridColumnWidth, $gridGutterWidth); }
588
- $i: $i - 1;
589
- }
590
- }
591
-
592
- @mixin fluid-span($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
593
- width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1));
594
- *width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) - (.5 / $gridRowWidth * 100px * 1%);
595
- }
596
-
597
- @mixin grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth) {
598
- .row-fluid {
599
- width: 100%;
600
- @include clearfix();
601
- [class*="span"] {
602
- @include input-block-level();
603
- float: left;
604
- margin-left: $fluidGridGutterWidth;
605
- *margin-left: $fluidGridGutterWidth - (.5 / $gridRowWidth * 100px * 1%);
606
- }
607
- [class*="span"]:first-child {
608
- margin-left: 0;
609
- }
610
-
611
- // generate .spanX
612
- $i: $gridColumns;
613
- @while $i > 0 {
614
- .span#{$i} {
615
- @include fluid-span($i, $fluidGridColumnWidth, $fluidGridGutterWidth);
616
- }
617
- $i: $i - 1;
618
- }
619
- }
577
+ border-right: $arrowWidth solid $black;
620
578
  }
621
-
622
- @mixin input-span($columns, $gridColumnWidth, $gridGutterWidth) {
623
- width: (($gridColumnWidth) * $columns) + ($gridGutterWidth * ($columns - 1)) - 10;
624
- }
625
-
626
- @mixin grid-input($gridColumnWidth, $gridGutterWidth) {
627
- input,
628
- textarea,
629
- .uneditable-input {
630
- margin-left: 0; // override margin-left from core grid system
631
- }
632
-
633
- // generate .spanX
634
- $i: $gridColumns;
635
- @while $i > 0 {
636
- input.span#{$i},
637
- textarea.span#{$i},
638
- .uneditable-input.span#{$i} {
639
- @include input-span($i, $gridColumnWidth, $gridGutterWidth);
640
- }
641
- $i: $i - 1;
642
- }
643
- }