Visual fixes

FastyBird · Jun 23, 2021 · 722a441 · 722a441
1 parent a4d06d2
commit 722a441
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/src/assets/mixins/utilities.scss b/src/assets/mixins/utilities.scss
@@ -24,6 +24,13 @@
   flex-direction: column;
 }
 
+@mixin flexBoxWidth($width) {
+  -webkit-box-flex: 0;
+  -ms-flex: 0 0 $width;
+  flex: 0 0 $width;
+  max-width: $width;
+}
+
 @mixin box-shadow($shadow...) {
   -webkit-box-shadow: $shadow; // iOS <4.3 & Android <4.1
   box-shadow: $shadow;

diff --git a/src/components/ui/FbIconWithChild/index.scss b/src/components/ui/FbIconWithChild/index.scss
@@ -27,6 +27,7 @@
     &[data-size="lg"] {
       padding-right: 5px;
       padding-bottom: 2px;
+      line-height: $main-icon-size-lg;
 
       .fb-ui-icon-with-child {
         &__icon {
@@ -36,15 +37,16 @@
 
         &__child-icon {
           font-size: $child-icon-size-lg - (0.1rem * 6);
-          height: $child-icon-size-lg - (0.1rem * 2);
-          width: $child-icon-size-lg - (0.1rem * 2);
+          height: $child-icon-size-lg;
+          width: $child-icon-size-lg;
         }
       }
     }
 
     &[data-size="md"] {
       padding-right: 4px;
       padding-bottom: 2px;
+      line-height: $main-icon-size-md;
 
       .fb-ui-icon-with-child {
         &__icon {
@@ -54,15 +56,16 @@
 
         &__child-icon {
           font-size: $child-icon-size-md - (0.1rem * 6);
-          height: $child-icon-size-md - (0.1rem * 2);
-          width: $child-icon-size-md - (0.1rem * 2);
+          height: $child-icon-size-md;
+          width: $child-icon-size-md;
         }
       }
     }
 
     &[data-size="sm"] {
       padding-right: 3px;
       padding-bottom: 2px;
+      line-height: $main-icon-size-sm;
 
       .fb-ui-icon-with-child {
         &__icon {
@@ -72,8 +75,8 @@
 
         &__child-icon {
           font-size: $child-icon-size-sm - (0.1rem * 6);
-          height: $child-icon-size-sm - (0.1rem * 2);
-          width: $child-icon-size-sm - (0.1rem * 2);
+          height: $child-icon-size-sm;
+          width: $child-icon-size-sm;
         }
       }
     }

diff --git a/src/components/ui/FbModalForm/index.vue b/src/components/ui/FbModalForm/index.vue
@@ -36,7 +36,10 @@
     >
       <slot name="form" />
 
-      <div class="fb-ui-modal-form__result">
+      <div
+        v-if="[resultTypes.WORKING, resultTypes.OK, resultTypes.ERROR].includes(state)"
+        class="fb-ui-modal-form__result"
+      >
         <fb-ui-spinner v-if="state === resultTypes.WORKING" />
         <fb-ui-result-ok v-if="state === resultTypes.OK" />
         <fb-ui-result-err v-if="state === resultTypes.ERROR" />