Skip to content

Commit

Permalink
Bootstrap 3.0.3 stylesheets
Browse files Browse the repository at this point in the history
  • Loading branch information
mjonuschat committed Dec 6, 2013
1 parent 68e9921 commit 894723e
Show file tree
Hide file tree
Showing 22 changed files with 250 additions and 312 deletions.
12 changes: 6 additions & 6 deletions app/assets/stylesheets/twitter/bootstrap/_badges.scss
Expand Up @@ -22,6 +22,12 @@
&:empty {
display: none;
}

// Quick fix for badges in buttons
.btn & {
position: relative;
top: -1px;
}
}

// Hover state, but only for links
Expand All @@ -34,12 +40,6 @@ a.badge {
}
}

// Quick fix for labels/badges in buttons
.btn .badge {
position: relative;
top: -1px;
}

// Account for counters in navs
a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
Expand Down
40 changes: 7 additions & 33 deletions app/assets/stylesheets/twitter/bootstrap/_button-groups.scss
Expand Up @@ -2,37 +2,6 @@
// Button groups
// --------------------------------------------------

// Button carets
//
// Match the button text color to the arrow/caret for indicating dropdown-ness.

.caret {
.btn-default & {
border-top-color: $btn-default-color;
}
.btn-primary &,
.btn-success &,
.btn-warning &,
.btn-danger &,
.btn-info & {
border-top-color: #fff;
}
}
.dropup {
.btn-default .caret {
border-bottom-color: $btn-default-color;
}
.btn-primary,
.btn-success,
.btn-warning,
.btn-danger,
.btn-info {
.caret {
border-bottom-color: #fff;
}
}
}

// Make the div behave like a button
.btn-group,
.btn-group-vertical {
Expand Down Expand Up @@ -178,7 +147,8 @@

.btn-group-vertical {
> .btn,
> .btn-group {
> .btn-group,
> .btn-group > .btn {
display: block;
float: none;
width: 100%;
Expand Down Expand Up @@ -238,11 +208,15 @@
width: 100%;
table-layout: fixed;
border-collapse: separate;
.btn {
> .btn,
> .btn-group {
float: none;
display: table-cell;
width: 1%;
}
> .btn-group .btn {
width: 100%;
}
}


Expand Down
7 changes: 2 additions & 5 deletions app/assets/stylesheets/twitter/bootstrap/_buttons.scss
Expand Up @@ -6,7 +6,6 @@
// Base styles
// --------------------------------------------------

// Core styles
.btn {
display: inline-block;
margin-bottom: 0; // For input.btn
Expand Down Expand Up @@ -45,7 +44,6 @@
@include opacity(.65);
@include box-shadow(none);
}

}


Expand Down Expand Up @@ -123,13 +121,12 @@
// line-height: ensure even-numbered height of button next to large input
@include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
}
.btn-sm,
.btn-xs {
.btn-sm {
// line-height: ensure proper height of button next to small input
@include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
}
.btn-xs {
padding: 1px 5px;
@include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small);
}


Expand Down
1 change: 1 addition & 0 deletions app/assets/stylesheets/twitter/bootstrap/_carousel.scss
Expand Up @@ -91,6 +91,7 @@
// Hover/focus state
&:hover,
&:focus {
outline: none;
color: $carousel-control-color;
text-decoration: none;
@include opacity(.9);
Expand Down
1 change: 1 addition & 0 deletions app/assets/stylesheets/twitter/bootstrap/_close.scss
Expand Up @@ -21,6 +21,7 @@
}
}


// Additional properties for button version
// iOS requires the button element instead of an anchor tag.
// If you want the anchor version, it requires `href="#"`.
Expand Down
11 changes: 3 additions & 8 deletions app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss
Expand Up @@ -10,12 +10,9 @@
height: 0;
margin-left: 2px;
vertical-align: middle;
border-top: $caret-width-base solid $dropdown-caret-color;
border-top: $caret-width-base solid;
border-right: $caret-width-base solid transparent;
border-left: $caret-width-base solid transparent;
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
// we can just straight up remove this.
border-bottom: 0 dotted;
}

// The dropdown wrapper (div)
Expand Down Expand Up @@ -163,10 +160,8 @@
.navbar-fixed-bottom .dropdown {
// Reverse the caret
.caret {
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
// gets fixed, restore `border-top: 0;`.
border-top: 0 dotted;
border-bottom: $caret-width-base solid $dropdown-caret-color;
border-top: 0;
border-bottom: $caret-width-base solid;
content: "";
}
// Different positioning for bottom up menu
Expand Down
12 changes: 12 additions & 0 deletions app/assets/stylesheets/twitter/bootstrap/_forms.scss
Expand Up @@ -152,6 +152,7 @@ output {
}
}


// Reset height for `textarea`s
textarea.form-control {
height: auto;
Expand Down Expand Up @@ -306,6 +307,11 @@ input[type="checkbox"],
display: inline-block;
}

