1
0
Fork 0
mirror of https://github.com/twbs/bootstrap-sass.git synced 2022-11-09 12:27:02 -05:00

Rollback Sass changes to v3.0.0 tag

This commit is contained in:
Thomas McDonald 2013-08-28 18:48:05 +01:00
parent e21b64bb27
commit 3bff31150a
17 changed files with 106 additions and 185 deletions

View file

@ -1,4 +1,4 @@
module Bootstrap
VERSION = '3.0.0.0'
BOOTSTRAP_SHA = '73f10843a487ee94bed755ecfd7c853cb657bf38'
BOOTSTRAP_SHA = 'e8a1df5f060bf7e6631554648e0abde150aedbe4'
end

View file

@ -183,7 +183,7 @@
// Scale up controls for tablets and up
@media screen and (min-width: $screen-sm) {
@media screen and (min-width: $screen-tablet) {
// Scale up the controls a smidge
.carousel-control .icon-prev,

View file

@ -82,15 +82,6 @@ input[type="number"] {
}
}
// Adjust output element
output {
display: block;
padding-top: ($padding-base-vertical + 1);
font-size: $font-size-base;
line-height: $line-height-base;
color: $input-color;
vertical-align: middle;
}
// Placeholder
//
@ -297,7 +288,7 @@ input[type="checkbox"],
.form-inline {
// Kick in the inline
@media (min-width: $screen-sm) {
@media (min-width: $screen-tablet) {
// Inline-block all the things for "inline"
.form-group {
display: inline-block;
@ -353,7 +344,7 @@ input[type="checkbox"],
}
// Only right align form labels here when the columns stop stacking
@media (min-width: $screen-sm) {
@media (min-width: $screen-tablet) {
.control-label {
text-align: right;
}

View file

@ -27,10 +27,6 @@
font-weight: normal;
line-height: 1;
-webkit-font-smoothing: antialiased;
&:empty{
width: 1em;
}
}
// Individual icons

View file

@ -114,7 +114,7 @@
// Note that `.col-sm-12` doesn't get floated on purpose—there's no need since
// it's full-width.
@media (min-width: $screen-sm) {
@media (min-width: $screen-tablet) {
.container {
max-width: $container-tablet;
}
@ -192,7 +192,7 @@
// Note that `.col-md-12` doesn't get floated on purpose—there's no need since
// it's full-width.
@media (min-width: $screen-md) {
@media (min-width: $screen-desktop) {
.container {
max-width: $container-desktop;
}

View file

@ -24,7 +24,7 @@
border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
}
@media screen and (min-width: $screen-sm) {
@media screen and (min-width: $screen-tablet) {
padding-top: ($jumbotron-padding * 1.6);
padding-bottom: ($jumbotron-padding * 1.6);

View file

@ -69,15 +69,7 @@
}
// CSS image replacement
//
// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
// mixins being reused as classes with the same name, this doesn't hold up. As
// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`. Note
// that we cannot chain the mixins together in Less, so they are repeated.
//
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
// Deprecated as of v3.0.1 (will be removed in v4)
@mixin hide-text() {
font: #{0/0} a;
color: transparent;
@ -85,14 +77,6 @@
background-color: transparent;
border: 0;
}
// New mixin to use as of v3.0.1
@mixin text-hide() {
font: #{0/0} a;
color: transparent;
text-shadow: none;
background-color: transparent;
border: 0;
}
@ -128,10 +112,6 @@
-webkit-transition: $transition;
transition: $transition;
}
@mixin transition-property($transition-property) {
-webkit-transition-property: $transition-property;
transition-property: $transition-property;
}
@mixin transition-delay($transition-delay) {
-webkit-transition-delay: $transition-delay;
transition-delay: $transition-delay;
@ -412,8 +392,7 @@
.table-hover > tbody > tr {
> td.#{$state}:hover,
> th.#{$state}:hover,
&.#{$state}:hover > td,
&.#{$state}:hover > th {
&.#{$state}:hover > td {
background-color: darken($background, 5%);
border-color: darken($border, 5%);
}
@ -586,7 +565,7 @@
padding-right: ($gutter / 2);
// Calculate width based on number of columns available
@media (min-width: $screen-sm-min) {
@media (min-width: $screen-sm) {
float: left;
width: percentage(($columns / $grid-columns));
}
@ -594,17 +573,17 @@
// Generate the small column offsets
@mixin make-sm-column-offset($columns) {
@media (min-width: $screen-sm-min) {
@media (min-width: $screen-sm) {
margin-left: percentage(($columns / $grid-columns));
}
}
@mixin make-sm-column-push($columns) {
@media (min-width: $screen-sm-min) {
@media (min-width: $screen-sm) {
left: percentage(($columns / $grid-columns));
}
}
@mixin make-sm-column-pull($columns) {
@media (min-width: $screen-sm-min) {
@media (min-width: $screen-sm) {
right: percentage(($columns / $grid-columns));
}
}
@ -619,7 +598,7 @@
padding-right: ($gutter / 2);
// Calculate width based on number of columns available
@media (min-width: $screen-md-min) {
@media (min-width: $screen-md) {
float: left;
width: percentage(($columns / $grid-columns));
}
@ -627,7 +606,7 @@
// Generate the large column offsets
@mixin make-md-column-offset($columns) {
@media (min-width: $screen-md-min) {
@media (min-width: $screen-md) {
margin-left: percentage(($columns / $grid-columns));
}
}
@ -637,7 +616,7 @@
}
}
@mixin make-md-column-pull($columns) {
@media (min-width: $screen-md-min) {
@media (min-width: $screen-md) {
right: percentage(($columns / $grid-columns));
}
}
@ -652,7 +631,7 @@
padding-right: ($gutter / 2);
// Calculate width based on number of columns available
@media (min-width: $screen-lg-min) {
@media (min-width: $screen-lg) {
float: left;
width: percentage(($columns / $grid-columns));
}
@ -660,17 +639,17 @@
// Generate the large column offsets
@mixin make-lg-column-offset($columns) {
@media (min-width: $screen-lg-min) {
@media (min-width: $screen-lg) {
margin-left: percentage(($columns / $grid-columns));
}
}
@mixin make-lg-column-push($columns) {
@media (min-width: $screen-lg-min) {
@media (min-width: $screen-lg) {
left: percentage(($columns / $grid-columns));
}
}
@mixin make-lg-column-pull($columns) {
@media (min-width: $screen-lg-min) {
@media (min-width: $screen-lg) {
right: percentage(($columns / $grid-columns));
}
}

View file

@ -130,7 +130,7 @@ body.modal-open {
}
// Scale up the modal
@media screen and (min-width: $screen-sm) {
@media screen and (min-width: $screen-tablet) {
.modal-dialog {
left: 50%;

View file

@ -159,17 +159,13 @@
float: none;
> a {
text-align: center;
margin-bottom: 5px;
}
}
@media (min-width: $screen-sm-min) {
@media (min-width: $screen-sm) {
> li {
display: table-cell;
width: 1%;
> a {
margin-bottom: 0;
}
}
}
}
@ -177,29 +173,14 @@
// Move borders to anchors instead of bottom of list
.nav-tabs-justified {
border-bottom: 0;
> li > a {
border-bottom: 1px solid $nav-tabs-justified-link-border-color;
// Override margin from .nav-tabs
margin-right: 0;
border-radius: $border-radius-base;
}
> .active > a,
> .active > a:hover,
> .active > a:focus {
border: 1px solid $nav-tabs-justified-link-border-color;
}
@media (min-width: $screen-sm-min) {
> li > a {
border-bottom: 1px solid $nav-tabs-justified-link-border-color;
border-radius: $border-radius-base $border-radius-base 0 0;
}
> .active > a,
> .active > a:hover,
> .active > a:focus {
border-bottom-color: $nav-tabs-justified-active-link-border-color;
}
> .active > a {
border-bottom-color: $nav-tabs-justified-active-link-border-color;
}
}

View file

@ -58,8 +58,6 @@
> .disabled {
> span,
> span:hover,
> span:focus,
> a,
> a:hover,
> a:focus {

View file

@ -40,78 +40,78 @@
@include responsive-visibility('.visible-xs');
}
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
@include responsive-visibility('.visible-xs.visible-sm');
}
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
@include responsive-visibility('.visible-xs.visible-md');
}
}
@media (min-width: $screen-lg-min) {
@media (min-width: $screen-lg) {
@include responsive-visibility('.visible-xs.visible-lg');
}
}
@include responsive-invisibility('.visible-sm');
@media (max-width: $screen-xs-max) {
@include responsive-visibility('.visible-sm.visible-xs');
}
}
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
@include responsive-visibility('.visible-sm');
}
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
@include responsive-visibility('.visible-sm.visible-md');
}
}
@media (min-width: $screen-lg-min) {
@media (min-width: $screen-lg) {
@include responsive-visibility('.visible-sm.visible-lg');
}
}
@include responsive-invisibility('.visible-md');
@media (max-width: $screen-xs-max) {
@include responsive-visibility('.visible-md.visible-xs');
}
}
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
@include responsive-visibility('.visible-md.visible-sm');
}
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
@include responsive-visibility('.visible-md');
}
@media (min-width: $screen-lg-min) {
@media (min-width: $screen-lg) {
@include responsive-visibility('.visible-md.visible-lg');
}
}
@include responsive-invisibility('.visible-lg');
@media (max-width: $screen-xs-max) {
@include responsive-visibility('.visible-lg.visible-xs');
}
}
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
@include responsive-visibility('.visible-lg.visible-sm');
}
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
@include responsive-visibility('.visible-lg.visible-md');
}
}
@media (min-width: $screen-lg-min) {
@media (min-width: $screen-lg) {
@include responsive-visibility('.visible-lg');
}
@ -120,19 +120,19 @@
@include responsive-invisibility('.hidden-xs');
}
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
@include responsive-invisibility('.hidden-xs.hidden-sm');
}
}
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
@include responsive-invisibility('.hidden-xs.hidden-md');
}
}
@media (min-width: $screen-lg-min) {
@media (min-width: $screen-lg) {
@include responsive-invisibility('.hidden-xs.hidden-lg');
}
}
@include responsive-visibility('.hidden-sm');
@ -141,57 +141,57 @@
@include responsive-invisibility('.hidden-sm.hidden-xs');
}
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
@include responsive-invisibility('.hidden-sm');
}
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
@include responsive-invisibility('.hidden-sm.hidden-md');
}
}
@media (min-width: $screen-lg-min) {
@media (min-width: $screen-lg) {
@include responsive-invisibility('.hidden-sm.hidden-lg');
}
}
@include responsive-visibility('.hidden-md');
@media (max-width: $screen-xs-max) {
@include responsive-invisibility('.hidden-md.hidden-xs');
}
}
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
@include responsive-invisibility('.hidden-md.hidden-sm');
}
}
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
@include responsive-invisibility('.hidden-md');
}
@media (min-width: $screen-lg-min) {
@media (min-width: $screen-lg) {
@include responsive-invisibility('.hidden-md.hidden-lg');
}
}
@include responsive-visibility('.hidden-lg');
@media (max-width: $screen-xs-max) {
@include responsive-invisibility('.hidden-lg.hidden-xs');
}
}
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
@include responsive-invisibility('.hidden-lg.hidden-sm');
}
}
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
@include responsive-invisibility('.hidden-lg.hidden-md');
}
}
@media (min-width: $screen-lg-min) {
@media (min-width: $screen-lg) {
@include responsive-invisibility('.hidden-lg');
}

View file

@ -176,19 +176,17 @@ table {
// Responsive tables
//
// Wrap your tables in `.table-responsive` and we'll make them mobile friendly
// Wrap your tables in `.table-scrollable` and we'll make them mobile friendly
// by enabling horizontal scrolling. Only applies <768px. Everything above that
// will display normally.
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-sm) {
.table-responsive {
width: 100%;
margin-bottom: 15px;
overflow-y: hidden;
overflow-x: scroll;
-ms-overflow-style: -ms-autohiding-scrollbar;
border: 1px solid $table-border-color;
-webkit-overflow-scrolling: touch;
// Tighten up spacing and give a background color
> .table {

View file

@ -32,20 +32,13 @@
// Mixin for generating new styles
@mixin btn-styles($btn-color: #555) {
@include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
background-repeat: repeat-x;
border-color: darken($btn-color, 14%);
&:hover,
&:focus {
background-color: darken($btn-color, 12%);
background-position: 0 -15px;
}
@include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 10%));
border-color: darken($btn-color, 12%);
&:active,
&.active {
background-color: darken($btn-color, 12%);
border-color: darken($btn-color, 14%);
background-color: darken($btn-color, 10%);
border-color: darken($btn-color, 12%);
}
}
@ -98,16 +91,15 @@
// Navbar
// --------------------------------------------------
// Default navbar
.navbar-default {
// Basic navbar
.navbar {
@include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
border-radius: $navbar-border-radius;
$shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
@include box-shadow($shadow);
.navbar-nav > .active > a {
@include gradient-vertical($start-color: darken($navbar-default-bg, 5%), $end-color: darken($navbar-default-bg, 2%));
@include box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
background-color: $navbar-default-bg;
}
}
.navbar-brand,
@ -120,8 +112,7 @@
@include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
.navbar-nav > .active > a {
@include gradient-vertical($start-color: $navbar-inverse-bg, $end-color: lighten($navbar-inverse-bg, 2.5%));
@include box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
background-color: $navbar-inverse-bg;
}
.navbar-brand,

View file

@ -7,7 +7,6 @@
.thumbnail {
@extend .img-thumbnail;
display: block; // Override the inline-block from `.img-thumbnail`
margin-bottom: $line-height-computed;
> img {
@include img-responsive();

View file

@ -52,7 +52,6 @@ h1, h2, h3, h4, h5, h6,
font-family: $headings-font-family;
font-weight: $headings-font-weight;
line-height: $headings-line-height;
small {
font-weight: normal;
line-height: 1;
@ -65,28 +64,25 @@ h2,
h3 {
margin-top: $line-height-computed;
margin-bottom: ($line-height-computed / 2);
small {
font-size: 65%;
}
}
h4,
h5,
h6 {
margin-top: ($line-height-computed / 2);
margin-bottom: ($line-height-computed / 2);
small {
font-size: 75%;
}
}
h1, .h1 { font-size: $font-size-h1; }
h2, .h2 { font-size: $font-size-h2; }
h3, .h3 { font-size: $font-size-h3; }
h4, .h4 { font-size: $font-size-h4; }
h5, .h5 { font-size: $font-size-h5; }
h6, .h6 { font-size: $font-size-h6; }
h1, .h1 { font-size: floor($font-size-base * 2.60); } // ~36px
h2, .h2 { font-size: floor($font-size-base * 2.15); } // ~30px
h3, .h3 { font-size: ceil($font-size-base * 1.70); } // ~24px
h4, .h4 { font-size: ceil($font-size-base * 1.25); } // ~18px
h5, .h5 { font-size: $font-size-base; }
h6, .h6 { font-size: ceil($font-size-base * 0.85); } // ~12px
h1 small, .h1 small { font-size: ceil($font-size-base * 1.70); } // ~24px
h2 small, .h2 small { font-size: ceil($font-size-base * 1.25); } // ~18px
h3 small, .h3 small,
h4 small, .h4 small { font-size: $font-size-base; }
// Page header

View file

@ -30,7 +30,7 @@
visibility: hidden;
}
.text-hide {
@include text-hide();
@include hide-text();
}

View file

@ -48,13 +48,6 @@ $font-size-base: 14px !default;
$font-size-large: ceil($font-size-base * 1.25) !default; // ~18px
$font-size-small: ceil($font-size-base * 0.85) !default; // ~12px
$font-size-h1: floor($font-size-base * 2.60) !default; // ~36px
$font-size-h2: floor($font-size-base * 2.15) !default; // ~30px
$font-size-h3: ceil($font-size-base * 1.70) !default; // ~24px
$font-size-h4: ceil($font-size-base * 1.25) !default; // ~18px
$font-size-h5: $font-size-base !default;
$font-size-h6: ceil($font-size-base * 0.85) !default; // ~12px
$line-height-base: 1.428571429 !default; // 20/14
$line-height-computed: floor($font-size-base * $line-height-base) !default; // ~20px
@ -207,33 +200,25 @@ $zindex-modal: 1050 !default;
// --------------------------------------------------
// Extra small screen / phone
// Note: Deprecated $screen-xs and $screen-phone as of v3.0.1
$screen-xs: 480px !default;
$screen-xs-min: $screen-xs !default;
$screen-phone: $screen-xs-min !default;
$screen-phone: $screen-xs !default;
// Small screen / tablet
// Note: Deprecated $screen-sm and $screen-tablet as of v3.0.1
$screen-sm: 768px !default;
$screen-sm-min: $screen-sm !default;
$screen-tablet: $screen-sm-min !default;
$screen-tablet: $screen-sm !default;
// Medium screen / desktop
// Note: Deprecated $screen-md and $screen-desktop as of v3.0.1
$screen-md: 992px !default;
$screen-md-min: $screen-md !default;
$screen-desktop: $screen-md-min !default;
$screen-desktop: $screen-md !default;
// Large screen / wide desktop
// Note: Deprecated $screen-lg and $screen-lg-desktop as of v3.0.1
$screen-lg: 1200px !default;
$screen-lg-min: $screen-lg !default;
$screen-lg-desktop: $screen-lg-min !default;
$screen-lg-desktop: $screen-lg !default;
// So media queries don't overlap when required, provide a maximum
$screen-xs-max: ($screen-sm-min - 1) !default;
$screen-sm-max: ($screen-md-min - 1) !default;
$screen-md-max: ($screen-lg-min - 1) !default;
$screen-xs-max: ($screen-sm - 1) !default;
$screen-sm-max: ($screen-md - 1) !default;
$screen-md-max: ($screen-lg - 1) !default;
// Grid system
@ -244,7 +229,7 @@ $grid-columns: 12 !default;
// Padding, to be divided by two and applied to the left and right of all columns
$grid-gutter-width: 30px !default;
// Point at which the navbar stops collapsing
$grid-float-breakpoint: $screen-sm !default;
$grid-float-breakpoint: $screen-tablet !default;
// Navbar
@ -301,6 +286,13 @@ $navbar-inverse-brand-color: $navbar-inverse-link-color !default;
$navbar-inverse-brand-hover-color: #fff !default;
$navbar-inverse-brand-hover-bg: transparent !default;
// Inverted navbar search
// Normal navbar needs no special styles or vars
$navbar-inverse-search-bg: lighten($navbar-inverse-bg, 25%) !default;
$navbar-inverse-search-bg-focus: #fff !default;
$navbar-inverse-search-border: $navbar-inverse-bg !default;
$navbar-inverse-search-placeholder-color: #ccc !default;
// Inverted navbar toggle
$navbar-inverse-toggle-hover-bg: #333 !default;
$navbar-inverse-toggle-icon-bar-bg: #fff !default;