Skip to content

Commit 3c6cbc0

Browse files
AprilArcusglebm
authored andcommitted
rake convert[v3.4.1]
1 parent 2f38fa5 commit 3c6cbc0

File tree

13 files changed

+84
-72
lines changed

13 files changed

+84
-72
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
//= require ./bootstrap/affix
1+
//= require ./bootstrap/transition
22
//= require ./bootstrap/alert
33
//= require ./bootstrap/button
44
//= require ./bootstrap/carousel
55
//= require ./bootstrap/collapse
66
//= require ./bootstrap/dropdown
77
//= require ./bootstrap/modal
8-
//= require ./bootstrap/scrollspy
98
//= require ./bootstrap/tab
10-
//= require ./bootstrap/transition
9+
//= require ./bootstrap/affix
10+
//= require ./bootstrap/scrollspy
1111
//= require ./bootstrap/tooltip
1212
//= require ./bootstrap/popover

assets/stylesheets/bootstrap/_carousel.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@use "sass:math";
12
//
23
// Carousel
34
// --------------------------------------------------
@@ -244,16 +245,16 @@
244245
.icon-next {
245246
width: ($carousel-control-font-size * 1.5);
246247
height: ($carousel-control-font-size * 1.5);
247-
margin-top: ($carousel-control-font-size / -2);
248+
margin-top: math.div($carousel-control-font-size, -2);
248249
font-size: ($carousel-control-font-size * 1.5);
249250
}
250251
.glyphicon-chevron-left,
251252
.icon-prev {
252-
margin-left: ($carousel-control-font-size / -2);
253+
margin-left: math.div($carousel-control-font-size, -2);
253254
}
254255
.glyphicon-chevron-right,
255256
.icon-next {
256-
margin-right: ($carousel-control-font-size / -2);
257+
margin-right: math.div($carousel-control-font-size, -2);
257258
}
258259
}
259260

