_scaffolding.scss in bootstrap-sass-rails-3.0.0.0.rc1

- old
+ new
@@ -1,55 +1,95 @@
-/* Partial: twitter/bootstrap/_scaffolding.scss */
 //
 // Scaffolding
-// Basic and global styles for generating a grid system, structural layout, and page templates
 // --------------------------------------------------
 
 
+// Reset the box-sizing
+// -------------------------
+
+* {
+  @include box-sizing(border-box);
+}
+
+
 // Body reset
 // -------------------------
 
+html {
+  font-size: 62.5%;
+  -webkit-tap-highlight-color: rgba(0,0,0,0);
+}
+
 body {
-  margin: 0;
-  font-family: $baseFontFamily;
-  font-size: $baseFontSize;
-  line-height: $baseLineHeight;
-  color: $textColor;
-  background-color: $bodyBackground;
+  font-family: $font-family-base;
+  font-size: $font-size-base;
+  line-height: $line-height-base;
+  color: $text-color;
+  background-color: $body-bg;
 }
 
+// Reset fonts for relevant elements
+input,
+button,
+select,
+textarea {
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
 
+
 // Links
 // -------------------------
 
 a {
-  color: $linkColor;
+  color: $link-color;
   text-decoration: none;
 }
 a:hover,
 a:focus {
-  color: $linkColorHover;
+  color: $link-hover-color;
   text-decoration: underline;
 }
+a:focus {
+  @include tab-focus();
+}
 
 
 // Images
 // -------------------------
 
+img {
+  vertical-align: middle;
+}
+
+// Responsive images (ensure images don't scale beyond their parents)
+.img-responsive {
+  display: inline-block;
+  max-width: 100%; // Part 1: Set a maximum relative to the parent
+  height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
+}
+
 // Rounded corners
 .img-rounded {
-  @include border-radius(6px);
+  border-radius: $border-radius-large;
 }
 
-// Add polaroid-esque trim
-.img-polaroid {
-  padding: 4px;
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0,0,0,.2);
-  @include box-shadow(0 1px 3px rgba(0,0,0,.1));
-}
+// Image thumbnails
+// See thumbnails.less for `.img-thumbnail`
 
 // Perfect circle
 .img-circle {
-  @include border-radius(500px); // crank the border-radius so it works with most reasonably sized images
+  border-radius: 500px; // crank the border-radius so it works with most reasonably sized images
 }
+
+
+// Horizontal rules
+// -------------------------
+
+hr {
+  margin-top:    $line-height-computed;
+  margin-bottom: $line-height-computed;
+  border: 0;
+  border-top: 1px solid $hr-border;
+}
+