fix: primary filled button variation height / Fix merging error

owncloud · Aug 15, 2022 · af88d94 · af88d94
1 parent 41b9029
commit af88d94
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/components/atoms/OcButton/OcButton.vue b/src/components/atoms/OcButton/OcButton.vue
@@ -258,7 +258,7 @@ export default {
   @include oc-button-line-height(1);
 
   align-items: center;
-  border: 1px solid;
+  border: 1px solid transparent;
   border-color: transparent;
   box-sizing: border-box;
   color: var(--oc-color-text-inverse);
@@ -362,8 +362,8 @@ export default {
     &-filled {
       @extend .oc-background-primary-gradient;
       color: var(--oc-color-swatch-inverse-default) !important;
-      padding: calc(0.4rem + 1px) 0.7rem;
-      border: 0px;
+      /*padding: calc(0.4rem + 1px) 0.7rem;
+      border: 0px;*/
 
       span > svg {
         fill: var(--oc-color-swatch-inverse-default) !important;

diff --git a/src/styles/theme/background.scss b/src/styles/theme/background.scss
@@ -12,10 +12,6 @@
     linear-gradient(90deg,
     var(--oc-color-swatch-primary-muted) 0%,
     var(--oc-color-swatch-primary-gradient) 100%);
-  border-color:
-    linear-gradient(90deg,
-    var(--oc-color-swatch-primary-muted) 0%,
-    var(--oc-color-swatch-primary-gradient) 100%) !important;
 }
 /* stylelint-enable */