diff --git a/tasks/converter.rb b/tasks/converter.rb index cc5b36802de5..8c54038d9e9b 100644 --- a/tasks/converter.rb +++ b/tasks/converter.rb @@ -131,24 +131,22 @@ def replace_file_imports(less) end # Replaces the following: - # .mixin() -> @import twbs-mixin() - # #scope > .mixin() -> @import twbs-scope-mixin() + # .mixin() -> @import mixin() + # #scope > .mixin() -> @import scope-mixin() def replace_mixins(less) mixin_pattern = /(\s*)(([#|\.][\w-]+\s*>\s*)*)\.([\w-]+\(.*\))/ less.gsub(mixin_pattern) do |match| matches = match.scan(mixin_pattern).flatten scope = matches[1] || '' if scope != '' - scope = 'twbs-' + scope.scan(/[\w-]+/).join('-') - else - scope = 'twbs' + scope = scope.scan(/[\w-]+/).join('-') + '-' end - "#{matches.first}@include #{scope}-#{matches.last}" + "#{matches.first}@include #{scope}#{matches.last}" end end def replace_mixin_file(less) - less.gsub(/^(\s*)\.([\w-]+\(.*\))(\s*{)/, '\1@mixin twbs-\2\3') + less.gsub(/^(\s*)\.([\w-]+\(.*\))(\s*{)/, '\1@mixin \2\3') end def replace_vars(less) diff --git a/vendor/assets/stylesheets/bootstrap/_alerts.scss b/vendor/assets/stylesheets/bootstrap/_alerts.scss index 3cf51fa28838..5685b8d699c4 100644 --- a/vendor/assets/stylesheets/bootstrap/_alerts.scss +++ b/vendor/assets/stylesheets/bootstrap/_alerts.scss @@ -43,13 +43,13 @@ // ------------------------- .alert-success { - @include twbs-alert-variant($alert-success-bg, $alert-success-border, $alert-success-text); + @include alert-variant($alert-success-bg, $alert-success-border, $alert-success-text); } .alert-danger { - @include twbs-alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text); + @include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text); } .alert-info { - @include twbs-alert-variant($alert-info-bg, $alert-info-border, $alert-info-text); + @include alert-variant($alert-info-bg, $alert-info-border, $alert-info-text); } // Block alerts diff --git a/vendor/assets/stylesheets/bootstrap/_button-groups.scss b/vendor/assets/stylesheets/bootstrap/_button-groups.scss index 4a1cb48139a5..16f682e6fc14 100644 --- a/vendor/assets/stylesheets/bootstrap/_button-groups.scss +++ b/vendor/assets/stylesheets/bootstrap/_button-groups.scss @@ -34,7 +34,7 @@ // Optional: Group multiple button groups together for a toolbar .btn-toolbar { - @include twbs-clearfix(); + @include clearfix(); .btn-group { float: left; @@ -56,13 +56,13 @@ .btn-group > .btn:first-child { margin-left: 0; &:not(:last-child):not(.dropdown-toggle) { - @include twbs-border-right-radius(0); + @include border-right-radius(0); } } // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it .btn-group > .btn:last-child:not(:first-child), .btn-group > .dropdown-toggle:not(:first-child) { - @include twbs-border-left-radius(0); + @include border-left-radius(0); } // Custom edits for including btn-groups within btn-groups (useful for including dropdown buttons within a btn-group) @@ -75,11 +75,11 @@ .btn-group > .btn-group:first-child { > .btn:last-child, > .dropdown-toggle { - @include twbs-border-right-radius(0); + @include border-right-radius(0); } } .btn-group > .btn-group:last-child > .btn:first-child { - @include twbs-border-left-radius(0); + @include border-left-radius(0); } // On active and open, don't show outline @@ -106,7 +106,7 @@ // The clickable button for toggling the menu // Remove the gradient and set the same inset shadow as the :active state .btn-group.open .dropdown-toggle { - @include twbs-box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); } @@ -141,10 +141,10 @@ border-radius: 0; } &:first-child { - @include twbs-border-bottom-radius(0); + @include border-bottom-radius(0); } &:last-child { - @include twbs-border-top-radius(0); + @include border-top-radius(0); } } diff --git a/vendor/assets/stylesheets/bootstrap/_buttons.scss b/vendor/assets/stylesheets/bootstrap/_buttons.scss index 2097f8144921..17fe0fee7dc7 100644 --- a/vendor/assets/stylesheets/bootstrap/_buttons.scss +++ b/vendor/assets/stylesheets/bootstrap/_buttons.scss @@ -22,7 +22,7 @@ white-space: nowrap; &:focus { - @include twbs-tab-focus(); + @include tab-focus(); } &:hover, @@ -35,7 +35,7 @@ &.active { outline: 0; background-image: none; - @include twbs-box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); } &.disabled, @@ -43,8 +43,8 @@ fieldset[disabled] & { cursor: default; pointer-events: none; // Future-proof disabling of clicks - @include twbs-opacity(.65); - @include twbs-box-shadow(none); + @include opacity(.65); + @include box-shadow(none); } } @@ -54,26 +54,26 @@ // -------------------------------------------------- .btn-default { - @include twbs-btn-pseudo-states($btn-default-color, $btn-default-bg, $btn-default-border); + @include btn-pseudo-states($btn-default-color, $btn-default-bg, $btn-default-border); } .btn-primary { - @include twbs-btn-pseudo-states($btn-primary-color, $btn-primary-bg, $btn-primary-border); + @include btn-pseudo-states($btn-primary-color, $btn-primary-bg, $btn-primary-border); } // Warning appears as orange .btn-warning { - @include twbs-btn-pseudo-states($btn-warning-color, $btn-warning-bg, $btn-warning-border); + @include btn-pseudo-states($btn-warning-color, $btn-warning-bg, $btn-warning-border); } // Danger and error appear as red .btn-danger { - @include twbs-btn-pseudo-states($btn-danger-color, $btn-danger-bg, $btn-danger-border); + @include btn-pseudo-states($btn-danger-color, $btn-danger-bg, $btn-danger-border); } // Success appears as green .btn-success { - @include twbs-btn-pseudo-states($btn-success-color, $btn-success-bg, $btn-success-border); + @include btn-pseudo-states($btn-success-color, $btn-success-bg, $btn-success-border); } // Info appears as blue-green .btn-info { - @include twbs-btn-pseudo-states($btn-info-color, $btn-info-bg, $btn-info-border); + @include btn-pseudo-states($btn-info-color, $btn-info-bg, $btn-info-border); } @@ -93,7 +93,7 @@ fieldset[disabled] & { background-color: transparent; background-image: none; - @include twbs-box-shadow(none); + @include box-shadow(none); } &, &:hover, diff --git a/vendor/assets/stylesheets/bootstrap/_carousel.scss b/vendor/assets/stylesheets/bootstrap/_carousel.scss index f0e3fb3b735e..866fb39527d7 100644 --- a/vendor/assets/stylesheets/bootstrap/_carousel.scss +++ b/vendor/assets/stylesheets/bootstrap/_carousel.scss @@ -16,7 +16,7 @@ > .item { display: none; position: relative; - @include twbs-transition(.6s ease-in-out left); + @include transition(.6s ease-in-out left); // Account for jankitude on images > img, @@ -70,7 +70,7 @@ left: 0; bottom: 0; width: 15%; - @include twbs-opacity(.5); + @include opacity(.5); font-size: 20px; color: #fff; text-align: center; @@ -80,13 +80,13 @@ // Set gradients for backgrounds &.left { - @include twbs-gradient-horizontal($start-color: rgba(0,0,0,.5), $end-color: rgba(0,0,0,.0001)); + @include gradient-horizontal($start-color: rgba(0,0,0,.5), $end-color: rgba(0,0,0,.0001)); background-color: transparent; } &.right { left: auto; right: 0; - @include twbs-gradient-horizontal($start-color: rgba(0,0,0,.0001), $end-color: rgba(0,0,0,.5)); + @include gradient-horizontal($start-color: rgba(0,0,0,.0001), $end-color: rgba(0,0,0,.5)); background-color: transparent; } @@ -95,7 +95,7 @@ &:focus { color: #fff; text-decoration: none; - @include twbs-opacity(.9); + @include opacity(.9); } // Toggles diff --git a/vendor/assets/stylesheets/bootstrap/_close.scss b/vendor/assets/stylesheets/bootstrap/_close.scss index f477462143ef..286333cbbd94 100644 --- a/vendor/assets/stylesheets/bootstrap/_close.scss +++ b/vendor/assets/stylesheets/bootstrap/_close.scss @@ -10,14 +10,14 @@ line-height: 1; color: #000; text-shadow: 0 1px 0 rgba(255,255,255,1); - @include twbs-opacity(.2); + @include opacity(.2); &:hover, &:focus { color: #000; text-decoration: none; cursor: pointer; - @include twbs-opacity(.5); + @include opacity(.5); } } diff --git a/vendor/assets/stylesheets/bootstrap/_component-animations.scss b/vendor/assets/stylesheets/bootstrap/_component-animations.scss index d04dec883121..87e744cb0d17 100644 --- a/vendor/assets/stylesheets/bootstrap/_component-animations.scss +++ b/vendor/assets/stylesheets/bootstrap/_component-animations.scss @@ -5,7 +5,7 @@ .fade { opacity: 0; - @include twbs-transition(opacity .15s linear); + @include transition(opacity .15s linear); &.in { opacity: 1; } @@ -15,7 +15,7 @@ position: relative; height: 0; overflow: hidden; - @include twbs-transition(height .35s ease); + @include transition(height .35s ease); &.in { height: auto; diff --git a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss index 63a1d47af026..6eb3b27b521a 100644 --- a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +++ b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss @@ -34,8 +34,8 @@ border: 1px solid #ccc; // IE8 fallback border: 1px solid $dropdown-border; border-radius: $border-radius-base; - @include twbs-box-shadow(0 6px 12px rgba(0,0,0,.175)); - @include twbs-background-clip(padding-box); + @include box-shadow(0 6px 12px rgba(0,0,0,.175)); + @include background-clip(padding-box); // Aligns the dropdown menu to right &.pull-right { @@ -45,7 +45,7 @@ // Dividers (basically an hr) within the dropdown .divider { - @include twbs-nav-divider($dropdown-divider-top, $dropdown-divider-bottom); + @include nav-divider($dropdown-divider-top, $dropdown-divider-bottom); } // Links within the dropdown menu @@ -67,7 +67,7 @@ &:focus { text-decoration: none; color: $dropdown-link-hover-color; - @include twbs-gradient-vertical($start-color: $dropdown-link-hover-bg, $end-color: darken($dropdown-link-hover-bg, 5%)); + @include gradient-vertical($start-color: $dropdown-link-hover-bg, $end-color: darken($dropdown-link-hover-bg, 5%)); } } @@ -80,7 +80,7 @@ color: $dropdown-link-active-color; text-decoration: none; outline: 0; - @include twbs-gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%)); + @include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%)); } } @@ -101,7 +101,7 @@ text-decoration: none; background-color: transparent; background-image: none; // Remove CSS gradient - @include twbs-reset-filter(); + @include reset-filter(); cursor: default; } } diff --git a/vendor/assets/stylesheets/bootstrap/_forms.scss b/vendor/assets/stylesheets/bootstrap/_forms.scss index b5f398e4de2a..10a1bd31e7aa 100644 --- a/vendor/assets/stylesheets/bootstrap/_forms.scss +++ b/vendor/assets/stylesheets/bootstrap/_forms.scss @@ -64,13 +64,13 @@ input[type="color"] { background-color: $input-bg; border: 1px solid $input-border; border-radius: $input-border-radius; - @include twbs-box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); - @include twbs-transition(#{border-color ease-in-out .15s, box-shadow ease-in-out .15s}); + @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); + @include transition(#{border-color ease-in-out .15s, box-shadow ease-in-out .15s}); &:focus { border-color: rgba(82,168,236,.8); outline: 0; - @include twbs-box-shadow(#{inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)}); + @include box-shadow(#{inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)}); } // Disabled and read-only inputs @@ -106,7 +106,7 @@ input[type="checkbox"] { // Override content-box in Normalize (* isn't specific enough) input[type="search"] { - @include twbs-box-sizing(border-box); + @include box-sizing(border-box); } // Reset height since textareas have rows @@ -146,7 +146,7 @@ select optgroup { input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - @include twbs-tab-focus(); + @include tab-focus(); } // Fix for Chrome number input @@ -166,7 +166,7 @@ input[type="number"] { // Placeholder text gets special styles because when browsers invalidate entire lines if it doesn't understand a selector input, textarea { - @include twbs-placeholder(); + @include placeholder(); } @@ -268,15 +268,15 @@ input[type="color"] { // Warning .has-warning { - @include twbs-form-field-validation($state-warning-text, $state-warning-text, $state-warning-bg); + @include form-field-validation($state-warning-text, $state-warning-text, $state-warning-bg); } // Error .has-error { - @include twbs-form-field-validation($state-danger-text, $state-danger-text, $state-danger-bg); + @include form-field-validation($state-danger-text, $state-danger-text, $state-danger-bg); } // Success .has-success { - @include twbs-form-field-validation($state-success-text, $state-success-text, $state-success-bg); + @include form-field-validation($state-success-text, $state-success-text, $state-success-bg); } @@ -339,7 +339,7 @@ input[type="color"] { // Text input groups // ------------------------- .input-group-addon { - @include twbs-box-sizing(border-box); + @include box-sizing(border-box); padding: $padding-base-vertical $padding-base-horizontal; font-size: $font-size-base; font-weight: normal; @@ -368,7 +368,7 @@ input[type="color"] { .input-group-btn:first-child > .btn, .input-group-btn:first-child > .dropdown-toggle, .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) { - @include twbs-border-right-radius(0); + @include border-right-radius(0); } .input-group-addon:first-child { border-right: 0; @@ -378,7 +378,7 @@ input[type="color"] { .input-group-btn:last-child > .btn, .input-group-btn:last-child > .dropdown-toggle, .input-group-btn:first-child > .btn:not(:first-child) { - @include twbs-border-left-radius(0); + @include border-left-radius(0); } .input-group-addon:last-child { border-left: 0; diff --git a/vendor/assets/stylesheets/bootstrap/_grid.scss b/vendor/assets/stylesheets/bootstrap/_grid.scss index 070a1d264533..b3e8ed64e6a7 100644 --- a/vendor/assets/stylesheets/bootstrap/_grid.scss +++ b/vendor/assets/stylesheets/bootstrap/_grid.scss @@ -4,12 +4,12 @@ // Set the container width, and override it for fixed navbars in media queries .container { - @include twbs-container-fixed(); + @include container-fixed(); } // Mobile-first defaults .row { - @include twbs-make-row(); + @include make-row(); } // Common styles for small and large grid columns diff --git a/vendor/assets/stylesheets/bootstrap/_labels.scss b/vendor/assets/stylesheets/bootstrap/_labels.scss index 284728e2f53c..8515ec0d8e55 100644 --- a/vendor/assets/stylesheets/bootstrap/_labels.scss +++ b/vendor/assets/stylesheets/bootstrap/_labels.scss @@ -30,17 +30,17 @@ // Colors // Contextual variations (linked labels get darker on :hover) .label-danger { - @include twbs-label-variant($label-danger-bg); + @include label-variant($label-danger-bg); } .label-success { - @include twbs-label-variant($label-success-bg); + @include label-variant($label-success-bg); } .label-warning { - @include twbs-label-variant($label-warning-bg); + @include label-variant($label-warning-bg); } .label-info { - @include twbs-label-variant($label-info-bg); + @include label-variant($label-info-bg); } diff --git a/vendor/assets/stylesheets/bootstrap/_list-group.scss b/vendor/assets/stylesheets/bootstrap/_list-group.scss index bcf371167692..a5cad9ebdbcf 100644 --- a/vendor/assets/stylesheets/bootstrap/_list-group.scss +++ b/vendor/assets/stylesheets/bootstrap/_list-group.scss @@ -25,11 +25,11 @@ // Round the first and last items &:first-child { - @include twbs-border-top-radius($border-radius-base); + @include border-top-radius($border-radius-base); } &:last-child { margin-bottom: 0; - @include twbs-border-bottom-radius($border-radius-base); + @include border-bottom-radius($border-radius-base); } // Align badges within list items diff --git a/vendor/assets/stylesheets/bootstrap/_mixins.scss b/vendor/assets/stylesheets/bootstrap/_mixins.scss index 3029398c9844..61df07925a8d 100644 --- a/vendor/assets/stylesheets/bootstrap/_mixins.scss +++ b/vendor/assets/stylesheets/bootstrap/_mixins.scss @@ -16,7 +16,7 @@ // 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. -@mixin twbs-clearfix() { +@mixin clearfix() { &:before, &:after { content: " "; /* 1 */ @@ -28,7 +28,7 @@ } // Webkit-style focus -@mixin twbs-tab-focus() { +@mixin tab-focus() { // Default outline: thin dotted #333; // Webkit @@ -37,23 +37,23 @@ } // Center-align a block level element -@mixin twbs-center-block() { +@mixin center-block() { display: block; margin-left: auto; margin-right: auto; } // Sizing shortcuts -@mixin twbs-size($width, $height) { +@mixin size($width, $height) { width: $width; height: $height; } -@mixin twbs-square($size) { - @include twbs-size($size, $size); +@mixin square($size) { + @include size($size, $size); } // Placeholder text -@mixin twbs-placeholder($color: $input-color-placeholder) { +@mixin placeholder($color: $input-color-placeholder) { &:-moz-placeholder { color: $color; } // Firefox 4-18 &::-moz-placeholder { color: $color; } // Firefox 19+ &:-ms-input-placeholder { color: $color; } // Internet Explorer 10+ @@ -62,7 +62,7 @@ // Text overflow // Requires inline-block or block for proper styling -@mixin twbs-text-overflow() { +@mixin text-overflow() { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -70,7 +70,7 @@ // CSS image replacement // Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757 -@mixin twbs-hide-text() { +@mixin hide-text() { font: 0/0 a; color: transparent; text-shadow: none; @@ -84,43 +84,43 @@ // -------------------------------------------------- // Single side border-radius -@mixin twbs-border-top-radius($radius) { +@mixin border-top-radius($radius) { border-top-right-radius: $radius; border-top-left-radius: $radius; } -@mixin twbs-border-right-radius($radius) { +@mixin border-right-radius($radius) { border-bottom-right-radius: $radius; border-top-right-radius: $radius; } -@mixin twbs-border-bottom-radius($radius) { +@mixin border-bottom-radius($radius) { border-bottom-right-radius: $radius; border-bottom-left-radius: $radius; } -@mixin twbs-border-left-radius($radius) { +@mixin border-left-radius($radius) { border-bottom-left-radius: $radius; border-top-left-radius: $radius; } // Drop shadows -@mixin twbs-box-shadow($shadow) { +@mixin box-shadow($shadow) { -webkit-box-shadow: $shadow; // iOS <4.3 & Android <4.1 box-shadow: $shadow; } // Transitions -@mixin twbs-transition($transition) { +@mixin transition($transition) { -webkit-transition: $transition; -moz-transition: $transition; -o-transition: $transition; transition: $transition; } -@mixin twbs-transition-delay($transition-delay) { +@mixin transition-delay($transition-delay) { -webkit-transition-delay: $transition-delay; -moz-transition-delay: $transition-delay; -o-transition-delay: $transition-delay; transition-delay: $transition-delay; } -@mixin twbs-transition-duration($transition-duration) { +@mixin transition-duration($transition-duration) { -webkit-transition-duration: $transition-duration; -moz-transition-duration: $transition-duration; -o-transition-duration: $transition-duration; @@ -128,35 +128,35 @@ } // Transformations -@mixin twbs-rotate($degrees) { +@mixin rotate($degrees) { -webkit-transform: rotate($degrees); -moz-transform: rotate($degrees); -ms-transform: rotate($degrees); -o-transform: rotate($degrees); transform: rotate($degrees); } -@mixin twbs-scale($ratio) { +@mixin scale($ratio) { -webkit-transform: scale($ratio); -moz-transform: scale($ratio); -ms-transform: scale($ratio); -o-transform: scale($ratio); transform: scale($ratio); } -@mixin twbs-translate($x, $y) { +@mixin translate($x, $y) { -webkit-transform: translate($x, $y); -moz-transform: translate($x, $y); -ms-transform: translate($x, $y); -o-transform: translate($x, $y); transform: translate($x, $y); } -@mixin twbs-skew($x, $y) { +@mixin skew($x, $y) { -webkit-transform: skew($x, $y); -moz-transform: skew($x, $y); -ms-transform: skewX($x) skewY($y); // See https://github.com/twitter/bootstrap/issues/4885 -o-transform: skew($x, $y); transform: skew($x, $y); } -@mixin twbs-translate3d($x, $y, $z) { +@mixin translate3d($x, $y, $z) { -webkit-transform: translate3d($x, $y, $z); -moz-transform: translate3d($x, $y, $z); -o-transform: translate3d($x, $y, $z); @@ -167,21 +167,21 @@ // Prevent browsers from flickering when using CSS 3D transforms. // Default value is `visible`, but can be changed to `hidden // See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples -@mixin twbs-backface-visibility($visibility){ +@mixin backface-visibility($visibility){ -webkit-backface-visibility: $visibility; -moz-backface-visibility: $visibility; backface-visibility: $visibility; } // Background clipping -@mixin twbs-background-clip($clip) { +@mixin background-clip($clip) { -webkit-background-clip: $clip; -moz-background-clip: $clip; background-clip: $clip; } // Background sizing -@mixin twbs-background-size($size) { +@mixin background-size($size) { -webkit-background-size: $size; -moz-background-size: $size; -o-background-size: $size; @@ -189,7 +189,7 @@ } // Box sizing -@mixin twbs-box-sizing($boxmodel) { +@mixin box-sizing($boxmodel) { -webkit-box-sizing: $boxmodel; -moz-box-sizing: $boxmodel; box-sizing: $boxmodel; @@ -197,7 +197,7 @@ // User select // For selecting text on the page -@mixin twbs-user-select($select) { +@mixin user-select($select) { -webkit-user-select: $select; -moz-user-select: $select; -ms-user-select: $select; @@ -206,13 +206,13 @@ } // Resize anything -@mixin twbs-resizable($direction) { +@mixin resizable($direction) { resize: $direction; // Options: horizontal, vertical, both overflow: auto; // Safari fix } // CSS3 Content Columns -@mixin twbs-content-columns($column-count, $column-gap: $grid-gutter-width) { +@mixin content-columns($column-count, $column-gap: $grid-gutter-width) { -webkit-column-count: $column-count; -moz-column-count: $column-count; column-count: $column-count; @@ -222,7 +222,7 @@ } // Optional hyphenation -@mixin twbs-hyphens($mode: auto) { +@mixin hyphens($mode: auto) { word-wrap: break-word; -webkit-hyphens: $mode; -moz-hyphens: $mode; @@ -232,7 +232,7 @@ } // Opacity -@mixin twbs-opacity($opacity) { +@mixin opacity($opacity) { opacity: $opacity; // IE8 filter $opacity-ie: ($opacity * 100); @@ -248,7 +248,7 @@ // // Creates two color stops, start and end, by specifying a color and position for each color stop. // Color stops are not available in IE9 and below. -@mixin twbs-gradient-horizontal($start-color: #555, $start-percent: 0%, $end-color: #333, $end-percent: 100%) { +@mixin gradient-horizontal($start-color: #555, $start-percent: 0%, $end-color: #333, $end-percent: 100%) { background-color: $end-color; background-image: -webkit-gradient(linear, $start-percent top, $end-percent top, from($start-color), to($end-color)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(left, color-stop($start-color $start-percent), color-stop($end-color $end-percent)); // Safari 5.1+, Chrome 10+ @@ -262,7 +262,7 @@ // // Creates two color stops, start and end, by specifying a color and position for each color stop. // Color stops are not available in IE9 and below. -@mixin twbs-gradient-vertical($start-color: #555, $start-percent: 0%, $end-color: #333, $end-percent: 100%) { +@mixin gradient-vertical($start-color: #555, $start-percent: 0%, $end-color: #333, $end-percent: 100%) { background-color: $end-color; background-image: -webkit-gradient(linear, left $start-percent, left $end-percent, from($start-color), to($end-color)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(top, $start-color, $start-percent, $end-color, $end-percent); // Safari 5.1+, Chrome 10+ @@ -272,14 +272,14 @@ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down } -@mixin twbs-gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) { +@mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) { background-color: $end-color; background-repeat: repeat-x; background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1+, Chrome 10+ background-image: -moz-linear-gradient($deg, $start-color, $end-color); // FF 3.6+ background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10 } -@mixin twbs-gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { +@mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { background-color: mix($mid-color, $end-color, 80%); background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color)); background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color); @@ -289,7 +289,7 @@ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback } -@mixin twbs-gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { +@mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { background-color: mix($mid-color, $end-color, 80%); background-image: -webkit-gradient(linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color)); background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color); @@ -298,7 +298,7 @@ background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback } -@mixin twbs-gradient-radial($inner-color: #555, $outer-color: #333) { +@mixin gradient-radial($inner-color: #555, $outer-color: #333) { background-color: $outer-color; background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($inner-color), to($outer-color)); background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color); @@ -306,7 +306,7 @@ background-image: radial-gradient(circle, $inner-color, $outer-color); background-repeat: no-repeat; } -@mixin twbs-gradient-striped($color: #555, $angle: 45deg) { +@mixin gradient-striped($color: #555, $angle: 45deg) { background-color: $color; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); background-image: -webkit-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); @@ -318,7 +318,7 @@ // // When you need to remove a gradient background, don't forget to use this to reset // the IE filter for IE9 and below. -@mixin twbs-reset-filter() { +@mixin reset-filter() { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } @@ -328,7 +328,7 @@ // -------------------------------------------------- // Short retina mixin for setting background-image and -size -@mixin twbs-img-retina($file-1x, $file-2x, $width-1x, $height-1x) { +@mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) { background-image: url("${file-1x}"); @media @@ -350,7 +350,7 @@ // Horizontal dividers // ------------------------- // Dividers (basically an hr) within dropdowns and nav lists -@mixin twbs-nav-divider($top: #e5e5e5, $bottom: #fff) { +@mixin nav-divider($top: #e5e5e5, $bottom: #fff) { height: 2px; // 1px for background, one for border margin: (($line-height-computed / 2) - 1) 0; overflow: hidden; @@ -360,7 +360,7 @@ // Alerts // ------------------------- -@mixin twbs-alert-variant($background, $border, $text-color) { +@mixin alert-variant($background, $border, $text-color) { background-color: $background; border-color: $border; color: $text-color; @@ -376,7 +376,7 @@ // ------------------------- // Easily pump out default styles, as well as :hover, :focus, :active, // and disabled options for all buttons -@mixin twbs-btn-pseudo-states($color, $background, $border) { +@mixin btn-pseudo-states($color, $background, $border) { color: $color; background-color: $background; border-color: $border; @@ -405,7 +405,7 @@ // Labels // ------------------------- -@mixin twbs-label-variant($color) { +@mixin label-variant($color) { background-color: $color; &[href] { &:hover, @@ -418,18 +418,18 @@ // Navbar vertical align // ------------------------- // Vertically center elements in the navbar. -// Example: an element has a height of 30px, so write out `@include twbs-navbarVerticalAlign(30px);` to calculate the appropriate top margin. -@mixin twbs-navbar-vertical-align($element-height) { +// Example: an element has a height of 30px, so write out `@include navbarVerticalAlign(30px);` to calculate the appropriate top margin. +@mixin navbar-vertical-align($element-height) { margin-top: (($navbar-height - $element-height) / 2); margin-bottom: (($navbar-height - $element-height) / 2); } // Progress bars // ------------------------- -@mixin twbs-progress-bar-variant($color) { +@mixin progress-bar-variant($color) { background-color: $color; .progress-striped & { - @include twbs-gradient-striped($color); + @include gradient-striped($color); } } @@ -437,14 +437,14 @@ // ------------------------- // More easily include all the states for responsive-utilities.less. // $parent hack because sass doesn't support tr& (without space) -@mixin twbs-responsive-visibility($parent) { +@mixin responsive-visibility($parent) { #{$parent} { display: block !important; } tr#{$parent} { display: table-row !important; } th#{$parent}, td#{$parent} { display: table-cell !important; } } -@mixin twbs-responsive-invisibility($parent) { +@mixin responsive-invisibility($parent) { #{$parent} { display: none !important; } tr#{$parent} { display: none !important; } th#{$parent}, @@ -455,18 +455,18 @@ // ----------- // Centered container element -@mixin twbs-container-fixed() { +@mixin container-fixed() { margin-right: auto; margin-left: auto; - @include twbs-clearfix(); + @include clearfix(); } // Make a grid // Creates a wrapper for a series of columns -@mixin twbs-make-row() { +@mixin make-row() { // Then clear the floated columns - @include twbs-clearfix(); + @include clearfix(); @media (min-width: $screen-small) { margin-left: ($grid-gutter-width / -2); @@ -480,7 +480,7 @@ } } // Generate the columns -@mixin twbs-make-column($columns) { +@mixin make-column($columns) { position: relative; // Prevent columns from collapsing when empty min-height: 1px; @@ -495,17 +495,17 @@ } } // Generate the column offsets -@mixin twbs-make-column-offset($columns) { +@mixin make-column-offset($columns) { @media (min-width: $grid-float-breakpoint) { margin-left: percentage(($columns / $grid-columns)); } } -@mixin twbs-make-column-push($columns) { +@mixin make-column-push($columns) { @media (min-width: $grid-float-breakpoint) { left: percentage(($columns / $grid-columns)); } } -@mixin twbs-make-column-pull($columns) { +@mixin make-column-pull($columns) { @media (min-width: $grid-float-breakpoint) { right: percentage(($columns / $grid-columns)); } @@ -517,7 +517,7 @@ // -------------------------------------------------- // Generate form validation states -@mixin twbs-form-field-validation($text-color: #555, $border-color: #ccc, $background-color: #f5f5f5) { +@mixin form-field-validation($text-color: #555, $border-color: #ccc, $background-color: #f5f5f5) { // Color the label text .help-block, .control-label { @@ -527,11 +527,11 @@ .input-with-feedback { padding-right: 32px; // to account for the feedback icon border-color: $border-color; - @include twbs-box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work + @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work &:focus { border-color: darken($border-color, 10%); $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($border-color, 20%); - @include twbs-box-shadow($shadow); + @include box-shadow($shadow); } } // Set validation states also for addons diff --git a/vendor/assets/stylesheets/bootstrap/_modals.scss b/vendor/assets/stylesheets/bootstrap/_modals.scss index c27886b4d138..2a9e9329acb8 100644 --- a/vendor/assets/stylesheets/bootstrap/_modals.scss +++ b/vendor/assets/stylesheets/bootstrap/_modals.scss @@ -27,7 +27,7 @@ // When fading in the modal, animate it to slide down &.fade { top: -25%; - @include twbs-transition(#{opacity 0.3s linear, top 0.3s ease-out}); + @include transition(#{opacity 0.3s linear, top 0.3s ease-out}); } &.fade.in { top: 0; } } @@ -50,8 +50,8 @@ border: 1px solid #999; border: 1px solid rgba(0,0,0,.2); border-radius: 6px; - @include twbs-box-shadow(0 3px 9px rgba(0,0,0,.5)); - @include twbs-background-clip(padding-box); + @include box-shadow(0 3px 9px rgba(0,0,0,.5)); + @include background-clip(padding-box); // Remove focus outline from opened modal outline: none; } @@ -66,8 +66,8 @@ z-index: ($zindex-modal-background - 10); background-color: #000; // Fade for backdrop - &.fade { @include twbs-opacity(0); } - &.fade.in { @include twbs-opacity(.5); } + &.fade { @include opacity(0); } + &.fade.in { @include opacity(.5); } } // Modal header @@ -101,7 +101,7 @@ padding: ($modal-inner-padding - 1) $modal-inner-padding $modal-inner-padding; text-align: right; // right align buttons border-top: 1px solid #e5e5e5; - @include twbs-clearfix(); // clear it in case folks use .pull-* classes on buttons + @include clearfix(); // clear it in case folks use .pull-* classes on buttons // Properly space out buttons .btn + .btn { @@ -130,7 +130,7 @@ padding-bottom: 30px; } .modal-content { - @include twbs-box-shadow(0 5px 15px rgba(0,0,0,.5)); + @include box-shadow(0 5px 15px rgba(0,0,0,.5)); } } diff --git a/vendor/assets/stylesheets/bootstrap/_navbar.scss b/vendor/assets/stylesheets/bootstrap/_navbar.scss index 78394bbce782..332489b99956 100644 --- a/vendor/assets/stylesheets/bootstrap/_navbar.scss +++ b/vendor/assets/stylesheets/bootstrap/_navbar.scss @@ -12,7 +12,7 @@ border-radius: $border-radius-base; // Prevent floats from breaking the navbar - @include twbs-clearfix(); + @include clearfix(); } // Navbar nav links @@ -145,7 +145,7 @@ // Navbar form .navbar-form { @extend .form-inline; - @include twbs-navbar-vertical-align($input-height-base); // Vertically center in navbar + @include navbar-vertical-align($input-height-base); // Vertically center in navbar } // Dropdown menus @@ -351,7 +351,7 @@ // Add a class to make any element properly align itself vertically within the navbars. .navbar-text { - @include twbs-navbar-vertical-align($line-height-computed); + @include navbar-vertical-align($line-height-computed); } diff --git a/vendor/assets/stylesheets/bootstrap/_navs.scss b/vendor/assets/stylesheets/bootstrap/_navs.scss index 5b2590ad3cb8..77c1817847ef 100644 --- a/vendor/assets/stylesheets/bootstrap/_navs.scss +++ b/vendor/assets/stylesheets/bootstrap/_navs.scss @@ -10,7 +10,7 @@ margin-bottom: 0; padding-left: 0; // Override default ul/ol list-style: none; - @include twbs-clearfix(); + @include clearfix(); > li { position: relative; @@ -69,7 +69,7 @@ // Dividers (basically an hr) within the dropdown .nav-divider { - @include twbs-nav-divider(); + @include nav-divider(); } } @@ -216,7 +216,7 @@ // Clear any floats .tabbable { - @include twbs-clearfix(); + @include clearfix(); } // Show/hide tabbable areas @@ -251,5 +251,5 @@ // make dropdown border overlap tab border margin-top: -1px; // Remove the top rounded corners here since there is a hard edge above the menu - @include twbs-border-top-radius(0); + @include border-top-radius(0); } diff --git a/vendor/assets/stylesheets/bootstrap/_pager.scss b/vendor/assets/stylesheets/bootstrap/_pager.scss index af2176e6934c..ef0b41ec5dfe 100644 --- a/vendor/assets/stylesheets/bootstrap/_pager.scss +++ b/vendor/assets/stylesheets/bootstrap/_pager.scss @@ -8,7 +8,7 @@ margin: $line-height-computed 0; list-style: none; text-align: center; - @include twbs-clearfix(); + @include clearfix(); li { display: inline; > a, diff --git a/vendor/assets/stylesheets/bootstrap/_pagination.scss b/vendor/assets/stylesheets/bootstrap/_pagination.scss index c2f2e05781c6..dd211c8c968c 100644 --- a/vendor/assets/stylesheets/bootstrap/_pagination.scss +++ b/vendor/assets/stylesheets/bootstrap/_pagination.scss @@ -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, @@ -23,17 +23,17 @@ > a, > span { border-left-width: 1px; - @include twbs-border-left-radius($border-radius-base); + @include border-left-radius($border-radius-base); } } &:last-child { > a, > span { - @include twbs-border-right-radius($border-radius-base); + @include border-right-radius($border-radius-base); } } } - + > li > a:hover, > li > a:focus, > .active > a, @@ -45,7 +45,7 @@ color: $gray-light; cursor: default; } - + > .disabled { > span, > a, @@ -72,13 +72,13 @@ &:first-child { > a, > span { - @include twbs-border-left-radius($border-radius-large); + @include border-left-radius($border-radius-large); } } &:last-child { > a, > span { - @include twbs-border-right-radius($border-radius-large); + @include border-right-radius($border-radius-large); } } } @@ -95,13 +95,13 @@ &:first-child { > a, > span { - @include twbs-border-left-radius($border-radius-small); + @include border-left-radius($border-radius-small); } } &:last-child { > a, > span { - @include twbs-border-right-radius($border-radius-small); + @include border-right-radius($border-radius-small); } } } diff --git a/vendor/assets/stylesheets/bootstrap/_panels.scss b/vendor/assets/stylesheets/bootstrap/_panels.scss index 5f054ef67a82..91c60de6b15a 100644 --- a/vendor/assets/stylesheets/bootstrap/_panels.scss +++ b/vendor/assets/stylesheets/bootstrap/_panels.scss @@ -10,7 +10,7 @@ background-color: $panel-bg; border: 1px solid $panel-border; border-radius: $panel-border-radius; - @include twbs-box-shadow(0 1px 1px rgba(0,0,0,.05)); + @include box-shadow(0 1px 1px rgba(0,0,0,.05)); } // Optional heading @@ -86,7 +86,7 @@ // Remove border radius for top one &:first-child { - @include twbs-border-top-radius(0); + @include border-top-radius(0); } // But keep it for the last one &:last-child { diff --git a/vendor/assets/stylesheets/bootstrap/_popovers.scss b/vendor/assets/stylesheets/bootstrap/_popovers.scss index f18ba5964f51..cb2cb8bc8ace 100644 --- a/vendor/assets/stylesheets/bootstrap/_popovers.scss +++ b/vendor/assets/stylesheets/bootstrap/_popovers.scss @@ -19,7 +19,7 @@ border: 1px solid #ccc; border: 1px solid rgba(0,0,0,.2); border-radius: 6px; - @include twbs-box-shadow(0 5px 10px rgba(0,0,0,.2)); + @include box-shadow(0 5px 10px rgba(0,0,0,.2)); // Overrides for proper insertion white-space: normal; diff --git a/vendor/assets/stylesheets/bootstrap/_progress-bars.scss b/vendor/assets/stylesheets/bootstrap/_progress-bars.scss index f3a7fbd9ce1c..4cc58780cb0f 100644 --- a/vendor/assets/stylesheets/bootstrap/_progress-bars.scss +++ b/vendor/assets/stylesheets/bootstrap/_progress-bars.scss @@ -48,7 +48,7 @@ margin-bottom: $line-height-computed; background-color: $progress-bg; border-radius: $border-radius-base; - @include twbs-box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); + @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); } // Bar of progress @@ -61,14 +61,14 @@ text-align: center; text-shadow: 0 -1px 0 rgba(0,0,0,.25); background-color: $progress-bar-bg; - @include twbs-box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)); - @include twbs-transition(width .6s ease); + @include box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)); + @include transition(width .6s ease); } // Striped bars .progress-striped .progress-bar { - @include twbs-gradient-striped($progress-bar-bg); - @include twbs-background-size(40px 40px); + @include gradient-striped($progress-bar-bg); + @include background-size(40px 40px); } // Call animation for the active one @@ -87,20 +87,20 @@ // Danger (red) .progress-bar-danger { - @include twbs-progress-bar-variant($progress-bar-danger-bg); + @include progress-bar-variant($progress-bar-danger-bg); } // Success (green) .progress-bar-success { - @include twbs-progress-bar-variant($progress-bar-success-bg); + @include progress-bar-variant($progress-bar-success-bg); } // Warning (orange) .progress-bar-warning { - @include twbs-progress-bar-variant($progress-bar-warning-bg); + @include progress-bar-variant($progress-bar-warning-bg); } // Info (teal) .progress-bar-info { - @include twbs-progress-bar-variant($progress-bar-info-bg); + @include progress-bar-variant($progress-bar-info-bg); } diff --git a/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss b/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss index 1841989ec5af..a2d57e6ee004 100644 --- a/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss +++ b/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss @@ -36,42 +36,42 @@ // Visibility utilities // For Phones -@include twbs-responsive-visibility('.visible-sm'); -@include twbs-responsive-invisibility('.visible-md'); -@include twbs-responsive-invisibility('.visible-lg'); +@include responsive-visibility('.visible-sm'); +@include responsive-invisibility('.visible-md'); +@include responsive-invisibility('.visible-lg'); -@include twbs-responsive-invisibility('.hidden-sm'); -@include twbs-responsive-visibility('.hidden-md'); -@include twbs-responsive-visibility('.hidden-lg'); +@include responsive-invisibility('.hidden-sm'); +@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 twbs-responsive-invisibility('.visible-sm'); - @include twbs-responsive-visibility('.visible-md'); - @include twbs-responsive-invisibility('.visible-lg'); + @include responsive-invisibility('.visible-sm'); + @include responsive-visibility('.visible-md'); + @include responsive-invisibility('.visible-lg'); - @include twbs-responsive-visibility('.hidden-sm'); - @include twbs-responsive-invisibility('.hidden-md'); - @include twbs-responsive-visibility('.hidden-lg'); + @include responsive-visibility('.hidden-sm'); + @include responsive-invisibility('.hidden-md'); + @include responsive-visibility('.hidden-lg'); } // For desktops @media (min-width: $screen-desktop) { - @include twbs-responsive-invisibility('.visible-sm'); - @include twbs-responsive-invisibility('.visible-md'); - @include twbs-responsive-visibility('.visible-lg'); + @include responsive-invisibility('.visible-sm'); + @include responsive-invisibility('.visible-md'); + @include responsive-visibility('.visible-lg'); - @include twbs-responsive-visibility('.hidden-sm'); - @include twbs-responsive-visibility('.hidden-md'); - @include twbs-responsive-invisibility('.hidden-lg'); + @include responsive-visibility('.hidden-sm'); + @include responsive-visibility('.hidden-md'); + @include responsive-invisibility('.hidden-lg'); } // Print utilities -@include twbs-responsive-invisibility('.visible-print'); +@include responsive-invisibility('.visible-print'); .hidden-print { } @media print { - @include twbs-responsive-visibility('.visible-print'); - @include twbs-responsive-invisibility('.hidden-print'); + @include responsive-visibility('.visible-print'); + @include responsive-invisibility('.hidden-print'); } diff --git a/vendor/assets/stylesheets/bootstrap/_scaffolding.scss b/vendor/assets/stylesheets/bootstrap/_scaffolding.scss index 5095db997d8f..0250016542a3 100644 --- a/vendor/assets/stylesheets/bootstrap/_scaffolding.scss +++ b/vendor/assets/stylesheets/bootstrap/_scaffolding.scss @@ -7,7 +7,7 @@ // ------------------------- * { - @include twbs-box-sizing(border-box); + @include box-sizing(border-box); } @@ -51,7 +51,7 @@ a:focus { text-decoration: underline; } a:focus { - @include twbs-tab-focus(); + @include tab-focus(); } diff --git a/vendor/assets/stylesheets/bootstrap/_thumbnails.scss b/vendor/assets/stylesheets/bootstrap/_thumbnails.scss index b4f9d7c7a418..8e3bca3580ed 100644 --- a/vendor/assets/stylesheets/bootstrap/_thumbnails.scss +++ b/vendor/assets/stylesheets/bootstrap/_thumbnails.scss @@ -15,7 +15,7 @@ background-color: $thumbnail-bg; border: 1px solid $thumbnail-border; border-radius: $thumbnail-border-radius; - @include twbs-transition(all .2s ease-in-out); + @include transition(all .2s ease-in-out); } .thumbnail { display: block; diff --git a/vendor/assets/stylesheets/bootstrap/_tooltip.scss b/vendor/assets/stylesheets/bootstrap/_tooltip.scss index 614309bdd3ef..c1b3f7b234a6 100644 --- a/vendor/assets/stylesheets/bootstrap/_tooltip.scss +++ b/vendor/assets/stylesheets/bootstrap/_tooltip.scss @@ -11,9 +11,9 @@ visibility: visible; font-size: $font-size-mini; line-height: 1.4; - @include twbs-opacity(0); + @include opacity(0); - &.in { @include twbs-opacity(1); } + &.in { @include opacity(1); } &.top { margin-top: -3px; padding: 5px 0; } &.right { margin-left: 3px; padding: 0 5px; } &.bottom { margin-top: 3px; padding: 5px 0; } diff --git a/vendor/assets/stylesheets/bootstrap/_type.scss b/vendor/assets/stylesheets/bootstrap/_type.scss index d43311a96ad4..2f51bb6da1b8 100644 --- a/vendor/assets/stylesheets/bootstrap/_type.scss +++ b/vendor/assets/stylesheets/bootstrap/_type.scss @@ -151,10 +151,10 @@ dd { width: ($component-offset-horizontal - 20); clear: left; text-align: right; - @include twbs-text-overflow(); + @include text-overflow(); } dd { - @include twbs-clearfix(); // Clear the floated `dt` if an empty `dd` is present + @include clearfix(); // Clear the floated `dt` if an empty `dd` is present margin-left: $component-offset-horizontal; } } diff --git a/vendor/assets/stylesheets/bootstrap/_utilities.scss b/vendor/assets/stylesheets/bootstrap/_utilities.scss index 5c5a9f311a47..955ab476a0fb 100644 --- a/vendor/assets/stylesheets/bootstrap/_utilities.scss +++ b/vendor/assets/stylesheets/bootstrap/_utilities.scss @@ -7,7 +7,7 @@ // ------------------------- .clearfix { - @include twbs-clearfix(); + @include clearfix(); } .pull-right { float: right; @@ -30,7 +30,7 @@ visibility: hidden; } .text-hide { - @include twbs-hide-text(); + @include hide-text(); } diff --git a/vendor/assets/stylesheets/bootstrap/_wells.scss b/vendor/assets/stylesheets/bootstrap/_wells.scss index b4dd612bf546..3e9643c5be49 100644 --- a/vendor/assets/stylesheets/bootstrap/_wells.scss +++ b/vendor/assets/stylesheets/bootstrap/_wells.scss @@ -11,7 +11,7 @@ background-color: $well-bg; border: 1px solid darken($well-bg, 7%); border-radius: $border-radius-base; - @include twbs-box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); + @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); blockquote { border-color: #ddd; border-color: rgba(0,0,0,.15);