rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New icons, table headers

This commit is contained in:
Vincent Fiduccia 2020-09-28 18:51:35 -07:00
parent 809d2e77ba
commit a9bf03cde5
No known key found for this signature in database
GPG Key ID: 2B29AD6BB2BB2582
14 changed files with 89 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
assets/fonts/icons/demo.html
View File

@ -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;52)</small></h1>
<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icons <small class="fgc1">(Glyphs:&nbsp;54)</small></h1>
</div>
<div class="clearfix mhl ptl">
<h1 class="mvm mtn fgc1">Grid Size: 16</h1>
@ -713,6 +713,34 @@
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icon icon-backup-restore"></span>
<span class="mls"> icon-backup-restore</span>
</div>
<fieldset class="fs0 size1of1 clearfix hidden-false">
<input type="text" readonly value="e934" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe934;" 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-cis"></span>
<span class="mls"> icon-cis</span>
</div>
<fieldset class="fs0 size1of1 clearfix hidden-false">
<input type="text" readonly value="e935" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe935;" 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-istio"></span>

2
assets/fonts/icons/fonts/icons.svg
View File

@ -79,4 +79,6 @@
<glyph unicode="&#xe931;" glyph-name="snapshot" data-tags="snapshot" d="M847.722 554.629l-65.991 103.795c-14.509 23.882-40.427 38.463-68.371 38.463h-115.36c-27.944 0-53.862-14.581-68.371-38.463l-61.659-103.764h-290.449c-46.053 0-83.521-37.467-83.521-83.521v-444.505c0-46.053 37.467-83.521 83.521-83.521h668.958c46.053 0 83.521 37.467 83.521 83.521v444.505c0 45.637-36.798 82.82-82.278 83.489zM598 616.887h115.36l37.804-62.227h-190.968l37.804 62.227zM850 26.634c0-1.937-1.584-3.521-3.521-3.521h-668.958c-1.937 0-3.521 1.584-3.521 3.521v444.505c0 1.937 1.584 3.521 3.521 3.521h668.958c1.937 0 3.521-1.584 3.521-3.521v-444.505zM512 426.854c-98.131 0-177.967-79.836-177.967-177.967s79.836-177.967 177.967-177.967 177.967 79.836 177.967 177.967-79.836 177.967-177.967 177.967zM512 150.92c-54.106 0-97.967 43.861-97.967 97.967s43.861 97.967 97.967 97.967 97.967-43.861 97.967-97.967-43.861-97.967-97.967-97.967zM160 580.887h128c22.092 0 40 17.908 40 40s-17.908 40-40 40h-128c-22.092 0-40-17.908-40-40s17.908-40 40-40z" />
<glyph unicode="&#xe932;" glyph-name="refresh" data-tags="refresh" d="M819.11 312.912c-3.768-166.387-139.818-300.112-307.11-300.112-102.596 0-193.428 50.304-249.216 127.583l71.616 71.616h-224v-224l79.284 79.284c74.979-95.513 191.469-156.884 322.316-156.884 223.846 0 405.723 179.569 409.51 402.512h-102.4zM204.8 320c0 169.662 137.538 307.2 307.2 307.2 106.306 0 199.979-54.010 255.125-136.075l-77.125-77.125h224v224l-73.432-73.432c-74.669 100.158-194.034 165.032-328.568 165.032v0c-226.216 0-409.6-183.384-409.6-409.6 0-2.37 0.050-4.728 0.090-7.088h102.4c-0.053 2.357-0.090 4.718-0.090 7.088z" />
<glyph unicode="&#xe933;" glyph-name="backup" data-tags="backup" d="M512 729.6v0c-134.56 0-253.933-64.904-328.593-165.097l-59.355 59.355c-7.778 7.778-14.142 5.142-14.142-5.858v-184c0-11 9-20 20-20h184c11 0 13.636 6.364 5.858 14.142l-62.92 62.92c55.14 82.098 148.821 136.138 255.151 136.138 169.662 0 307.2-137.538 307.2-307.2s-137.538-307.2-307.2-307.2c-167.292 0-303.342 133.725-307.11 300.112h-102.4c3.787-222.943 185.664-402.512 409.51-402.512 226.216 0 409.6 183.384 409.6 409.6s-183.384 409.6-409.6 409.6z" />
<glyph unicode="&#xe934;" glyph-name="backup-restore" data-tags="backup-restore" d="M469.134 213.734c0-47.349-38.384-85.734-85.734-85.734s-85.734 38.384-85.734 85.734c0 47.35 38.384 85.734 85.734 85.734s85.734-38.384 85.734-85.734zM726.336 213.734c0-47.349-38.384-85.734-85.734-85.734s-85.734 38.384-85.734 85.734c0 47.35 38.384 85.734 85.734 85.734s85.734-38.384 85.734-85.734zM592.99 429.84c0-45.377-36.785-82.162-82.162-82.162s-82.162 36.785-82.162 82.162 36.785 82.162 82.162 82.162 82.162-36.785 82.162-82.162zM512 729.6v0c-134.56 0-253.932-64.904-328.594-165.098l-59.354 59.354c-7.778 7.778-14.142 5.142-14.142-5.858v-184c0-11 9-20 20-20h184c11 0 13.636 6.364 5.858 14.142l-62.92 62.92c55.14 82.098 148.822 136.138 255.152 136.138 169.662 0 307.2-137.538 307.2-307.2s-137.538-307.2-307.2-307.2c-167.292 0-303.342 133.726-307.11 300.112h-102.4c3.788-222.942 185.664-402.512 409.51-402.512 226.216 0 409.6 183.384 409.6 409.6s-183.384 409.6-409.6 409.6v0.002z" />
<glyph unicode="&#xe935;" glyph-name="cis" data-tags="cis" d="M971.24 195.838c0.004 0.016 0.006 0.033 0.010 0.049 3.609 14.596 3.774 29.889 0.472 44.22l-72.521 315.029c-3.271 14.19-9.872 27.619-19.075 38.905-0.13 0.163-0.249 0.334-0.382 0.495-0.013 0.016-0.028 0.031-0.042 0.048-0.005 0.005-0.008 0.011-0.013 0.017-0.032 0.038-0.067 0.073-0.099 0.112-8.767 10.577-19.94 19.3-32.335 25.227-0.008 0.003-0.014 0.006-0.021 0.010l-293.729 140.249c-12.859 6.128-27.189 9.38-41.438 9.403-0.045-0.002-0.089-0.001-0.133 0-0.191-0.007-0.385-0.001-0.578-0.004l-0.175-0.002c-1.33-0.009-2.665-0.044-4.060-0.109-0.503-0.024-1.001-0.059-1.501-0.102-12.285-0.795-24.147-3.887-35.29-9.204l-293.538-140.25c-11.875-5.682-22.281-13.596-30.928-23.521-0.197-0.227-0.375-0.466-0.566-0.696-10.031-11.72-17.169-25.812-20.634-40.858l-72.376-314.831c-2.781-12.086-3.14-24.527-1.074-36.922 0.316-1.916 0.661-3.676 1.043-5.375 0.010-0.045 0.016-0.090 0.026-0.135 0.005-0.024 0.012-0.048 0.018-0.072s0.010-0.049 0.015-0.073c0.012-0.053 0.029-0.104 0.042-0.157 2.499-10.954 6.867-21.288 13.025-30.763 1.655-2.537 3.461-5.041 5.367-7.445 0.054-0.068 0.108-0.137 0.163-0.203l203.179-252.623c9.999-12.415 23.226-22.241 38.266-28.465 0.165-0.070 0.322-0.151 0.488-0.219 11.69-4.762 23.893-7.176 36.268-7.176 0.138 0 0.274 0 0.411 0.002l325.432 0.074c12.977 0 25.727 2.646 37.9 7.865 0.128 0.055 0.249 0.12 0.375 0.177 14.396 6.24 27.089 15.828 36.753 27.814l203.129 252.693c5.918 7.391 10.68 15.607 14.1 24.281 1.281 3.215 2.349 6.559 3.288 9.94 0.136 0.424 0.245 0.859 0.367 1.289 0.115 0.437 0.262 0.865 0.371 1.304zM820.225 374.723l23.599 64.364 26.357-114.496-49.956 50.132zM800.592 553.569l-38.246-104.307-133.742 186.427 171.988-82.12zM447.325 574.049l64.285 87.479 212.21-295.805-211.813-267.801-214.86 271.778 149.024 202.853c0.395 0.487 0.78 0.986 1.154 1.496zM155.294 331.019l24.683 107.366 20.994-59.666-45.677-47.701zM392.265 634.219l-8.248-11.225c-0.396-0.489-0.784-0.991-1.16-1.503l-123.396-167.97-35.315 100.371 168.12 80.326zM140.548 199.949l103.429 108.011 209.342-264.8-122.879-79.314-189.892 236.104zM512.103-14.116l55.432-35.435-110.368-0.023 54.936 35.459zM694.099-35.507l-123.289 78.814 206.527 261.117 105.175-105.544-188.413-234.387z" />
</font></defs></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 49 KiB

