[Kimchi-devel] [PATCH] [Kimchi 1/1] Use distro icons exposed by Kimchi URIs

Aline Manera aline.manera at gmail.com
Mon Sep 11 12:52:27 UTC 2017


Kimchi was using distro icons exposed by Wok URIs which does not make
sense as Kimchi packages those icons and should refer to them.

Signed-off-by: Aline Manera <aline.manera at gmail.com>
---
 ui/css/kimchi.css                  | 56 +++++++++++++++++++-------------------
 ui/css/src/modules/_guests.scss    | 14 +++++-----
 ui/css/src/modules/_iso-list.scss  | 14 +++++-----
 ui/css/src/modules/_templates.scss | 28 +++++++++----------
 4 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css
index 4c40fcd5..dec3874b 100644
--- a/ui/css/kimchi.css
+++ b/ui/css/kimchi.css
@@ -231,37 +231,37 @@
 
 #template-add-window.modal-content h3.iso-title.centos,
 #guest-add-window.modal-content h3.iso-title.centos {
-  background-image: url("../../../images/theme-default/icon-centos.png");
+  background-image: url("../images/icon-centos.png");
 }
 
 #template-add-window.modal-content h3.iso-title.debian,
 #guest-add-window.modal-content h3.iso-title.debian {
-  background-image: url("../../../images/theme-default/icon-debian.png");
+  background-image: url("../images/icon-debian.png");
 }
 
 #template-add-window.modal-content h3.iso-title.fedora,
 #guest-add-window.modal-content h3.iso-title.fedora {
-  background-image: url("../../../images/theme-default/icon-fedora.png");
+  background-image: url("../images/icon-fedora.png");
 }
 
 #template-add-window.modal-content h3.iso-title.opensuse,
 #guest-add-window.modal-content h3.iso-title.opensuse {
-  background-image: url("../../../images/theme-default/icon-opensuse.png");
+  background-image: url("../images/icon-opensuse.png");
 }
 
 #template-add-window.modal-content h3.iso-title.ubuntu,
 #guest-add-window.modal-content h3.iso-title.ubuntu {
-  background-image: url("../../../images/theme-default/icon-ubuntu.png");
+  background-image: url("../images/icon-ubuntu.png");
 }
 
 #template-add-window.modal-content h3.iso-title.gentoo,
 #guest-add-window.modal-content h3.iso-title.gentoo {
-  background-image: url("../../../images/theme-default/icon-gentoo.png");
+  background-image: url("../images/icon-gentoo.png");
 }
 
 #template-add-window.modal-content h3.iso-title.unknown,
 #guest-add-window.modal-content h3.iso-title.unknown {
-  background-image: url("../../../images/theme-default/icon-unknown.png");
+  background-image: url("../images/icon-vm.png");
 }
 
 /* Create Guest Modal */
@@ -1037,31 +1037,31 @@
 }
 
 #guest-content-container .distro-icon.icon-centos {
-  background-image: url("../../../images/theme-default/icon-centos.png");
+  background-image: url("../images/icon-centos.png");
 }
 
 #guest-content-container .distro-icon.icon-debian {
-  background-image: url("../../../images/theme-default/icon-debian.png");
+  background-image: url("../images/icon-debian.png");
 }
 
 #guest-content-container .distro-icon.icon-fedora {
-  background-image: url("../../../images/theme-default/icon-fedora.png");
+  background-image: url("../images/icon-fedora.png");
 }
 
 #guest-content-container .distro-icon.icon-opensuse {
-  background-image: url("../../../images/theme-default/icon-opensuse.png");
+  background-image: url("../images/icon-opensuse.png");
 }
 
 #guest-content-container .distro-icon.icon-ubuntu {
-  background-image: url("../../../images/theme-default/icon-ubuntu.png");
+  background-image: url("../images/icon-ubuntu.png");
 }
 
 #guest-content-container .distro-icon.icon-gentoo {
-  background-image: url("../../../images/theme-default/icon-gentoo.png");
+  background-image: url("../images/icon-gentoo.png");
 }
 
 #guest-content-container .distro-icon.icon-unknown {
-  background-image: url("../../../images/theme-default/icon-unknown.png");
+  background-image: url("../images/icon-vm.png");
 }
 
 body.wok-gallery {
@@ -2149,31 +2149,31 @@ ul {
 }
 
 #templates-root-container .wok-vm-list .distro-icon.icon-centos {
-  background-image: url("../../../images/theme-default/icon-centos.png");
+  background-image: url("../images/icon-centos.png");
 }
 
 #templates-root-container .wok-vm-list .distro-icon.icon-debian {
