Skip to content

Commit 9f3c3f7

Browse files
committed
rake convert[v3.4.1]
1 parent dbb6c96 commit 9f3c3f7

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

assets/stylesheets/bootstrap/_code.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ kbd {
4141
// Blocks of code
4242
pre {
4343
display: block;
44-
padding: (math.div($line-height-computed - 1), 2);
44+
padding: math.div(($line-height-computed - 1), 2);
4545
margin: 0 0 math.div($line-height-computed, 2);
4646
font-size: ($font-size-base - 1); // 14px to 13px
4747
line-height: $line-height-base;

assets/stylesheets/bootstrap/_variables.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,24 +335,24 @@ $grid-gutter-width: 30px !default;
335335
//** Point at which the navbar becomes uncollapsed.
336336
$grid-float-breakpoint: $screen-sm-min !default;
337337
//** Point at which the navbar begins collapsing.
338-
$grid-float-breakpoint-max: math.div($grid-float-breakpoint - 1) !default;
338+
$grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
339339

340340

341341
//== Container sizes
342342
//
343343
//## Define the maximum width of `.container` for different screen sizes.
344344

345-
// Small screen, tablet
345+
// Small screen / tablet
346346
$container-tablet: (720px + $grid-gutter-width) !default;
347347
//** For `$screen-sm-min` and up.
348348
$container-sm: $container-tablet !default;
349349

350350
// Medium screen / desktop
351-
$container-desktop: math.div(940px + $grid-gutter-width) !default;
351+
$container-desktop: (940px + $grid-gutter-width) !default;
352352
//** For `$screen-md-min` and up.
353353
$container-md: $container-desktop !default;
354354

355-
// Large screen, wide desktop
355+
// Large screen / wide desktop
356356
$container-large-desktop: (1140px + $grid-gutter-width) !default;
357357
//** For `$screen-lg-min` and up.
358358
$container-lg: $container-large-desktop !default;
@@ -367,7 +367,7 @@ $navbar-height: 50px !default;
367367
$navbar-margin-bottom: $line-height-computed !default;
368368
$navbar-border-radius: $border-radius-base !default;
369369
$navbar-padding-horizontal: floor(math.div($grid-gutter-width, 2)) !default;
370-
$navbar-padding-vertical: (math.div($navbar-height - $line-height-computed), 2) !default;
370+
$navbar-padding-vertical: math.div(($navbar-height - $line-height-computed), 2) !default;
371371
$navbar-collapse-max-height: 340px !default;
372372

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

assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` to calculate the appropriate top margin.
66

77
@mixin navbar-vertical-align($element-height) {
8-
margin-top: (math.div($navbar-height - $element-height), 2);
9-
margin-bottom: (math.div($navbar-height - $element-height), 2);
8+
margin-top: math.div(($navbar-height - $element-height), 2);
9+
margin-bottom: math.div(($navbar-height - $element-height), 2);
1010
}

templates/project/_bootstrap-variables.sass

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -336,24 +336,24 @@
336336
//** Point at which the navbar becomes uncollapsed.
337337
// $grid-float-breakpoint: $screen-sm-min
338338
//** Point at which the navbar begins collapsing.
339-
// $grid-float-breakpoint-max: math.div($grid-float-breakpoint - 1)
339+
// $grid-float-breakpoint-max: ($grid-float-breakpoint - 1)
340340
341341
342342
//== Container sizes
343343
//
344344
//## Define the maximum width of `.container` for different screen sizes.
345345
346-
// Small screen, tablet
346+
// Small screen / tablet
347347
// $container-tablet: (720px + $grid-gutter-width)
348348
//** For `$screen-sm-min` and up.
349349
// $container-sm: $container-tablet
350350
351351
// Medium screen / desktop
352-
// $container-desktop: math.div(940px + $grid-gutter-width)
352+
// $container-desktop: (940px + $grid-gutter-width)
353353
//** For `$screen-md-min` and up.
354354
// $container-md: $container-desktop
355355
356-
// Large screen, wide desktop
356+
// Large screen / wide desktop
357357
// $container-large-desktop: (1140px + $grid-gutter-width)
358358
//** For `$screen-lg-min` and up.
359359
// $container-lg: $container-large-desktop
@@ -368,7 +368,7 @@
368368
// $navbar-margin-bottom: $line-height-computed
369369
// $navbar-border-radius: $border-radius-base
370370
// $navbar-padding-horizontal: floor(math.div($grid-gutter-width, 2))
371-
// $navbar-padding-vertical: (math.div($navbar-height - $line-height-computed), 2)
371+
// $navbar-padding-vertical: math.div(($navbar-height - $line-height-computed), 2)
372372
// $navbar-collapse-max-height: 340px
373373
374374
// $navbar-default-color: #777

0 commit comments

Comments
 (0)