assets/stylesheets/bootstrap/_code.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@use "sass:math";
12
//
23
// Code (inline and block)
34
// --------------------------------------------------
@@ -40,8 +41,8 @@ kbd {
4041
// Blocks of code
4142
pre {
4243
display: block;
43-
padding: (($line-height-computed - 1) / 2);
44-
margin: 0 0 ($line-height-computed / 2);
44+
padding: (math.div($line-height-computed - 1), 2);
45+
margin: 0 0 math.div($line-height-computed, 2);
4546
font-size: ($font-size-base - 1); // 14px to 13px
4647
line-height: $line-height-base;
4748
color: $pre-color;

assets/stylesheets/bootstrap/_forms.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@use "sass:math";
12
//
23
// Forms
34
// --------------------------------------------------
@@ -581,7 +582,7 @@ textarea.form-control {
581582
// Reposition the icon because it's now within a grid column and columns have
582583
// `position: relative;` on them. Also accounts for the grid gutter padding.
583584
.has-feedback .form-control-feedback {
584-
right: floor(($grid-gutter-width / 2));
585+
right: floor(math.div($grid-gutter-width, 2));
585586
}
586587

587588
// Form group sizes

assets/stylesheets/bootstrap/_jumbotron.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@use "sass:math";
12
//
23
// Jumbotron
34
// --------------------------------------------------
@@ -16,7 +17,7 @@
1617
}
1718

1819
p {
19-
margin-bottom: ($jumbotron-padding / 2);
20+
margin-bottom: math.div($jumbotron-padding, 2);
2021
font-size: $jumbotron-font-size;
2122
font-weight: 200;
2223
}
@@ -27,8 +28,8 @@
2728

2829
.container &,
2930
.container-fluid & {
30-
padding-right: ($grid-gutter-width / 2);
31-
padding-left: ($grid-gutter-width / 2);
31+
padding-right: math.div($grid-gutter-width, 2);
32+
padding-left: math.div($grid-gutter-width, 2);
3233
border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
3334
}
3435

assets/stylesheets/bootstrap/_navbar.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@use "sass:math";
12
//
23
// Navbars
34
// --------------------------------------------------
@@ -228,7 +229,7 @@
228229
// the nav the full height of the horizontal nav (above 768px).
229230

230231
.navbar-nav {
231-
margin: ($navbar-padding-vertical / 2) (-$navbar-padding-horizontal);
232+
margin: math.div($navbar-padding-vertical, 2) (-$navbar-padding-horizontal);
232233

233234
> li > a {
234235
padding-top: 10px;

assets/stylesheets/bootstrap/_type.scss

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@use "sass:math";
12
//
23
// Typography
34
// --------------------------------------------------
@@ -25,7 +26,7 @@ h1, .h1,
2526
h2, .h2,
2627
h3, .h3 {
2728
margin-top: $line-height-computed;
28-
margin-bottom: ($line-height-computed / 2);
29+
margin-bottom: math.div($line-height-computed, 2);
2930

3031
small,
3132
.small {
@@ -35,8 +36,8 @@ h3, .h3 {
3536
h4, .h4,
3637
h5, .h5,
3738
h6, .h6 {
38-
margin-top: ($line-height-computed / 2);
39-
margin-bottom: ($line-height-computed / 2);
39+
margin-top: math.div($line-height-computed, 2);
40+
margin-bottom: math.div($line-height-computed, 2);
4041

4142
small,
4243
.small {
@@ -56,7 +57,7 @@ h6, .h6 { font-size: $font-size-h6; }
5657
// -------------------------
5758

5859
p {
59-
margin: 0 0 ($line-height-computed / 2);
60+
margin: 0 0 math.div($line-height-computed, 2);
6061
}
6162

6263
.lead {
@@ -74,10 +75,10 @@ p {
7475
// Emphasis & misc
7576
// -------------------------
7677

77-
// Ex: (12px small font / 14px base font) * 100% = about 85%
78+
// Ex: math.div(12px small font, 14px base font) * 100% = about 85%
7879
small,
7980
.small {
80-
font-size: floor((100% * $font-size-small / $font-size-base));
81+
font-size: floor(math.div(100% * $font-size-small, $font-size-base));
8182
}
8283

8384
mark,
@@ -136,7 +137,7 @@ mark,
136137
// -------------------------
137138

138139
.page-header {
139-
padding-bottom: (($line-height-computed / 2) - 1);
140+
padding-bottom: (math.div($line-height-computed, 2) - 1);
140141
margin: ($line-height-computed * 2) 0 $line-height-computed;
141142
border-bottom: 1px solid $page-header-border-color;
142143
}
@@ -149,7 +150,7 @@ mark,
149150
ul,
150151
ol {
151152
margin-top: 0;
152-
margin-bottom: ($line-height-computed / 2);
153+
margin-bottom: math.div($line-height-computed, 2);
153154
ul,
154155
ol {
155156
margin-bottom: 0;
@@ -239,7 +240,7 @@ abbr[data-original-title] {
239240

240241
// Blockquotes
241242
blockquote {
242-
padding: ($line-height-computed / 2) $line-height-computed;
243+
padding: math.div($line-height-computed, 2) $line-height-computed;
243244
margin: 0 0 $line-height-computed;
244245
font-size: $blockquote-font-size;
245246
border-left: 5px solid $blockquote-border-color;

assets/stylesheets/bootstrap/_variables.scss

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
$bootstrap-sass-asset-helper: false !default;
2+
@use "sass:math";
23
//
34
// Variables
45
// --------------------------------------------------
@@ -334,24 +335,24 @@ $grid-gutter-width: 30px !default;
334335
//** Point at which the navbar becomes uncollapsed.
335336
$grid-float-breakpoint: $screen-sm-min !default;
336337
//** Point at which the navbar begins collapsing.
337-
$grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
338+
$grid-float-breakpoint-max: math.div($grid-float-breakpoint - 1) !default;
338339

339340

340341
//== Container sizes
341342
//
342343
//## Define the maximum width of `.container` for different screen sizes.
343344

344-
// Small screen / tablet
345+
// Small screen, tablet
345346
$container-tablet: (720px + $grid-gutter-width) !default;
346347
//** For `$screen-sm-min` and up.
347348
$container-sm: $container-tablet !default;
348349

349350
// Medium screen / desktop
350-
$container-desktop: (940px + $grid-gutter-width) !default;
351+
$container-desktop: math.div(940px + $grid-gutter-width) !default;
351352
//** For `$screen-md-min` and up.
352353
$container-md: $container-desktop !default;
353354

354-
// Large screen / wide desktop
355+
// Large screen, wide desktop
355356
$container-large-desktop: (1140px + $grid-gutter-width) !default;
356357
//** For `$screen-lg-min` and up.
357358
$container-lg: $container-large-desktop !default;
@@ -365,8 +366,8 @@ $container-lg: $container-large-desktop !default;
365366
$navbar-height: 50px !default;
366367
$navbar-margin-bottom: $line-height-computed !default;
367368
$navbar-border-radius: $border-radius-base !default;
368-
$navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default;
369-
$navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default;
369+
$navbar-padding-horizontal: floor(math.div($grid-gutter-width, 2)) !default;
370+
$navbar-padding-vertical: (math.div($navbar-height - $line-height-computed), 2) !default;
370371
$navbar-collapse-max-height: 340px !default;
371372

372373
$navbar-default-color: #777 !default;

assets/stylesheets/bootstrap/mixins/_grid-framework.scss

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@use "sass:math";
12
// Framework grid generation
23
//
34
// Used only by Bootstrap to generate the correct number of grid classes given
@@ -13,8 +14,8 @@
1314
// Prevent columns from collapsing when empty
1415
min-height: 1px;
1516
// Inner gutter via padding
16-
padding-right: floor(($grid-gutter-width / 2));
17-
padding-left: ceil(($grid-gutter-width / 2));
17+
padding-right: floor(math.div($grid-gutter-width, 2));
18+
padding-left: ceil(math.div($grid-gutter-width, 2));
1819
}
1920
}
2021

@@ -33,12 +34,12 @@
3334
@mixin calc-grid-column($index, $class, $type) {
3435
@if ($type == width) and ($index > 0) {
3536
.col-#{$class}-#{$index} {
36-
width: percentage(($index / $grid-columns));
37+
width: percentage(math.div($index, $grid-columns));
3738
}
3839
}
3940
@if ($type == push) and ($index > 0) {
4041
.col-#{$class}-push-#{$index} {
41-
left: percentage(($index / $grid-columns));
42+
left: percentage(math.div($index, $grid-columns));
4243
}
4344
}
4445
@if ($type == push) and ($index == 0) {
@@ -48,7 +49,7 @@
4849
}
4950
@if ($type == pull) and ($index > 0) {
5051
.col-#{$class}-pull-#{$index} {
51-
right: percentage(($index / $grid-columns));
52+
right: percentage(math.div($index, $grid-columns));
5253
}
5354
}
5455
@if ($type == pull) and ($index == 0) {
@@ -58,7 +59,7 @@
5859
}
5960
@if ($type == offset) {
6061
.col-#{$class}-offset-#{$index} {
61-
margin-left: percentage(($index / $grid-columns));
62+
margin-left: percentage(math.div($index, $grid-columns));
6263
}
6364
}
6465
}

0 commit comments

Comments
 (0)