-  background-image: url("../../../images/theme-default/icon-debian.png");
+  background-image: url("../images/icon-debian.png");
 }
 
 #templates-root-container .wok-vm-list .distro-icon.icon-fedora {
-  background-image: url("../../../images/theme-default/icon-fedora.png");
+  background-image: url("../images/icon-fedora.png");
 }
 
 #templates-root-container .wok-vm-list .distro-icon.icon-opensuse {
-  background-image: url("../../../images/theme-default/icon-opensuse.png");
+  background-image: url("../images/icon-opensuse.png");
 }
 
 #templates-root-container .wok-vm-list .distro-icon.icon-ubuntu {
-  background-image: url("../../../images/theme-default/icon-ubuntu.png");
+  background-image: url("../images/icon-ubuntu.png");
 }
 
 #templates-root-container .wok-vm-list .distro-icon.icon-gentoo {
-  background-image: url("../../../images/theme-default/icon-gentoo.png");
+  background-image: url("../images/icon-gentoo.png");
 }
 
 #templates-root-container .wok-vm-list .distro-icon.icon-unknown {
-  background-image: url("../../../images/theme-default/icon-unknown.png");
+  background-image: url("../images/icon-vm.png");
 }
 
 #templates-root-container .wok-vm-gallery {
@@ -2280,31 +2280,31 @@ ul {
 }
 
 #templates-root-container .wok-vm-gallery .name-distro-icon.icon-centos {
-  background-image: url("../../../images/theme-default/icon-centos.png");
+  background-image: url("../images/icon-centos.png");
 }
 
 #templates-root-container .wok-vm-gallery .name-distro-icon.icon-debian {
-  background-image: url("../../../images/theme-default/icon-debian.png");
+  background-image: url("../images/icon-debian.png");
 }
 
 #templates-root-container .wok-vm-gallery .name-distro-icon.icon-fedora {
-  background-image: url("../../../images/theme-default/icon-fedora.png");
+  background-image: url("../images/icon-fedora.png");
 }
 
 #templates-root-container .wok-vm-gallery .name-distro-icon.icon-opensuse {
-  background-image: url("../../../images/theme-default/icon-opensuse.png");
+  background-image: url("../images/icon-opensuse.png");
 }
 
 #templates-root-container .wok-vm-gallery .name-distro-icon.icon-ubuntu {
-  background-image: url("../../../images/theme-default/icon-ubuntu.png");
+  background-image: url("../images/icon-ubuntu.png");
 }
 
 #templates-root-container .wok-vm-gallery .name-distro-icon.icon-gentoo {
-  background-image: url("../../../images/theme-default/icon-gentoo.png");
+  background-image: url("../images/icon-gentoo.png");
 }
 
 #templates-root-container .wok-vm-gallery .name-distro-icon.icon-unknown {
-  background-image: url("../../../images/theme-default/icon-unknown.png");
+  background-image: url("../images/icon-vm.png");
 }
 
 #templates-root-container span.template-status {
diff --git a/ui/css/src/modules/_guests.scss b/ui/css/src/modules/_guests.scss
index 37654dd7..efb349f9 100644
--- a/ui/css/src/modules/_guests.scss
+++ b/ui/css/src/modules/_guests.scss
@@ -682,25 +682,25 @@
         background-repeat: no-repeat;
         background-position: 100% 50%;
         &.icon-centos {
-            background-image: url('../../#{$wok-icon-path}/icon-centos.png');
+            background-image: url('../images/icon-centos.png');
         }
         &.icon-debian {
-            background-image: url('../../#{$wok-icon-path}/icon-debian.png');
+            background-image: url('../images/icon-debian.png');
         }
         &.icon-fedora {
-            background-image: url('../../#{$wok-icon-path}/icon-fedora.png');
+            background-image: url('../images/icon-fedora.png');
         }
         &.icon-opensuse {
-            background-image: url('../../#{$wok-icon-path}/icon-opensuse.png');
+            background-image: url('../images/icon-opensuse.png');
         }
         &.icon-ubuntu {
-            background-image: url('../../#{$wok-icon-path}/icon-ubuntu.png');
+            background-image: url('../images/icon-ubuntu.png');
         }
         &.icon-gentoo {
-            background-image: url('../../#{$wok-icon-path}/icon-gentoo.png');
+            background-image: url('../images/icon-gentoo.png');
         }
         &.icon-unknown {
-            background-image: url('../../#{$wok-icon-path}/icon-unknown.png');
+            background-image: url('../images/icon-vm.png');
         }
     }
 }
