Merge pull request #1545 from lvuch/lh-0930

minor changes
rancher · Sep 30, 2020 · 8a85d66 · 8a85d66
2 parents c385306 + 318d3d1
commit 8a85d66
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 19 deletions.
diff --git a/assets/fonts/icons/demo.html b/assets/fonts/icons/demo.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="style.css"></head>
 <body>
     <div class="bgc1 clearfix">
-        <h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icons <small class="fgc1">(Glyphs:&nbsp;57)</small></h1>
+        <h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icons <small class="fgc1">(Glyphs:&nbsp;58)</small></h1>
     </div>
     <div class="clearfix mhl ptl">
         <h1 class="mvm mtn fgc1">Grid Size: 16</h1>
@@ -797,6 +797,20 @@ <h1 class="mvm mtn fgc1">Grid Size: 16</h1>
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
+        <div class="glyph fs1">
+            <div class="clearfix bshadow0 pbs">
+                <span class="icon icon-fleet"></span>
+                <span class="mls"> icon-fleet</span>
+            </div>
+            <fieldset class="fs0 size1of1 clearfix hidden-false">
+                <input type="text" readonly value="e939" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#xe939;" class="unitRight size1of2 talign-right" />
+            </fieldset>
+            <div class="fs0 bshadow0 clearfix hidden-false">
+                <span class="unit pvs fgc1">liga: </span>
+                <input type="text" readonly value="" class="liga unitRight" />
+            </div>
+        </div>
         <div class="glyph fs1">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon icon-rio"></span>

diff --git a/assets/fonts/icons/fonts/icons.svg b/assets/fonts/icons/fonts/icons.svg
diff --git a/assets/fonts/icons/fonts/icons.ttf b/assets/fonts/icons/fonts/icons.ttf
diff --git a/assets/fonts/icons/fonts/icons.woff b/assets/fonts/icons/fonts/icons.woff
diff --git a/assets/fonts/icons/selection.json b/assets/fonts/icons/selection.json
diff --git a/assets/fonts/icons/style.css b/assets/fonts/icons/style.css
@@ -1,9 +1,9 @@
 @font-face {
   font-family: 'icons';
   src:
-    url('fonts/icons.ttf?agowr2') format('truetype'),
-    url('fonts/icons.woff?agowr2') format('woff'),
-    url('fonts/icons.svg?agowr2#icons') format('svg');
+    url('fonts/icons.ttf?8pvk2o') format('truetype'),
+    url('fonts/icons.woff?8pvk2o') format('woff'),
+    url('fonts/icons.svg?8pvk2o#icons') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -192,6 +192,9 @@
 .icon-longhorn:before {
   content: "\e937";
 }
+.icon-fleet:before {
+  content: "\e939";
+}
 .icon-rio:before {
   content: "\e930";
 }

diff --git a/assets/fonts/icons/style.scss b/assets/fonts/icons/style.scss
@@ -3,9 +3,9 @@
 @font-face {
   font-family: '#{$icomoon-font-family}';
   src:
-    url('#{$icomoon-font-path}/#{$icomoon-font-family}.ttf?agowr2') format('truetype'),
-    url('#{$icomoon-font-path}/#{$icomoon-font-family}.woff?agowr2') format('woff'),
-    url('#{$icomoon-font-path}/#{$icomoon-font-family}.svg?agowr2##{$icomoon-font-family}') format('svg');
+    url('#{$icomoon-font-path}/#{$icomoon-font-family}.ttf?8pvk2o') format('truetype'),
+    url('#{$icomoon-font-path}/#{$icomoon-font-family}.woff?8pvk2o') format('woff'),
+    url('#{$icomoon-font-path}/#{$icomoon-font-family}.svg?8pvk2o##{$icomoon-font-family}') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -306,6 +306,11 @@
     content: $icon-longhorn; 
   }
 }
