Skip to content

Commit 4e5150b

Browse files
ui: fix icons size inconsistency and use fa icons
This fixes icon size inconsistency when fa os-logo icons are used versus when resource icons are used. This also changes some of the infocard icons to use better icons from font awesome. Signed-off-by: Rohit Yadav <[email protected]>
1 parent 02da965 commit 4e5150b

File tree

2 files changed

+23
-9
lines changed

2 files changed

+23
-9
lines changed

ui/src/components/view/InfoCard.vue

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
<resource-icon :image="getImage(resource.icon && resource.icon.base64image || images.template || images.iso || resourceIcon)" size="4x" style="margin-right: 5px"/>
3535
</span>
3636
<span v-else>
37-
<os-logo v-if="resource.ostypeid || resource.ostypename" :osId="resource.ostypeid" :osName="resource.ostypename" size="4x" @update-osname="setResourceOsType"/>
37+
<os-logo v-if="resource.ostypeid || resource.ostypename" :osId="resource.ostypeid" :osName="resource.ostypename" size="3x" @update-osname="setResourceOsType"/>
3838
<render-icon v-else-if="typeof $route.meta.icon ==='string'" style="font-size: 36px" :icon="$route.meta.icon" />
3939
<font-awesome-icon
4040
v-else-if="$route.meta.icon && Array.isArray($route.meta.icon)"
4141
:icon="$route.meta.icon"
42-
size="4x"
42+
size="3x"
4343
class="anticon"
4444
:style="[$store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' }]" />
4545
<render-icon v-else style="font-size: 36px" :svgIcon="$route.meta.icon" />
@@ -179,7 +179,10 @@
179179
<div class="resource-detail-item" v-if="('cpunumber' in resource && 'cpuspeed' in resource) || resource.cputotal">
180180
<div class="resource-detail-item__label">{{ $t('label.cpu') }}</div>
181181
<div class="resource-detail-item__details">
182-
<appstore-outlined />
182+
<font-awesome-icon
183+
:icon="['fa-solid', 'fa-microchip']"
184+
class="anticon"
185+
:style="[$store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' }]" />
183186
<span v-if="'cpunumber' in resource && 'cpuspeed' in resource">{{ resource.cpunumber }} CPU x {{ parseFloat(resource.cpuspeed / 1000.0).toFixed(2) }} Ghz</span>
184187
<span v-else>{{ resource.cputotal }}</span>
185188
</div>
@@ -207,7 +210,11 @@
207210
<div class="resource-detail-item" v-if="'memory' in resource">
208211
<div class="resource-detail-item__label">{{ $t('label.memory') }}</div>
209212
<div class="resource-detail-item__details">
210-
<bulb-outlined />{{ resource.memory + ' ' + $t('label.mb.memory') }}
213+
<font-awesome-icon
214+
:icon="['fa-solid', 'fa-memory']"
215+
class="anticon"
216+
:style="[$store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' }]" />
217+
{{ resource.memory + ' ' + $t('label.mb.memory') }}
211218
</div>
212219
<div>
213220
<span v-if="resource.memorykbs && resource.memoryintfreekbs">
@@ -339,7 +346,10 @@
339346
v-for="(eth, index) in resource.nic"
340347
:key="eth.id"
341348
style="margin-left: -24px; margin-top: 5px;">
342-
<api-outlined />
349+
<font-awesome-icon
350+
:icon="['fa-solid', 'fa-ethernet']"
351+
class="anticon"
352+
:style="[$store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' }]" />
343353
<strong>eth{{ index }}</strong>&nbsp;
344354
<copy-label :label="eth.ip6address ? eth.ipaddress + ', ' + eth.ip6address : eth.ipaddress" />&nbsp;
345355
<a-tag v-if="eth.isdefault">
@@ -364,7 +374,11 @@
364374
v-for="network in resource.networks"
365375
:key="network.id"
366376
style="margin-top: 5px;">
367-
<api-outlined />{{ network.name }}
377+
<font-awesome-icon
378+
:icon="['fa-solid', 'fa-ethernet']"
379+
class="anticon"
380+
:style="[$store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' }]" />
381+
{{ network.name }}
368382
<span v-if="resource.defaultnetworkid === network.id">
369383
({{ $t('label.default') }})
370384
</span>

ui/src/components/view/ListView.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<span v-if="record.icon && record.icon.base64image">
4444
<resource-icon :image="record.icon.base64image" size="2x"/>
4545
</span>
46-
<os-logo v-else :osId="record.ostypeid" :osName="record.osdisplayname" size="2x" />
46+
<os-logo v-else :osId="record.ostypeid" :osName="record.osdisplayname" size="xl" />
4747
</span>
4848
<span style="min-width: 120px" >
4949
<QuickView
@@ -57,12 +57,12 @@
5757
</span>
5858
<span v-if="$showIcon() && !['vm', 'vnfapp'].includes($route.path.split('/')[1])" style="margin-right: 5px">
5959
<resource-icon v-if="$showIcon() && record.icon && record.icon.base64image" :image="record.icon.base64image" size="2x"/>
60-
<os-logo v-else-if="record.ostypename" :osName="record.ostypename" size="2x" />
60+
<os-logo v-else-if="record.ostypename" :osName="record.ostypename" size="xl" />
6161
<render-icon v-else-if="typeof $route.meta.icon ==='string'" style="font-size: 16px;" :icon="$route.meta.icon"/>
6262
<render-icon v-else style="font-size: 16px;" :svgIcon="$route.meta.icon" />
6363
</span>
6464
<span v-else :style="{ 'margin-right': record.ostypename ? '5px' : '0' }">
65-
<os-logo v-if="record.ostypename" :osName="record.ostypename" size="1x" />
65+
<os-logo v-if="record.ostypename" :osName="record.ostypename" size="xl" />
6666
</span>
6767

6868
<span v-if="record.hasannotations">

0 commit comments

Comments
 (0)