diff --git a/ui/css/src/modules/_iso-list.scss b/ui/css/src/modules/_iso-list.scss
index 22b51a2b..02122403 100644
--- a/ui/css/src/modules/_iso-list.scss
+++ b/ui/css/src/modules/_iso-list.scss
@@ -122,25 +122,25 @@
         text-overflow: ellipsis;
         white-space: nowrap;
         &.centos {
-            background-image: url('../../#{$wok-icon-path}/icon-centos.png');
+            background-image: url('../images/icon-centos.png');
         }
         &.debian {
-            background-image: url('../../#{$wok-icon-path}/icon-debian.png');
+            background-image: url('../images/icon-debian.png');
         }
         &.fedora {
-            background-image: url('../../#{$wok-icon-path}/icon-fedora.png');
+            background-image: url('../images/icon-fedora.png');
         }
         &.opensuse {
-            background-image: url('../../#{$wok-icon-path}/icon-opensuse.png');
+            background-image: url('../images/icon-opensuse.png');
         }
         &.ubuntu {
-            background-image: url('../../#{$wok-icon-path}/icon-ubuntu.png');
+            background-image: url('../images/icon-ubuntu.png');
         }
         &.gentoo {
-            background-image: url('../../#{$wok-icon-path}/icon-gentoo.png');
+            background-image: url('../images/icon-gentoo.png');
         }
         &.unknown {
-            background-image: url('../../#{$wok-icon-path}/icon-unknown.png');
+            background-image: url('../images/icon-vm.png');
         }
     }
 }
diff --git a/ui/css/src/modules/_templates.scss b/ui/css/src/modules/_templates.scss
index 49a4f1a0..9f183e4a 100644
--- a/ui/css/src/modules/_templates.scss
+++ b/ui/css/src/modules/_templates.scss
@@ -470,25 +470,25 @@ $kimchi-icon-path: '../images';
             background-repeat: no-repeat;
             background-position: 8px 50%;
             &.icon-centos {
-                background-image: url('../../#{$wok-icon-path}/icon-centos.png');
+                background-image: url('../images/icon-centos.png');
             }
             &.icon-debian {
-                background-image: url('../../#{$wok-icon-path}/icon-debian.png');
+                background-image: url('../images/icon-debian.png');
             }
             &.icon-fedora {
-                background-image: url('../../#{$wok-icon-path}/icon-fedora.png');
+                background-image: url('../images/icon-fedora.png');
             }
             &.icon-opensuse {
-                background-image: url('../../#{$wok-icon-path}/icon-opensuse.png');
+                background-image: url('../images/icon-opensuse.png');
             }
             &.icon-ubuntu {
-                background-image: url('../../#{$wok-icon-path}/icon-ubuntu.png');
+                background-image: url('../images/icon-ubuntu.png');
             }
             &.icon-gentoo {
-                background-image: url('../../#{$wok-icon-path}/icon-gentoo.png');
+                background-image: url('../images/icon-gentoo.png');
             }
             &.icon-unknown {
-                background-image: url('../../#{$wok-icon-path}/icon-unknown.png');
+                background-image: url('../images/icon-vm.png');
             }
         }
     }
@@ -585,25 +585,25 @@ $kimchi-icon-path: '../images';
             background-repeat: no-repeat;
             background-position: 100% 50%;
             &.icon-centos {
-                background-image: url('../../#{$wok-icon-path}/icon-centos.png');
+                background-image: url('../images/icon-centos.png');
             }
             &.icon-debian {
-                background-image: url('../../#{$wok-icon-path}/icon-debian.png');
+                background-image: url('../images/icon-debian.png');
             }
             &.icon-fedora {
-                background-image: url('../../#{$wok-icon-path}/icon-fedora.png');
+                background-image: url('../images/icon-fedora.png');
             }
             &.icon-opensuse {
-                background-image: url('../../#{$wok-icon-path}/icon-opensuse.png');
+                background-image: url('../images/icon-opensuse.png');
             }
             &.icon-ubuntu {
-                background-image: url('../../#{$wok-icon-path}/icon-ubuntu.png');
+                background-image: url('../images/icon-ubuntu.png');
             }
             &.icon-gentoo {
-                background-image: url('../../#{$wok-icon-path}/icon-gentoo.png');
+                background-image: url('../images/icon-gentoo.png');
             }
             &.icon-unknown {
-                background-image: url('../../#{$wok-icon-path}/icon-unknown.png');
+                background-image: url('../images/icon-vm.png');
             }
         }
     }
-- 
2.13.5



More information about the Kimchi-devel mailing list