From 00bd62532e1c94c49b653fb1522332b71b53d7d4 Mon Sep 17 00:00:00 2001 From: kerrat Date: Wed, 15 Feb 2023 21:50:48 +0200 Subject: [PATCH 1/2] load bootstrap after all colors are loaded --- app/javascript/stylesheets/application.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/stylesheets/application.scss b/app/javascript/stylesheets/application.scss index dc13762e8..ca32bf2a6 100644 --- a/app/javascript/stylesheets/application.scss +++ b/app/javascript/stylesheets/application.scss @@ -1,9 +1,9 @@ -@import "~bootstrap/scss/bootstrap"; @import "../css/components/colors.scss"; @import "../css/components/breakpoints.scss"; @import "../css/components/common_sizes.scss"; @import "../css/components/mixins.scss"; @import "../css/components/fonts.scss"; +@import "~bootstrap/scss/bootstrap"; @import "../css/main.scss"; @import "../css/message.scss"; @import "../css/calculator.scss"; From c794b90fe13c8374adeefedfe7956ceb3cca74d2 Mon Sep 17 00:00:00 2001 From: kerrat Date: Wed, 15 Feb 2023 21:52:22 +0200 Subject: [PATCH 2/2] replace color code with his name --- app/javascript/css/calculator.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/css/calculator.scss b/app/javascript/css/calculator.scss index f2b7cfccb..af98107ab 100644 --- a/app/javascript/css/calculator.scss +++ b/app/javascript/css/calculator.scss @@ -3,7 +3,7 @@ height: 56px; margin-top: 40px; color: #fff; - background-color: #8fba3b; + background-color: $success; border: none; border-radius: 4px; padding-top: 2px;