BIN
assets/fonts/icons/fonts/icons.ttf
View File

Binary file not shown.

BIN
assets/fonts/icons/fonts/icons.woff
View File

Binary file not shown.

2
assets/fonts/icons/selection.json
View File

File diff suppressed because one or more lines are too long

12
assets/fonts/icons/style.css
View File

@ -1,9 +1,9 @@
@font-face {
font-family: 'icons';
src:
url('fonts/icons.ttf?7yy17b') format('truetype'),
url('fonts/icons.woff?7yy17b') format('woff'),
url('fonts/icons.svg?7yy17b#icons') format('svg');
url('fonts/icons.ttf?yh9v06') format('truetype'),
url('fonts/icons.woff?yh9v06') format('woff'),
url('fonts/icons.svg?yh9v06#icons') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
@ -174,6 +174,12 @@
.icon-github:before {
content: "\e922";
}
.icon-backup-restore:before {
content: "\e934";
}
.icon-cis:before {
content: "\e935";
}
.icon-istio:before {
content: "\e92f";
}

16
assets/fonts/icons/style.scss
View File

@ -3,9 +3,9 @@
@font-face {
font-family: '#{$icomoon-font-family}';
src:
url('#{$icomoon-font-path}/#{$icomoon-font-family}.ttf?7yy17b') format('truetype'),
url('#{$icomoon-font-path}/#{$icomoon-font-family}.woff?7yy17b') format('woff'),
url('#{$icomoon-font-path}/#{$icomoon-font-family}.svg?7yy17b##{$icomoon-font-family}') format('svg');
url('#{$icomoon-font-path}/#{$icomoon-font-family}.ttf?yh9v06') format('truetype'),
url('#{$icomoon-font-path}/#{$icomoon-font-family}.woff?yh9v06') format('woff'),
url('#{$icomoon-font-path}/#{$icomoon-font-family}.svg?yh9v06##{$icomoon-font-family}') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
@ -276,6 +276,16 @@
content: $icon-github;
}
}
.icon-backup-restore {
&:before {
content: $icon-backup-restore;
}
}
.icon-cis {
&:before {
content: $icon-cis;
}
}
.icon-istio {
&:before {
content: $icon-istio;

2
assets/fonts/icons/variables.scss
View File

@ -51,6 +51,8 @@ $icon-pause: "\e921";
$icon-play: "\e929";
$icon-docker: "\e92a";
$icon-github: "\e922";
$icon-backup-restore: "\e934";
$icon-cis: "\e935";
$icon-istio: "\e92f";
$icon-rio: "\e930";
$icon-marketplace: "\e92b";

2
assets/translations/en-us.yaml
View File

@ -404,7 +404,7 @@ containerResourceLimit:
requestsMemory: Memory Reservation
cruResource:
backToForm: Back to form view?
backToForm: Back to Form
backBody: You will lose any changes made to the YAML.
cancelBody: You will lose any changes made to the YAML.
confirmBack: "Okay"

5
components/Tabbed/index.vue
View File

@ -333,6 +333,11 @@ export default {
background-color: var(--tabbed-container-bg);
// box-shadow: 0 0 20px var(--shadow);
// clip-path: polygon(-100% -100%, 100% -100%, 200% 100%, -100% 100%);
A {
color: var(--body-text);
text-decoration: none;
}
}
}
}

