twbs
/
bootstrap-sass
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

rake convert[v3.4.1]

This commit is contained in:
April Arcus 2022-02-22 11:06:45 -08:00 коммит произвёл Gleb Mazovetskiy
Родитель 2f38fa5b4a
Коммит 3c6cbc059d
13 изменённых файлов: 84 добавлений и 72 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
assets/javascripts/bootstrap-sprockets.js поставляемый
Просмотреть файл

@ -1,12 +1,12 @@
//= require ./bootstrap/affix
//= require ./bootstrap/transition
//= require ./bootstrap/alert
//= require ./bootstrap/button
//= require ./bootstrap/carousel
//= require ./bootstrap/collapse
//= require ./bootstrap/dropdown
//= require ./bootstrap/modal
//= require ./bootstrap/scrollspy
//= require ./bootstrap/tab
//= require ./bootstrap/transition
//= require ./bootstrap/affix
//= require ./bootstrap/scrollspy
//= require ./bootstrap/tooltip
//= require ./bootstrap/popover

7
assets/stylesheets/bootstrap/_carousel.scss
Просмотреть файл

@ -1,3 +1,4 @@
@use "sass:math";
//
// Carousel
// --------------------------------------------------
@ -244,16 +245,16 @@
.icon-next {
width: ($carousel-control-font-size * 1.5);
height: ($carousel-control-font-size * 1.5);
margin-top: ($carousel-control-font-size / -2);
margin-top: math.div($carousel-control-font-size, -2);
font-size: ($carousel-control-font-size * 1.5);
}
.glyphicon-chevron-left,
.icon-prev {
margin-left: ($carousel-control-font-size / -2);
margin-left: math.div($carousel-control-font-size, -2);
}
.glyphicon-chevron-right,
.icon-next {
margin-right: ($carousel-control-font-size / -2);
margin-right: math.div($carousel-control-font-size, -2);
}
}

5
assets/stylesheets/bootstrap/_code.scss
Просмотреть файл

