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

update upstream

Browse source
This commit is contained in:
Gleb Mazovetskiy 2013-08-03 00:27:48 +02:00
parent b80b9b5604
commit 386ab0201a
13 changed files with 139 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vendor/assets/javascripts/bootstrap/button.js vendored
View file

@ -56,7 +56,9 @@
var $parent = this.$element.closest('[data-toggle="buttons"]')
if ($parent.length) {
var $input = this.$element.find('input').prop('checked', !this.$element.hasClass('active'))
var $input = this.$element.find('input')
.prop('checked', !this.$element.hasClass('active'))
.trigger('change')
if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
}

2
vendor/assets/stylesheets/bootstrap/_alerts.scss vendored
View file

@ -26,7 +26,7 @@
}
// Provide class for links that match alerts
.alert-link {
font-weight: 500;
font-weight: bold;
color: darken($alert-text, 10%);
}

1
vendor/assets/stylesheets/bootstrap/_buttons.scss vendored
View file

@ -123,6 +123,7 @@
.btn-large {
padding: $padding-large-vertical $padding-large-horizontal;
font-size: $font-size-large;
line-height: 1.33; // ensure even-numbered height of butotn next to large input
border-radius: $border-radius-large;
}
.btn-small,

4
vendor/assets/stylesheets/bootstrap/_close.scss vendored
View file

