Merge pull request #24 from LucasMBalieiro/correcao-de-bugs-caio

Correcao de bugs caio
LucasMBalieiro · Feb 9, 2024 · 5853c64 · 5853c64
2 parents 7ed7a98 + e367979
commit 5853c64
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/...c_src/base/scss/shuup/custom-buttons.scss → .scannerwork/.sonar_lock b/...c_src/base/scss/shuup/custom-buttons.scss → .scannerwork/.sonar_lock
diff --git a/.scannerwork/report-task.txt b/.scannerwork/report-task.txt
@@ -0,0 +1,6 @@
+projectKey=shuup
+serverUrl=http://localhost:9000
+serverVersion=10.4.0.87286
+dashboardUrl=http://localhost:9000/dashboard?id=shuup
+ceTaskId=0d82e080-98c7-473f-a7c3-b8c16cd23607
+ceTaskUrl=http://localhost:9000/api/ce/task?id=0d82e080-98c7-473f-a7c3-b8c16cd23607
diff --git a/shuup/admin/static_src/base/scss/shuup/base.scss b/shuup/admin/static_src/base/scss/shuup/base.scss
@@ -183,13 +183,12 @@ body.order-create #scroll-to-top .scroll-to-top-button {
         justify-content: center;
         align-items: center;
 
-        color: var(--primary);
         transform: translateY(0);
 
         &:hover {
             color: var(--primary-light);
-            animation-timing-function: ease-in-out;
             animation: jump 0.1s linear forwards;
+            animation-timing-function: ease-in-out;
         }
     }
 }

diff --git a/shuup/admin/static_src/base/scss/shuup/content-blocks.scss b/shuup/admin/static_src/base/scss/shuup/content-blocks.scss
@@ -391,7 +391,7 @@
 .active-theme {
     &::before {
         content: '\f00c';
-        font-family: 'FontAwesome';
+        font-family: 'FontAwesome', 'monospace';
         width: 32px;
         height: 32px;
         color: $white;