@ -1,3 +1,4 @@
@use "sass:math";
//
// Code (inline and block)
// --------------------------------------------------
@ -40,8 +41,8 @@ kbd {
// Blocks of code
pre {
display: block;
padding: (($line-height-computed - 1) / 2);
margin: 0 0 ($line-height-computed / 2);
padding: (math.div($line-height-computed - 1), 2);
margin: 0 0 math.div($line-height-computed, 2);
font-size: ($font-size-base - 1); // 14px to 13px
line-height: $line-height-base;
color: $pre-color;

3
assets/stylesheets/bootstrap/_forms.scss
Просмотреть файл

@ -1,3 +1,4 @@
@use "sass:math";
//
// Forms
// --------------------------------------------------
@ -581,7 +582,7 @@ textarea.form-control {
// Reposition the icon because it's now within a grid column and columns have
// `position: relative;` on them. Also accounts for the grid gutter padding.
.has-feedback .form-control-feedback {
right: floor(($grid-gutter-width / 2));
right: floor(math.div($grid-gutter-width, 2));
}
// Form group sizes

7
assets/stylesheets/bootstrap/_jumbotron.scss
Просмотреть файл

@ -1,3 +1,4 @@
@use "sass:math";
//
// Jumbotron
// --------------------------------------------------
@ -16,7 +17,7 @@
}
p {
margin-bottom: ($jumbotron-padding / 2);
margin-bottom: math.div($jumbotron-padding, 2);
font-size: $jumbotron-font-size;
font-weight: 200;
}
@ -27,8 +28,8 @@
.container &,
.container-fluid & {
padding-right: ($grid-gutter-width / 2);
padding-left: ($grid-gutter-width / 2);
padding-right: math.div($grid-gutter-width, 2);
padding-left: math.div($grid-gutter-width, 2);
border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
}

3
assets/stylesheets/bootstrap/_navbar.scss
Просмотреть файл

@ -1,3 +1,4 @@
@use "sass:math";
//
// Navbars
// --------------------------------------------------
@ -228,7 +229,7 @@
// the nav the full height of the horizontal nav (above 768px).
.navbar-nav {
margin: ($navbar-padding-vertical / 2) (-$navbar-padding-horizontal);
margin: math.div($navbar-padding-vertical, 2) (-$navbar-padding-horizontal);
> li > a {
padding-top: 10px;

19
assets/stylesheets/bootstrap/_type.scss
Просмотреть файл

@ -1,3 +1,4 @@
@use "sass:math";
//
// Typography
// --------------------------------------------------
@ -25,7 +26,7 @@ h1, .h1,
h2, .h2,
h3, .h3 {
margin-top: $line-height-computed;
margin-bottom: ($line-height-computed / 2);
margin-bottom: math.div($line-height-computed, 2);
small,
.small {
@ -35,8 +36,8 @@ h3, .h3 {
h4, .h4,
h5, .h5,
h6, .h6 {
margin-top: ($line-height-computed / 2);
margin-bottom: ($line-height-computed / 2);
margin-top: math.div($line-height-computed, 2);
margin-bottom: math.div($line-height-computed, 2);
small,
.small {
@ -56,7 +57,7 @@ h6, .h6 { font-size: $font-size-h6; }
// -------------------------
p {
margin: 0 0 ($line-height-computed / 2);
margin: 0 0 math.div($line-height-computed, 2);
}
.lead {
@ -74,10 +75,10 @@ p {
// Emphasis & misc
// -------------------------
// Ex: (12px small font / 14px base font) * 100% = about 85%
// Ex: math.div(12px small font, 14px base font) * 100% = about 85%
small,
.small {
font-size: floor((100% * $font-size-small / $font-size-base));
font-size: floor(math.div(100% * $font-size-small, $font-size-base));
}
mark,
@ -136,7 +137,7 @@ mark,
// -------------------------
.page-header {
padding-bottom: (($line-height-computed / 2) - 1);
padding-bottom: (math.div($line-height-computed, 2) - 1);
margin: ($line-height-computed * 2) 0 $line-height-computed;
border-bottom: 1px solid $page-header-border-color;
}
@ -149,7 +150,7 @@ mark,
ul,
ol {
margin-top: 0;
margin-bottom: ($line-height-computed / 2);
margin-bottom: math.div($line-height-computed, 2);
ul,
ol {
margin-bottom: 0;
@ -239,7 +240,7 @@ abbr[data-original-title] {
// Blockquotes
blockquote {
padding: ($line-height-computed / 2) $line-height-computed;
padding: math.div($line-height-computed, 2) $line-height-computed;
margin: 0 0 $line-height-computed;
font-size: $blockquote-font-size;
border-left: 5px solid $blockquote-border-color;

13
assets/stylesheets/bootstrap/_variables.scss
Просмотреть файл

@ -1,4 +1,5 @@
$bootstrap-sass-asset-helper: false !default;
@use "sass:math";
//
// Variables
// --------------------------------------------------
@ -334,24 +335,24 @@ $grid-gutter-width: 30px !default;
//** Point at which the navbar becomes uncollapsed.
$grid-float-breakpoint: $screen-sm-min !default;
//** Point at which the navbar begins collapsing.
$grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
$grid-float-breakpoint-max: math.div($grid-float-breakpoint - 1) !default;
//== Container sizes
//
//## Define the maximum width of `.container` for different screen sizes.
// Small screen / tablet
// Small screen, tablet
$container-tablet: (720px + $grid-gutter-width) !default;
//** For `$screen-sm-min` and up.
$container-sm: $container-tablet !default;
// Medium screen / desktop
$container-desktop: (940px + $grid-gutter-width) !default;
$container-desktop: math.div(940px + $grid-gutter-width) !default;
//** For `$screen-md-min` and up.
$container-md: $container-desktop !default;
// Large screen / wide desktop
// Large screen, wide desktop
$container-large-desktop: (1140px + $grid-gutter-width) !default;
//** For `$screen-lg-min` and up.
$container-lg: $container-large-desktop !default;
@ -365,8 +366,8 @@ $container-lg: $container-large-desktop !default;
$navbar-height: 50px !default;
$navbar-margin-bottom: $line-height-computed !default;
$navbar-border-radius: $border-radius-base !default;
$navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default;
$navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default;
$navbar-padding-horizontal: floor(math.div($grid-gutter-width, 2)) !default;
$navbar-padding-vertical: (math.div($navbar-height - $line-height-computed), 2) !default;
$navbar-collapse-max-height: 340px !default;
$navbar-default-color: #777 !default;

13
assets/stylesheets/bootstrap/mixins/_grid-framework.scss
Просмотреть файл

@ -1,3 +1,4 @@
@use "sass:math";
// Framework grid generation
//
// Used only by Bootstrap to generate the correct number of grid classes given
@ -13,8 +14,8 @@
// Prevent columns from collapsing when empty
min-height: 1px;
// Inner gutter via padding
padding-right: floor(($grid-gutter-width / 2));
padding-left: ceil(($grid-gutter-width / 2));
padding-right: floor(math.div($grid-gutter-width, 2));
padding-left: ceil(math.div($grid-gutter-width, 2));
}
}
@ -33,12 +34,12 @@
@mixin calc-grid-column($index, $class, $type) {
@if ($type == width) and ($index > 0) {
.col-#{$class}-#{$index} {
width: percentage(($index / $grid-columns));
width: percentage(math.div($index, $grid-columns));
}
}
@if ($type == push) and ($index > 0) {
.col-#{$class}-push-#{$index} {
left: percentage(($index / $grid-columns));
left: percentage(math.div($index, $grid-columns));
}
}
@if ($type == push) and ($index == 0) {
@ -48,7 +49,7 @@
}
@if ($type == pull) and ($index > 0) {
.col-#{$class}-pull-#{$index} {
right: percentage(($index / $grid-columns));
right: percentage(math.div($index, $grid-columns));
}
}
@if ($type == pull) and ($index == 0) {
@ -58,7 +59,7 @@
}
@if ($type == offset) {
.col-#{$class}-offset-#{$index} {
margin-left: percentage(($index / $grid-columns));
margin-left: percentage(math.div($index, $grid-columns));
}
}
}

57
assets/stylesheets/bootstrap/mixins/_grid.scss
Просмотреть файл

@ -1,11 +1,12 @@
@use "sass:math";
// Grid system
//
// Generate semantic grid columns with these mixins.
// Centered container element
@mixin container-fixed($gutter: $grid-gutter-width) {
padding-right: ceil(($gutter / 2));
padding-left: floor(($gutter / 2));
padding-right: ceil(math.div($gutter, 2));
padding-left: floor(math.div($gutter, 2));
margin-right: auto;
margin-left: auto;
@include clearfix;
@ -13,8 +14,8 @@
// Creates a wrapper for a series of columns
@mixin make-row($gutter: $grid-gutter-width) {
margin-right: floor(($gutter / -2));
margin-left: ceil(($gutter / -2));
margin-right: floor(math.div($gutter, -2));
margin-left: ceil(math.div($gutter, -2));
@include clearfix;
}
@ -22,46 +23,46 @@
@mixin make-xs-column($columns, $gutter: $grid-gutter-width) {
position: relative;
float: left;
width: percentage(($columns / $grid-columns));
width: percentage(math.div($columns, $grid-columns));
min-height: 1px;
padding-right: ($gutter / 2);
padding-left: ($gutter / 2);
padding-right: math.div($gutter, 2);
padding-left: math.div($gutter, 2);
}
@mixin make-xs-column-offset($columns) {
margin-left: percentage(($columns / $grid-columns));
margin-left: percentage(math.div($columns, $grid-columns));
}
@mixin make-xs-column-push($columns) {
left: percentage(($columns / $grid-columns));
left: percentage(math.div($columns, $grid-columns));
}
@mixin make-xs-column-pull($columns) {
right: percentage(($columns / $grid-columns));
right: percentage(math.div($columns, $grid-columns));
}
// Generate the small columns
@mixin make-sm-column($columns, $gutter: $grid-gutter-width) {
position: relative;
min-height: 1px;
padding-right: ($gutter / 2);
padding-left: ($gutter / 2);
padding-right: math.div($gutter, 2);
padding-left: math.div($gutter, 2);
@media (min-width: $screen-sm-min) {
float: left;
width: percentage(($columns / $grid-columns));
width: percentage(math.div($columns, $grid-columns));
}
}
@mixin make-sm-column-offset($columns) {
@media (min-width: $screen-sm-min) {
margin-left: percentage(($columns / $grid-columns));
margin-left: percentage(math.div($columns, $grid-columns));
}
}
@mixin make-sm-column-push($columns) {
@media (min-width: $screen-sm-min) {
left: percentage(($columns / $grid-columns));
left: percentage(math.div($columns, $grid-columns));
}
}
@mixin make-sm-column-pull($columns) {
@media (min-width: $screen-sm-min) {
right: percentage(($columns / $grid-columns));
right: percentage(math.div($columns, $grid-columns));
}
}
@ -69,27 +70,27 @@
@mixin make-md-column($columns, $gutter: $grid-gutter-width) {
position: relative;
min-height: 1px;
padding-right: ($gutter / 2);
padding-left: ($gutter / 2);
padding-right: math.div($gutter, 2);
padding-left: math.div($gutter, 2);
@media (min-width: $screen-md-min) {
float: left;
width: percentage(($columns / $grid-columns));
width: percentage(math.div($columns, $grid-columns));
}
}
@mixin make-md-column-offset($columns) {
@media (min-width: $screen-md-min) {
margin-left: percentage(($columns / $grid-columns));
margin-left: percentage(math.div($columns, $grid-columns));
}
}
@mixin make-md-column-push($columns) {
@media (min-width: $screen-md-min) {
left: percentage(($columns / $grid-columns));
left: percentage(math.div($columns, $grid-columns));
}
}
@mixin make-md-column-pull($columns) {
@media (min-width: $screen-md-min) {
right: percentage(($columns / $grid-columns));
right: percentage(math.div($columns, $grid-columns));
}
}
@ -97,26 +98,26 @@
@mixin make-lg-column($columns, $gutter: $grid-gutter-width) {
position: relative;
min-height: 1px;
padding-right: ($gutter / 2);
padding-left: ($gutter / 2);
padding-right: math.div($gutter, 2);
padding-left: math.div($gutter, 2);
@media (min-width: $screen-lg-min) {
float: left;
width: percentage(($columns / $grid-columns));
width: percentage(math.div($columns, $grid-columns));
}
}
@mixin make-lg-column-offset($columns) {
@media (min-width: $screen-lg-min) {
margin-left: percentage(($columns / $grid-columns));
margin-left: percentage(math.div($columns, $grid-columns));
}
}
@mixin make-lg-column-push($columns) {
@media (min-width: $screen-lg-min) {
left: percentage(($columns / $grid-columns));
left: percentage(math.div($columns, $grid-columns));
}
}
@mixin make-lg-column-pull($columns) {
@media (min-width: $screen-lg-min) {
right: percentage(($columns / $grid-columns));
right: percentage(math.div($columns, $grid-columns));
}
}

3
assets/stylesheets/bootstrap/mixins/_nav-divider.scss
Просмотреть файл

@ -1,10 +1,11 @@
@use "sass:math";
// Horizontal dividers
//
// Dividers (basically an hr) within dropdowns and nav lists
@mixin nav-divider($color: #e5e5e5) {
height: 1px;
margin: (($line-height-computed / 2) - 1) 0;
margin: (math.div($line-height-computed, 2) - 1) 0;
overflow: hidden;
background-color: $color;
}

5
assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss
Просмотреть файл

@ -1,9 +1,10 @@
@use "sass:math";
// Navbar vertical align
//
// Vertically center elements in the navbar.
// Example: an element has a height of 30px, so write out `.navbar-vertical-align(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);
margin-top: (math.div($navbar-height - $element-height), 2);
margin-bottom: (math.div($navbar-height - $element-height), 2);
}

15
templates/project/_bootstrap-variables.sass
Просмотреть файл

@ -1,5 +1,6 @@
// Override Bootstrap variables here (defaults from bootstrap-sass v3.4.0):
// Override Bootstrap variables here (defaults from bootstrap-sass v3.4.1):
@use "sass:math";
//
// Variables
// --------------------------------------------------
@ -335,24 +336,24 @@
//** Point at which the navbar becomes uncollapsed.
// $grid-float-breakpoint: $screen-sm-min
//** Point at which the navbar begins collapsing.
// $grid-float-breakpoint-max: ($grid-float-breakpoint - 1)
// $grid-float-breakpoint-max: math.div($grid-float-breakpoint - 1)
//== Container sizes
//
//## Define the maximum width of `.container` for different screen sizes.
// Small screen / tablet
// Small screen, tablet
// $container-tablet: (720px + $grid-gutter-width)
//** For `$screen-sm-min` and up.
// $container-sm: $container-tablet
// Medium screen / desktop
// $container-desktop: (940px + $grid-gutter-width)
// $container-desktop: math.div(940px + $grid-gutter-width)
//** For `$screen-md-min` and up.
// $container-md: $container-desktop
// Large screen / wide desktop
// Large screen, wide desktop
// $container-large-desktop: (1140px + $grid-gutter-width)
//** For `$screen-lg-min` and up.
// $container-lg: $container-large-desktop
@ -366,8 +367,8 @@
// $navbar-height: 50px
// $navbar-margin-bottom: $line-height-computed
// $navbar-border-radius: $border-radius-base
// $navbar-padding-horizontal: floor(($grid-gutter-width / 2))
// $navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2)
// $navbar-padding-horizontal: floor(math.div($grid-gutter-width, 2))
// $navbar-padding-vertical: (math.div($navbar-height - $line-height-computed), 2)
// $navbar-collapse-max-height: 340px
// $navbar-default-color: #777