// Override `width: 100%;` when not within a `.form-group`
select.form-control {
width: auto;
}

// Remove default margin on radios/checkboxes that were used for stacking, and
// then undo the floating of radios and checkboxes to match (which also avoids
// a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
Expand Down Expand Up @@ -342,6 +348,12 @@ input[type="checkbox"],
margin-bottom: 0;
padding-top: ($padding-base-vertical + 1); // Default padding plus a border
}
// Account for padding we're adding to ensure the alignment and of help text
// and other content below items
.radio,
.checkbox {
min-height: $line-height-computed + ($padding-base-vertical + 1);
}

// Make form groups behave like rows
.form-group {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss
Expand Up @@ -14,7 +14,7 @@
src: font-url("#{$icon-font-path}#{$icon-font-name}.eot?#iefix") format('embedded-opentype'),
font-url("#{$icon-font-path}#{$icon-font-name}.woff") format('woff'),
font-url("#{$icon-font-path}#{$icon-font-name}.ttf") format('truetype'),
font-url("#{$icon-font-path}#{$icon-font-name}.svg#glyphicons_halflingsregular") format('svg');
font-url("#{$icon-font-path}#{$icon-font-name}.svg#glyphicons-halflingsregular") format('svg');
}

// Catchall baseclass
Expand Down
38 changes: 12 additions & 26 deletions app/assets/stylesheets/twitter/bootstrap/_grid.scss
Expand Up @@ -5,6 +5,16 @@
// Set the container width, and override it for fixed navbars in media queries
.container {
@include container-fixed();

@media (min-width: $screen-sm) {
width: $container-sm;
}
@media (min-width: $screen-md) {
width: $container-md;
}
@media (min-width: $screen-lg-min) {
width: $container-lg;
}
}

// mobile first defaults
Expand All @@ -18,11 +28,8 @@

// Extra small grid
//
// Grid classes for extra small devices like smartphones. No offset, push, or
// pull classes are present here due to the size of the target.
//
// Note that `.col-xs-12` doesn't get floated on purpose--there's no need since
// it's full-width.
// Columns, offsets, pushes, and pulls for extra small devices like
// smartphones.

@include make-grid-columns-float(xs);
@include make-grid($grid-columns, xs, width);
Expand All @@ -35,15 +42,8 @@
//
// Columns, offsets, pushes, and pulls for the small device range, from phones
// to tablets.
//
// 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-min) {
.container {
width: $container-sm;
}

@include make-grid-columns-float(sm);
@include make-grid($grid-columns, sm, width);
@include make-grid($grid-columns, sm, pull);
Expand All @@ -55,15 +55,8 @@
// Medium grid
//
// Columns, offsets, pushes, and pulls for the desktop device range.
//
// 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-min) {
.container {
width: $container-md;
}

@include make-grid-columns-float(md);
@include make-grid($grid-columns, md, width);
@include make-grid($grid-columns, md, pull);
Expand All @@ -75,15 +68,8 @@
// Large grid
//
// Columns, offsets, pushes, and pulls for the large desktop device range.
//
// Note that `.col-lg-12` doesn't get floated on purpose--there's no need since
// it's full-width.

@media (min-width: $screen-lg-min) {
.container {
width: $container-lg;
}

@include make-grid-columns-float(lg);
@include make-grid($grid-columns, lg, width);
@include make-grid($grid-columns, lg, pull);
Expand Down
Expand Up @@ -10,7 +10,7 @@
border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table

// Undo padding and float of grid classes
&.col {
&[class*="col-"] {
float: none;
padding-left: 0;
padding-right: 0;
Expand Down
10 changes: 8 additions & 2 deletions app/assets/stylesheets/twitter/bootstrap/_jumbotron.scss
Expand Up @@ -12,7 +12,8 @@
color: $jumbotron-color;
background-color: $jumbotron-bg;

h1 {
h1,
.h1 {
line-height: 1;
color: $jumbotron-heading-color;
}
Expand All @@ -24,6 +25,10 @@
border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
}

.container {
max-width: 100%;
}

@media screen and (min-width: $screen-sm-min) {
padding-top: ($jumbotron-padding * 1.6);
padding-bottom: ($jumbotron-padding * 1.6);
Expand All @@ -33,7 +38,8 @@
padding-right: ($jumbotron-padding * 2);
}

h1 {
h1,
.h1 {
font-size: ($font-size-base * 4.5);
}
}
Expand Down
6 changes: 6 additions & 0 deletions app/assets/stylesheets/twitter/bootstrap/_labels.scss
Expand Up @@ -28,6 +28,12 @@
&:empty {
display: none;
}

// Quick fix for labels in buttons
.btn & {
position: relative;
top: -1px;
}
}

// Colors
Expand Down

0 comments on commit 894723e

Please sign in to comment.