6
config/labels-annotations.js
View File

@ -43,8 +43,10 @@ export const CATALOG = {
_MANAGEMENT: 'management',
_DOWNSTREAM: 'downstream',
COMPONENT: 'catalog.cattle.io/ui-component',
COLOR: 'catalog.cattle.io/ui-color',
COMPONENT: 'catalog.cattle.io/ui-component',
SOURCE_REPO_TYPE: 'catalog.cattle.io/ui-source-repo-type',
SOURCE_REPO_NAME: 'catalog.cattle.io/ui-source-repo',
COLOR: 'catalog.cattle.io/ui-color',
};
const CATTLE_REGEX = /cattle\.io\//;

2
config/table-headers.js
View File

@ -182,7 +182,7 @@ export const AGE = {
name: 'age',
labelKey: 'tableHeaders.age',
value: 'metadata.creationTimestamp',
sort: 'metadata.creationTimestamp',
sort: 'metadata.creationTimestamp:desc',
search: false,
formatter: 'LiveDate',
width: 75,

26
models/catalog.cattle.io.app.js
View File

@ -72,18 +72,20 @@ export default {
details() {
const t = this.$rootGetters['i18n/t'];
return [
{
label: t('model."catalog.cattle.io.app".firstDeployed'),
formatter: 'LiveDate',
content: this.spec?.info?.firstDeployed
},
{
label: t('model."catalog.cattle.io.app".lastDeployed'),
formatter: 'LiveDate',
content: this.spec?.info?.lastDeployed
},
];
const first = this.spec?.info?.firstDeployed;
const last = this.spec?.info?.lastDeployed;
if ( first && last && first !== last ) {
return [
{
label: t('model."catalog.cattle.io.app".lastDeployed'),
formatter: 'LiveDate',
content: last,
},
];
}
return [];
},
nameDisplay() {

8
pages/c/_cluster/apps/install.vue
View File

@ -594,6 +594,10 @@ export default {
version: this.version.version,
releaseName: form.metadata.name,
description: form.metadata?.annotations?.[DESCRIPTION_ANNOTATION],
annotations: {
[CATALOG_ANNOTATIONS.SOURCE_REPO_TYPE]: this.chart.repoType,
[CATALOG_ANNOTATIONS.SOURCE_REPO_NAME]: this.chart.repoName
},
values,
};
@ -662,6 +666,10 @@ export default {
releaseName: dependency.annotations[CATALOG_ANNOTATIONS.RELEASE_NAME] || dependency.name,
projectId: this.project,
values: this.addGlobalValuesTo({}),
annotations: {
[CATALOG_ANNOTATIONS.SOURCE_REPO_TYPE]: dependency.repoType,
[CATALOG_ANNOTATIONS.SOURCE_REPO_NAME]: dependency.repoName
},
});
}