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

Formatting, comment consolidation, and line endings

This commit is contained in:
Mark Otto 2014-03-10 00:05:57 -07:00
parent 38d0908aff
commit 3a2d6e4050
29 changed files with 21 additions and 108 deletions

View file

@ -12,4 +12,3 @@
color: darken(@text-color, 10%);
}
}

View file

@ -6,4 +6,3 @@
background-color: darken(@color, 10%);
}
}

View file

@ -16,4 +16,3 @@
border-bottom-left-radius: @radius;
border-top-left-radius: @radius;
}

View file

@ -48,4 +48,3 @@
line-height: @line-height;
border-radius: @border-radius;
}

View file

@ -5,4 +5,3 @@
margin-left: auto;
margin-right: auto;
}

View file

@ -1,5 +1,4 @@
// Clearfix
// Source: http://nicolasgallagher.com/micro-clearfix-hack/
//
// For modern browsers
// 1. The space content is one way to avoid an Opera bug when the
@ -8,6 +7,8 @@
// that are clearfixed.
// 2. The use of `table` rather than `block` is only necessary if using
// `:before` to contain the top-margins of child elements.
//
// Source: http://nicolasgallagher.com/micro-clearfix-hack/
.clearfix() {
&:before,
@ -19,4 +20,3 @@
clear: both;
}
}

View file

@ -36,10 +36,6 @@
}
// Forms
// --------------------------------------------------
// Form control focus state
//
// Generate a customized focus state and for any input with the specified color,
@ -83,4 +79,3 @@
height: auto;
}
}

View file

@ -1,7 +1,5 @@
// Gradients
// --------------------------------------------------
#gradient {
// Horizontal gradient, from left to right
@ -59,4 +57,3 @@
background-image: linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);
}
}

View file

@ -1,8 +1,8 @@
// Framework grid generation
// --------------------------------------------------
//
// Used only by Bootstrap to generate the correct number of grid classes given
// any value of `@grid-columns`.
.make-grid-columns() {
// Common styles for all sizes of grid columns, widths 1-12
.col(@index) when (@index = 1) { // initial
@ -89,4 +89,3 @@
.loop-grid-columns(@grid-columns, @class, push);
.loop-grid-columns(@grid-columns, @class, offset);
}

View file

@ -1,5 +1,6 @@
// Grid system
// --------------------------------------------------
//
// Generate semantic grid columns with these mixins.
// Centered container element
.container-fixed() {
@ -119,4 +120,3 @@
right: percentage((@columns / @grid-columns));
}
}

View file

@ -19,4 +19,3 @@
.text-hide() {
.hide-text();
}

View file

@ -2,9 +2,9 @@
// - Responsive image
// - Retina image
// Responsive image
// --------------------------------------------------
// Responsive image
//
// Keep images from scaling beyond the width of their parents.
.img-responsive(@display: block) {
display: @display;
@ -12,9 +12,9 @@
height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
}
// Retina image
// --------------------------------------------------
// Retina image
//
// Short retina mixin for setting background-image and -size. Note that the
// spelling of `min--moz-device-pixel-ratio` is intentional.
.img-retina(@file-1x; @file-2x; @width-1x; @height-1x) {
@ -31,4 +31,3 @@
background-size: @width-1x @height-1x;
}
}

View file

@ -2,6 +2,7 @@
.label-variant(@color) {
background-color: @color;
&[href] {
&:hover,
&:focus {
@ -9,4 +10,3 @@
}
}
}

View file

@ -8,7 +8,9 @@
a& {
color: @color;
.list-group-item-heading { color: inherit; }
.list-group-item-heading {
color: inherit;
}
&:hover,
&:focus {
@ -25,4 +27,3 @@
}
}
}

View file

@ -8,4 +8,3 @@
overflow: hidden;
background-color: @color;
}

View file

@ -7,4 +7,3 @@
margin-top: ((@navbar-height - @element-height) / 2);
margin-bottom: ((@navbar-height - @element-height) / 2);
}

View file

@ -6,4 +6,3 @@
@opacity-ie: (@opacity * 100);
filter: ~"alpha(opacity=@{opacity-ie})";
}

View file

@ -21,4 +21,3 @@
}
}
}

View file

@ -18,4 +18,3 @@
}
}
}

View file

@ -6,4 +6,3 @@
#gradient > .striped();
}
}

View file

@ -6,4 +6,3 @@
.reset-filter() {
filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
}

View file

@ -4,4 +4,3 @@
resize: @direction; // Options: horizontal, vertical, both
overflow: auto; // Safari fix
}

View file

@ -13,4 +13,3 @@
.responsive-invisibility() {
display: none !important;
}

View file

@ -8,4 +8,3 @@
.square(@size) {
.size(@size; @size);
}

View file

@ -7,4 +7,3 @@
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}

View file

@ -25,4 +25,3 @@
}
}
}

View file

@ -6,4 +6,3 @@
color: darken(@color, 10%);
}
}

View file

@ -6,4 +6,3 @@
text-overflow: ellipsis;
white-space: nowrap;
}

View file