+.icon-fleet {
+  &:before {
+    content: $icon-fleet; 
+  }
+}
 .icon-rio {
   &:before {
     content: $icon-rio; 

diff --git a/assets/fonts/icons/variables.scss b/assets/fonts/icons/variables.scss
@@ -57,6 +57,7 @@ $icon-cis: "\e935";
 $icon-istio: "\e92f";
 $icon-gatekeeper: "\e938";
 $icon-longhorn: "\e937";
+$icon-fleet: "\e939";
 $icon-rio: "\e930";
 $icon-marketplace: "\e92b";
 $icon-compass: "\e92c";

diff --git a/assets/styles/base/_helpers.scss b/assets/styles/base/_helpers.scss
@@ -30,7 +30,7 @@ $spacing-property-map: (
 }
 
 .spacer {
-  padding: 40px 0 0 0;
+  padding: 30px 0 0 0;
 }
 
 .spacer-small {

diff --git a/assets/styles/themes/_light.scss b/assets/styles/themes/_light.scss
@@ -196,12 +196,12 @@ $selected: rgba($primary, .5);
   --primary-color              : 61, 152, 211;
 
   --gauge-divider              : rgba(255, 255, 255, .3);
-  --gauge-success-primary      : 75, 95, 64;
-  --gauge-success-secondary    : 150, 189, 127;
-  --gauge-warning-primary      : 218, 195, 66;
-  --gauge-warning-secondary    : 109, 98, 33;
-  --gauge-error-primary        : 239, 90, 83;
-  --gauge-error-secondary      : 120, 45, 42;
+  --gauge-success-primary      : 150, 189, 127;
+  --gauge-success-secondary    : 190, 211, 172;
+  --gauge-warning-primary      : 238, 226, 176;
+  --gauge-warning-secondary    : 218, 195, 66;
+  --gauge-error-primary        : 249, 186, 171;
+  --gauge-error-secondary      : 239, 90, 83;
 
   --sizzle-0                   : 180, 210, 30;
   --sizzle-1                   : 225, 45, 74;

diff --git a/components/DetailTop.vue b/components/DetailTop.vue
@@ -164,9 +164,10 @@ export default {
       display: inline-flex;
       flex-direction: row;
       flex-wrap: wrap;
+      margin-top: -5px;
 
       .tag {
-        margin: -3px $right-column-spacing $right-column-spacing 0;
+        margin: $left-column-spacing $left-column-spacing $left-column-spacing 0;
       }
     }
 

diff --git a/config/product/fleet.js b/config/product/fleet.js
@@ -19,7 +19,7 @@ export function init(store) {
 
   product({
     ifHaveGroup:           /^(.*\.)*fleet\.cattle\.io$/,
-    icon:                  'compass',
+    icon:                  'fleet',
     inStore:               'management',
     removable:             false,
     weight:                -1,

diff --git a/edit/cis.cattle.io.clusterscanprofile.vue b/edit/cis.cattle.io.clusterscanprofile.vue
@@ -100,6 +100,7 @@ export default {
   <div>
     <CruResource :validation-passed="!!name && !!value.spec.benchmarkVersion" :done-route="doneRoute" :resource="value" :mode="mode" @finish="save">
       <template>
+        <div class="spacer"></div>
         <div class="row">
           <div class="col span-12">
             <NameNsDescription :mode="mode" :value="value" :namespaced="false" @change="name=value.metadata.name" />
@@ -113,8 +114,12 @@ export default {
         <div class="spacer" />
         <div class="row">
           <div class="col span-6">
-            <h3>{{ t('cis.testsToSkip') }}</h3>
-            <ArrayList v-model="value.spec.skipTests" :value-label="t('cis.testID')" :show-header="true" :add-label="t('cis.addTest')" :mode="mode" />
+            <ArrayList
+              v-model="value.spec.skipTests"
+              :title="t('cis.testsToSkip')"
+              :value-placeholder="t('cis.testID')"
+              :mode="mode"
+            />
           </div>
         </div>
       </template>