@ -20,8 +20,10 @@
@include opacity(.5);
}
// [converter] extracted button& to button.close
}
// Additional properties for button version
// Additional properties for button version
// iOS requires the button element instead of an anchor tag.
// If you want the anchor version, it requires `href="#"`.
button.close {

4
vendor/assets/stylesheets/bootstrap/_component-animations.scss vendored
View file

@ -4,8 +4,8 @@
// Heads up!
//
// We don't use the `@include opacity()` mixin here since it causes a bug with text
// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552.
// We don't use the `.opacity()` mixin here since it causes a bug with text
// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552.
.fade {
opacity: 0;

6
vendor/assets/stylesheets/bootstrap/_dropdowns.scss vendored
View file

@ -17,6 +17,12 @@
content: "";
}
// The dropdown wrapper (div)
// --------------------------
.dropdown {
position: relative;
}
// The dropdown menu (ul)
// ----------------------
.dropdown-menu {

4
vendor/assets/stylesheets/bootstrap/_forms.scss vendored
View file

@ -145,6 +145,8 @@ input[type="number"] {
cursor: not-allowed;
background-color: $input-bg-disabled;
}
// [converter] extracted textarea& to textarea.form-control
}
// Reset height for `textarea`s
@ -222,12 +224,14 @@ textarea.form-control {
height: $input-height-large;
padding: $padding-large-vertical $padding-large-horizontal;
font-size: $font-size-large;
line-height: $line-height-large;
border-radius: $border-radius-large;
}
.input-small {
height: $input-height-small;
padding: $padding-small-vertical $padding-small-horizontal;
font-size: $font-size-small;
line-height: $line-height-small;
border-radius: $border-radius-small;
}

104
vendor/assets/stylesheets/bootstrap/_grid.scss vendored
View file

@ -125,29 +125,42 @@
.col-sm-12 { width: 100%; }
// Push and pull columns for source order changes
.col-push-1 { left: percentage((1 / $grid-columns)); }
.col-push-2 { left: percentage((2 / $grid-columns)); }
.col-push-3 { left: percentage((3 / $grid-columns)); }
.col-push-4 { left: percentage((4 / $grid-columns)); }
.col-push-5 { left: percentage((5 / $grid-columns)); }
.col-push-6 { left: percentage((6 / $grid-columns)); }
.col-push-7 { left: percentage((7 / $grid-columns)); }
.col-push-8 { left: percentage((8 / $grid-columns)); }
.col-push-9 { left: percentage((9 / $grid-columns)); }
.col-push-10 { left: percentage((10/ $grid-columns)); }
.col-push-11 { left: percentage((11/ $grid-columns)); }
.col-sm-push-1 { left: percentage((1 / $grid-columns)); }
.col-sm-push-2 { left: percentage((2 / $grid-columns)); }
.col-sm-push-3 { left: percentage((3 / $grid-columns)); }
.col-sm-push-4 { left: percentage((4 / $grid-columns)); }
.col-sm-push-5 { left: percentage((5 / $grid-columns)); }
.col-sm-push-6 { left: percentage((6 / $grid-columns)); }
.col-sm-push-7 { left: percentage((7 / $grid-columns)); }
.col-sm-push-8 { left: percentage((8 / $grid-columns)); }
.col-sm-push-9 { left: percentage((9 / $grid-columns)); }
.col-sm-push-10 { left: percentage((10/ $grid-columns)); }
.col-sm-push-11 { left: percentage((11/ $grid-columns)); }
.col-pull-1 { right: percentage((1 / $grid-columns)); }
.col-pull-2 { right: percentage((2 / $grid-columns)); }
.col-pull-3 { right: percentage((3 / $grid-columns)); }
.col-pull-4 { right: percentage((4 / $grid-columns)); }
.col-pull-5 { right: percentage((5 / $grid-columns)); }
.col-pull-6 { right: percentage((6 / $grid-columns)); }
.col-pull-7 { right: percentage((7 / $grid-columns)); }
.col-pull-8 { right: percentage((8 / $grid-columns)); }
.col-pull-9 { right: percentage((9 / $grid-columns)); }
.col-pull-10 { right: percentage((10/ $grid-columns)); }
.col-pull-11 { right: percentage((11/ $grid-columns)); }
.col-sm-pull-1 { right: percentage((1 / $grid-columns)); }
.col-sm-pull-2 { right: percentage((2 / $grid-columns)); }
.col-sm-pull-3 { right: percentage((3 / $grid-columns)); }
.col-sm-pull-4 { right: percentage((4 / $grid-columns)); }
.col-sm-pull-5 { right: percentage((5 / $grid-columns)); }
.col-sm-pull-6 { right: percentage((6 / $grid-columns)); }
.col-sm-pull-7 { right: percentage((7 / $grid-columns)); }
.col-sm-pull-8 { right: percentage((8 / $grid-columns)); }
.col-sm-pull-9 { right: percentage((9 / $grid-columns)); }
.col-sm-pull-10 { right: percentage((10/ $grid-columns)); }
.col-sm-pull-11 { right: percentage((11/ $grid-columns)); }
// Offsets
.col-sm-offset-1 { margin-left: percentage((1 / $grid-columns)); }
.col-sm-offset-2 { margin-left: percentage((2 / $grid-columns)); }
.col-sm-offset-3 { margin-left: percentage((3 / $grid-columns)); }
.col-sm-offset-4 { margin-left: percentage((4 / $grid-columns)); }
.col-sm-offset-5 { margin-left: percentage((5 / $grid-columns)); }
.col-sm-offset-6 { margin-left: percentage((6 / $grid-columns)); }
.col-sm-offset-7 { margin-left: percentage((7 / $grid-columns)); }
.col-sm-offset-8 { margin-left: percentage((8 / $grid-columns)); }
.col-sm-offset-9 { margin-left: percentage((9 / $grid-columns)); }
.col-sm-offset-10 { margin-left: percentage((10/ $grid-columns)); }
.col-sm-offset-11 { margin-left: percentage((11/ $grid-columns)); }
}
// Medium and large device columns (desktop and up)
@ -182,18 +195,43 @@
.col-lg-11 { width: percentage((11/ $grid-columns)); }
.col-lg-12 { width: 100%; }
// Push and pull columns for source order changes
.col-lg-push-1 { left: percentage((1 / $grid-columns)); }
.col-lg-push-2 { left: percentage((2 / $grid-columns)); }
.col-lg-push-3 { left: percentage((3 / $grid-columns)); }
.col-lg-push-4 { left: percentage((4 / $grid-columns)); }
.col-lg-push-5 { left: percentage((5 / $grid-columns)); }
.col-lg-push-6 { left: percentage((6 / $grid-columns)); }
.col-lg-push-7 { left: percentage((7 / $grid-columns)); }
.col-lg-push-8 { left: percentage((8 / $grid-columns)); }
.col-lg-push-9 { left: percentage((9 / $grid-columns)); }
.col-lg-push-10 { left: percentage((10/ $grid-columns)); }
.col-lg-push-11 { left: percentage((11/ $grid-columns)); }
.col-lg-pull-1 { right: percentage((1 / $grid-columns)); }
.col-lg-pull-2 { right: percentage((2 / $grid-columns)); }
.col-lg-pull-3 { right: percentage((3 / $grid-columns)); }
.col-lg-pull-4 { right: percentage((4 / $grid-columns)); }
.col-lg-pull-5 { right: percentage((5 / $grid-columns)); }
.col-lg-pull-6 { right: percentage((6 / $grid-columns)); }
.col-lg-pull-7 { right: percentage((7 / $grid-columns)); }
.col-lg-pull-8 { right: percentage((8 / $grid-columns)); }
.col-lg-pull-9 { right: percentage((9 / $grid-columns)); }
.col-lg-pull-10 { right: percentage((10/ $grid-columns)); }
.col-lg-pull-11 { right: percentage((11/ $grid-columns)); }
// Offsets
.col-offset-1 { margin-left: percentage((1 / $grid-columns)); }
.col-offset-2 { margin-left: percentage((2 / $grid-columns)); }
.col-offset-3 { margin-left: percentage((3 / $grid-columns)); }
.col-offset-4 { margin-left: percentage((4 / $grid-columns)); }
.col-offset-5 { margin-left: percentage((5 / $grid-columns)); }
.col-offset-6 { margin-left: percentage((6 / $grid-columns)); }
.col-offset-7 { margin-left: percentage((7 / $grid-columns)); }
.col-offset-8 { margin-left: percentage((8 / $grid-columns)); }
.col-offset-9 { margin-left: percentage((9 / $grid-columns)); }
.col-offset-10 { margin-left: percentage((10/ $grid-columns)); }
.col-offset-11 { margin-left: percentage((11/ $grid-columns)); }
.col-lg-offset-1 { margin-left: percentage((1 / $grid-columns)); }
.col-lg-offset-2 { margin-left: percentage((2 / $grid-columns)); }
.col-lg-offset-3 { margin-left: percentage((3 / $grid-columns)); }
.col-lg-offset-4 { margin-left: percentage((4 / $grid-columns)); }
.col-lg-offset-5 { margin-left: percentage((5 / $grid-columns)); }
.col-lg-offset-6 { margin-left: percentage((6 / $grid-columns)); }
.col-lg-offset-7 { margin-left: percentage((7 / $grid-columns)); }
.col-lg-offset-8 { margin-left: percentage((8 / $grid-columns)); }
.col-lg-offset-9 { margin-left: percentage((9 / $grid-columns)); }
.col-lg-offset-10 { margin-left: percentage((10/ $grid-columns)); }
.col-lg-offset-11 { margin-left: percentage((11/ $grid-columns)); }
}
// Large desktops and up

