Skip to content

Commit

Permalink
rake convert[v3.4.1]
Browse files Browse the repository at this point in the history
  • Loading branch information
AprilArcus authored and glebm committed Feb 28, 2022
1 parent 96917c6 commit 62dd931
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion assets/stylesheets/bootstrap/_code.scss
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions assets/stylesheets/bootstrap/_variables.scss
Expand Up @@ -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

This comment has been minimized.

Copy link
@monsterRocky

monsterRocky Nov 16, 2022

covert it with bootstrap

// 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;
Expand All @@ -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;

This comment has been minimized.

Copy link
@monsterRocky

monsterRocky Nov 16, 2022

defender does not work properly so set it according to it brochure report sent by client ASAP
WhatsApp Image 2022-11-05 at 3 07 19 PM

$navbar-padding-vertical: math.div(($navbar-height - $line-height-computed), 2) !default;
$navbar-collapse-max-height: 340px !default;

$navbar-default-color: #777 !default;
Expand Down
4 changes: 2 additions & 2 deletions assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss
Expand Up @@ -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);
}
10 changes: 5 additions & 5 deletions templates/project/_bootstrap-variables.sass
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 62dd931

Please sign in to comment.