@ -1,5 +1,7 @@
// Vendor Prefixes
// These are deprecated mixins that handle vendor prefixes
//
// All vender mixins are deprecated as of v3.2 due to the introduction of
// Autoprefixer in our Gruntfile. They will be removed in v4.
// - Animations
// - Backface visibility
@ -12,46 +14,33 @@
// - Transitions
// - User Select
// Animations
//
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.animation(@animation) {
-webkit-animation: @animation;
-o-animation: @animation;
animation: @animation;
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.animation-name(@name) {
-webkit-animation-name: @name;
animation-name: @name;
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.animation-duration(@duration) {
-webkit-animation-duration: @duration;
animation-duration: @duration;
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.animation-timing-function(@timing-function) {
-webkit-animation-timing-function: @timing-function;
animation-timing-function: @timing-function;
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.animation-delay(@delay) {
-webkit-animation-delay: @delay;
animation-delay: @delay;
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.animation-iteration-count(@iteration-count) {
-webkit-animation-iteration-count: @iteration-count;
animation-iteration-count: @iteration-count;
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.animation-direction(@direction) {
-webkit-animation-direction: @direction;
animation-direction: @direction;
@ -61,11 +50,9 @@
animation-fill-mode: @fill-mode;
}
// Backface visibility
// Prevent browsers from flickering when using CSS 3D transforms.
// Default value is `visible`, but can be changed to `hidden`
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.backface-visibility(@visibility){
-webkit-backface-visibility: @visibility;
@ -73,21 +60,17 @@
backface-visibility: @visibility;
}
// Drop shadows
//
// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's
// supported browsers that have box shadow capabilities now support the
// standard `box-shadow` property.
// supported browsers that have box shadow capabilities now support it.
.box-shadow(@shadow) {
-webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1
box-shadow: @shadow;
}
// Box sizing
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.box-sizing(@boxmodel) {
-webkit-box-sizing: @boxmodel;
-moz-box-sizing: @boxmodel;
@ -95,7 +78,6 @@
}
// CSS3 Content Columns
.content-columns(@column-count; @column-gap: @grid-gutter-width) {
-webkit-column-count: @column-count;
-moz-column-count: @column-count;
@ -106,7 +88,6 @@
}
// Optional hyphenation
.hyphens(@mode: auto) {
word-wrap: break-word;
-webkit-hyphens: @mode;
@ -117,7 +98,6 @@
}
// Placeholder text
.placeholder(@color: @input-color-placeholder) {
&::-moz-placeholder { color: @color; // Firefox
opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
@ -126,100 +106,74 @@
}
// Transformations
//
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.scale(@ratio) {
-webkit-transform: scale(@ratio);
-ms-transform: scale(@ratio); // IE9 only
-o-transform: scale(@ratio);
transform: scale(@ratio);
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.scale(@ratioX; @ratioY) {
-webkit-transform: scale(@ratioX, @ratioY);
-ms-transform: scale(@ratioX, @ratioY); // IE9 only
-o-transform: scale(@ratioX, @ratioY);
transform: scale(@ratioX, @ratioY);
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.scaleX(@ratio) {
-webkit-transform: scaleX(@ratio);
-ms-transform: scaleX(@ratio); // IE9 only
-o-transform: scaleX(@ratio);
transform: scaleX(@ratio);
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.scaleY(@ratio) {
-webkit-transform: scaleY(@ratio);
-ms-transform: scaleY(@ratio); // IE9 only
-o-transform: scaleY(@ratio);
transform: scaleY(@ratio);
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.skew(@x; @y) {
-webkit-transform: skew(@x, @y);
-ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+
-o-transform: skew(@x, @y);
transform: skew(@x, @y);
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.translate(@x; @y) {
-webkit-transform: translate(@x, @y);
-ms-transform: translate(@x, @y); // IE9 only
-o-transform: translate(@x, @y);
transform: translate(@x, @y);
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.translate3d(@x; @y; @z) {
-webkit-transform: translate3d(@x, @y, @z);
transform: translate3d(@x, @y, @z);
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.rotate(@degrees) {
-webkit-transform: rotate(@degrees);
-ms-transform: rotate(@degrees); // IE9 only
-o-transform: rotate(@degrees);
transform: rotate(@degrees);
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.rotateX(@degrees) {
-webkit-transform: rotateX(@degrees);
-ms-transform: rotateX(@degrees); // IE9 only
-o-transform: rotateX(@degrees);
transform: rotateX(@degrees);
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.rotateY(@degrees) {
-webkit-transform: rotateY(@degrees);
-ms-transform: rotateY(@degrees); // IE9 only
-o-transform: rotateY(@degrees);
transform: rotateY(@degrees);
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.perspective(@perspective) {
-webkit-perspective: @perspective;
-moz-perspective: @perspective;
perspective: @perspective;
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.perspective-origin(@perspective) {
-webkit-perspective-origin: @perspective;
-moz-perspective-origin: @perspective;
perspective-origin: @perspective;
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.transform-origin(@origin) {
-webkit-transform-origin: @origin;
-moz-transform-origin: @origin;
@ -229,39 +183,28 @@
// Transitions
//
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.transition(@transition) {
-webkit-transition: @transition;
-o-transition: @transition;
transition: @transition;
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.transition-property(@transition-property) {
-webkit-transition-property: @transition-property;
transition-property: @transition-property;
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.transition-delay(@transition-delay) {
-webkit-transition-delay: @transition-delay;
transition-delay: @transition-delay;
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.transition-duration(@transition-duration) {
-webkit-transition-duration: @transition-duration;
transition-duration: @transition-duration;
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.transition-timing-function(@timing-function) {
-webkit-transition-timing-function: @timing-function;
transition-timing-function: @timing-function;
}
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.transition-transform(@transition) {
-webkit-transition: -webkit-transform @transition;
-moz-transition: -moz-transform @transition;
@ -269,9 +212,9 @@
transition: transform @transition;
}
// User select
// For selecting text on the page
// Deprecated as of v3.2.0 due to the introduction of autoprefixer (will be removed in v4)
.user-select(@select) {
-webkit-user-select: @select;
@ -279,4 +222,3 @@
-ms-user-select: @select; // IE10+
user-select: @select;
}