From 9f3c3f79e05b34c4432bf6ac9c182d2a17a7a0d2 Mon Sep 17 00:00:00 2001 From: April Arcus Date: Sun, 27 Feb 2022 22:58:13 -0800 Subject: [PATCH] rake convert[v3.4.1] --- assets/stylesheets/bootstrap/_code.scss | 2 +- assets/stylesheets/bootstrap/_variables.scss | 10 +++++----- .../bootstrap/mixins/_nav-vertical-align.scss | 4 ++-- templates/project/_bootstrap-variables.sass | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/assets/stylesheets/bootstrap/_code.scss b/assets/stylesheets/bootstrap/_code.scss index cf5a2d8e2..6299ddbf3 100644 --- a/assets/stylesheets/bootstrap/_code.scss +++ b/assets/stylesheets/bootstrap/_code.scss @@ -41,7 +41,7 @@ kbd { // Blocks of code pre { display: block; - padding: (math.div($line-height-computed - 1), 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; diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 606fb08cb..02fe1f43b 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -335,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: math.div($grid-float-breakpoint - 1) !default; +$grid-float-breakpoint-max: ($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: math.div(940px + $grid-gutter-width) !default; +$container-desktop: (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; @@ -367,7 +367,7 @@ $navbar-height: 50px !default; $navbar-margin-bottom: $line-height-computed !default; $navbar-border-radius: $border-radius-base !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-padding-vertical: math.div(($navbar-height - $line-height-computed), 2) !default; $navbar-collapse-max-height: 340px !default; $navbar-default-color: #777 !default; diff --git a/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss b/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss index f3dd2cf31..146d9961c 100644 --- a/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss +++ b/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss @@ -5,6 +5,6 @@ // 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: (math.div($navbar-height - $element-height), 2); - margin-bottom: (math.div($navbar-height - $element-height), 2); + margin-top: math.div(($navbar-height - $element-height), 2); + margin-bottom: math.div(($navbar-height - $element-height), 2); } diff --git a/templates/project/_bootstrap-variables.sass b/templates/project/_bootstrap-variables.sass index 66ff351f6..d5bc1a14f 100644 --- a/templates/project/_bootstrap-variables.sass +++ b/templates/project/_bootstrap-variables.sass @@ -336,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: math.div($grid-float-breakpoint - 1) +// $grid-float-breakpoint-max: ($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: math.div(940px + $grid-gutter-width) +// $container-desktop: (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 @@ -368,7 +368,7 @@ // $navbar-margin-bottom: $line-height-computed // $navbar-border-radius: $border-radius-base // $navbar-padding-horizontal: floor(math.div($grid-gutter-width, 2)) -// $navbar-padding-vertical: (math.div($navbar-height - $line-height-computed), 2) +// $navbar-padding-vertical: math.div(($navbar-height - $line-height-computed), 2) // $navbar-collapse-max-height: 340px // $navbar-default-color: #777