5
vendor/assets/stylesheets/bootstrap/_input-groups.scss vendored
View file

@ -5,6 +5,7 @@
// Base styles
// -------------------------
.input-group {
position: relative; // For dropdowns
display: table;
border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table
@ -135,7 +136,9 @@
// --------------------------------------------------
// Horizontal forms are built on grid classes.
.form-horizontal .control-label {
.form-horizontal .control-label,
.form-horizontal .radio-inline,
.form-horizontal .checkbox-inline {
padding-top: 9px;
}

67
vendor/assets/stylesheets/bootstrap/_navs.scss vendored
View file

@ -69,40 +69,6 @@
}
// Nav variations
// --------------------------------------------------
// Justified nav links
// -------------------------
.nav-justified {
width: 100%;
> li {
float: none;
display: table-cell;
width: 1%;
> a {
text-align: center;
}
}
}
// 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;
}
> .active > a {
border-bottom-color: $nav-tabs-justified-active-link-border-color;
}
}
// Tabs
// -------------------------
@ -185,6 +151,39 @@
}
// Nav variations
// --------------------------------------------------
// Justified nav links
// -------------------------
.nav-justified {
width: 100%;
> li {
float: none;
display: table-cell;
width: 1%;
> a {
text-align: center;
}
}
}
// 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;
}
> .active > a {
border-bottom-color: $nav-tabs-justified-active-link-border-color;
}
}
// Tabbable tabs
// -------------------------

6
vendor/assets/stylesheets/bootstrap/_pagination.scss vendored
View file

@ -6,7 +6,7 @@
padding-left: 0;
margin: $line-height-computed 0;
border-radius: $border-radius-base;
> li {
display: inline; // Remove list-style and block-level defaults
> a,
@ -33,7 +33,7 @@
}
}
}
> li > a:hover,
> li > a:focus,
> .active > a,
@ -45,7 +45,7 @@
color: $pagination-active-color;
cursor: default;
}
> .disabled {
> span,
> a,

1
vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss vendored
View file

@ -44,6 +44,7 @@
@include responsive-visibility('.hidden-md');
@include responsive-visibility('.hidden-lg');
// Tablets & small desktops only
@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
@include responsive-invisibility('.visible-sm');

11
vendor/assets/stylesheets/bootstrap/_variables.scss vendored
View file

@ -60,15 +60,18 @@ $headings-line-height: 1.1 !default;
// -------------------------
// Based on 14px font-size and 1.428 line-height (~20px to start)
$padding-base-vertical: 8px !default;
$padding-base-vertical: 6px !default;
$padding-base-horizontal: 12px !default;
$padding-large-vertical: 14px !default;
$padding-large-vertical: 10px !default;
$padding-large-horizontal: 16px !default;
$padding-small-vertical: 5px !default;
$padding-small-horizontal: 10px !default;
$line-height-large: 1.33 !default;
$line-height-small: 1.5 !default;
$border-radius-base: 4px !default;
$border-radius-large: 6px !default;
$border-radius-small: 3px !default;
@ -132,8 +135,8 @@ $input-border-radius: $border-radius-base !default;
$input-color-placeholder: $gray-light !default;
$input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
$input-height-large: (ceil($font-size-large * $line-height-base) + ($padding-large-vertical * 2) + 2) !default;
$input-height-small: (ceil($font-size-small * $line-height-base) + ($padding-small-vertical * 2) + 2) !default;
$input-height-large: (floor($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
$legend-border-color: #e5e5e5 !default;