previously we used custom png rendered for storages in the add menu of
a pool, as well as for mountpoints of containers. these appeared
blurry on high resolution displays and since they were just the same
as the font-awesome icons anyway, use those directly. the ui already
loads font-awesome regardless, so there are no down-sides here.
Signed-off-by: Shannon Sterz <s.st...@proxmox.com>
---
www/css/ext6-pve.css | 7 -------
www/images/Makefile | 8 +++-----
www/images/icon-harddisk.png | Bin 293 -> 0 bytes
www/manager6/grid/PoolMembers.js | 2 +-
www/manager6/lxc/Resources.js | 2 +-
5 files changed, 5 insertions(+), 14 deletions(-)
delete mode 100644 www/images/icon-harddisk.png
diff --git a/www/css/ext6-pve.css b/www/css/ext6-pve.css
index 192c82088..356427ead 100644
--- a/www/css/ext6-pve.css
+++ b/www/css/ext6-pve.css
@@ -313,7 +313,6 @@
.pve-itype-icon-swap,
.pve-itype-icon-node,
.pve-itype-icon-node-running,
-.pve-itype-icon-storage,
.pve-itype-icon-pool,
.pve-itype-icon-itype,
.pve-itype-icon-usb,
@@ -366,12 +365,6 @@
background-image: url(../images/lxc-on.png);
}
-.pve-itype-icon-storage,
-.x-tree-node-harddisk,
-.x-grid-tree-node-expanded .x-tree-node-harddisk {
- background-image: url(../images/icon-harddisk.png);
-}
-
.x-tree-node-snapshot,
.x-grid-tree-node-expanded .x-tree-node-snapshot {
background-image: url(../images/snapshot.png);
diff --git a/www/images/Makefile b/www/images/Makefile
index ad39c8c50..8072d0292 100644
--- a/www/images/Makefile
+++ b/www/images/Makefile
@@ -16,9 +16,8 @@ all:
# icon-cd, icon-pci
# are self made (sources as .xcf)
-# icon-swap, icon-display, icon-harddisk, icon-keyboard, icon-network,
icon-usb, icon-cloud
-# come from fontawesome (respective fa-refresh, fa-desktop, fa-hdd-o,
fa-keyboard-o, fa-exchange, fa-usb, fa-ellipsis-h, fa-cloud)
-
+# icon-swap, icon-display, icon-keyboard, icon-network, icon-usb, icon-cloud
+# come from fontawesome (respective fa-refresh, fa-desktop, fa-keyboard-o,
fa-exchange, fa-usb, fa-ellipsis-h, fa-cloud)
# icon-serial is a modified version of
# https://commons.wikimedia.org/wiki/File:DE9_Diagram.svg
# (public domain)
@@ -69,7 +68,6 @@ IMAGES = $(GNOME_IMAGES) \
icon-cd.png \
icon-network.png \
icon-display.png \
- icon-harddisk.png \
icon-keyboard.png \
logo-ceph.png \
logo-128.png \
@@ -88,7 +86,7 @@ IMAGES = $(GNOME_IMAGES) \
icon-sdn.svg: icon-sdn.dot
fdp -Tsvg $< > $@
-.PHONY: install
+.PHONY: install
install: $(IMAGES)
install -d $(WWWIMAGEDIR)
install -m 0644 $(IMAGES) $(WWWIMAGEDIR)
diff --git a/www/images/icon-harddisk.png b/www/images/icon-harddisk.png
deleted file mode 100644
index
38faeb94538fb340a424c6c596a129979e80eccf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 293
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_)JY5_^
zEP9V#vh{Kf6kvVeKUtMy+ao?94hhdqoZ1J~xKFUHY0WusPi?6}#Em7siY*hYTJ2e+
zwH-Y&CmpIb+*$elqs|fL;5$Dpi_@Ncx_`s_-tUZu2I~K1m30;`o~07AsQbB0Q}Ue$
zTK;Ec)LFY`S8#ik7f3a|jEMA|b#dd#lD6nITpVFLxOZAtIPG3wv8Z`^NT%+F|Hrca
z#4PM%kC_s{&>UdgYrP_&v7hJn5f=6x{By+@s{NMX+*k1Kcm9_TJ0yFQ&s;dZ;R#1+
p%;vo(+4{VM_9Vp^eed7M=5^R`=0u)L*MPoc@O1TaS?83{1OP#OcliJS
diff --git a/www/manager6/grid/PoolMembers.js b/www/manager6/grid/PoolMembers.js
index f025a1380..c6e7e9175 100644
--- a/www/manager6/grid/PoolMembers.js
+++ b/www/manager6/grid/PoolMembers.js
@@ -252,7 +252,7 @@ Ext.define('PVE.grid.PoolMembers', {
},
{
text: gettext('Storage'),
- iconCls: 'pve-itype-icon-storage',
+ iconCls: 'fa fa-hdd-o',
handler: function () {
var win =
Ext.create('PVE.pool.AddStorage', { pool: me.pool });
win.on('destroy', reload);
diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js
index 9f6df3a58..3defb8003 100644
--- a/www/manager6/lxc/Resources.js
+++ b/www/manager6/lxc/Resources.js
@@ -128,7 +128,7 @@ Ext.define('PVE.lxc.RessourceView', {
rows[confid] = {
group: group,
order: i,
- tdCls: 'pve-itype-icon-storage',
+ iconCls: 'hdd-o',
editor: mpeditor,
header: header,
renderer: Ext.htmlEncode,
--
2.47.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
