diff --git a/CHANGELOG.md b/CHANGELOG.md index d3358f1bf..feb12f10b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Updated @uirouter/angularjs to 1.0.30 - Updated bootstrap-sass to 3.4.3 - Removed unmaintained gem sidekiq-cron and replaced it with sidekiq-scheduler +- Updated deprecated division operators in sass - Fix a bug: a sentence was not linked to a translation key - Fix a bug: the version check may be scheduled at an invalid time - Fix a bug: the moment-timezone relied on an outdated version of moment with a case-sensitive locale file diff --git a/app/frontend/src/stylesheets/app.layout.scss b/app/frontend/src/stylesheets/app.layout.scss index b5eb89389..285ce6039 100644 --- a/app/frontend/src/stylesheets/app.layout.scss +++ b/app/frontend/src/stylesheets/app.layout.scss @@ -1,3 +1,5 @@ +@use 'sass:math'; + /*layout*/ .header, .footer { @@ -286,8 +288,8 @@ body.container { height: $header-md-height; .navbar-form { - margin-top: floor(($header-md-height - 30) / 2); - margin-bottom: floor(($header-md-height - 30) / 2); + margin-top: floor(math.div($header-md-height - 30, 2)); + margin-bottom: floor(math.div($header-md-height - 30, 2)); } } @@ -689,7 +691,7 @@ body.container { cursor: pointer; & .Event-picture {opacity: 0.7;} } - + &-picture { height: 250px; background-color: #fff; @@ -701,7 +703,7 @@ body.container { object-fit: cover; } } - + &-desc { position: relative; padding: 15px; diff --git a/app/frontend/src/stylesheets/app.nav.scss b/app/frontend/src/stylesheets/app.nav.scss index f632fd94f..1ddef5cfd 100644 --- a/app/frontend/src/stylesheets/app.nav.scss +++ b/app/frontend/src/stylesheets/app.nav.scss @@ -1,3 +1,5 @@ +@use 'sass:math'; + /*primary nav*/ .navbar-header { position: relative; @@ -42,7 +44,7 @@ .nav-primary { li { > a > i { - margin: floor(-($nav-primary-height - $line-height-computed) / 2) -10px; + margin: floor(math.div(-($nav-primary-height - $line-height-computed), 2)) -10px; line-height: $nav-primary-height; width: $nav-primary-height; float: left; @@ -61,7 +63,7 @@ ul.nav { > li { > a { - padding: floor(($nav-primary-height - $line-height-computed) / 2) 15px; + padding: floor(math.div($nav-primary-height - $line-height-computed, 2)) 15px; position: relative; font-size: 14px; @@ -245,7 +247,7 @@ > .vbox > .header, > .vbox > .footer { - padding: 0 floor(($nav-xs-width - 30px) / 2); + padding: 0 floor(math.div($nav-xs-width - 30px, 2)); } .hidden-nav-xs { @@ -309,7 +311,7 @@ > li { > a { .header-md & { - padding: floor(($header-md-height - $line-height-computed) / 2 - 1); + padding: floor(math.div($header-md-height - $line-height-computed, 2) - 1); } } } @@ -326,7 +328,7 @@ // + *{ // padding-top: 50px !important; // } - + } .nav-bar-fixed-bottom { @@ -518,7 +520,7 @@ border-left: 3px solid; // #870003; - + } } }