diff options
author | Andrey V.Kosteltsev <AKosteltsev@IBS.RU> | 2022-06-10 08:14:11 +0300 |
---|---|---|
committer | Andrey V.Kosteltsev <AKosteltsev@IBS.RU> | 2022-06-10 08:14:11 +0300 |
commit | 28d07ffe7d38fe33f33bfbcd006a02e4d603260c (patch) | |
tree | 68024c70fe33f875b077ed6a11d5d8205cfad7cb /meta-ibs/meta-cp2-5422/recipes-phosphor | |
parent | 1a34179d918709cbe57519269c3b5dcec72343c4 (diff) | |
download | openbmc-28d07ffe7d38fe33f33bfbcd006a02e4d603260c.tar.xz |
webui-vue: Brand Logo
Diffstat (limited to 'meta-ibs/meta-cp2-5422/recipes-phosphor')
6 files changed, 108 insertions, 42 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0001-Set-login-brand-width.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0001-Set-login-brand-width.patch deleted file mode 100644 index bdcb8ddc7f..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0001-Set-login-brand-width.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4d8254ef05b5dba035940f3194ef09f1a8770dc9 Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Wed, 16 Mar 2022 03:55:19 +0300 -Subject: [PATCH] Set login brand width - ---- - src/layouts/LoginLayout.vue | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/layouts/LoginLayout.vue b/src/layouts/LoginLayout.vue -index cdff204..46939e1 100644 ---- a/src/layouts/LoginLayout.vue -+++ b/src/layouts/LoginLayout.vue -@@ -5,7 +5,7 @@ - <div> - <div class="login-brand mb-5"> - <img -- width="90px" -+ width="60%" - src="@/assets/images/login-company-logo.svg" - :alt="altLogo" - /> -@@ -22,8 +22,8 @@ - </div> - <div class="login-aside__logo-bmc"> - <img -- height="60px" -- src="@/assets/images/built-on-openbmc-logo.svg" -+ height="24px" -+ src="@/assets/images/login-company-logo.svg" - alt="Built on OpenBMC" - /> - </div> --- -2.33.0 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0001-Set-login-brand.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0001-Set-login-brand.patch new file mode 100644 index 0000000000..25c894531b --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0001-Set-login-brand.patch @@ -0,0 +1,82 @@ +From 244844b723c7e3f11dd5ec217c60ae48231c273c Mon Sep 17 00:00:00 2001 +From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> +Date: Fri, 10 Jun 2022 07:51:39 +0300 +Subject: [PATCH 1/2] Set login brand + +--- + src/layouts/LoginLayout.vue | 25 +++++++++++++++++++------ + 1 file changed, 19 insertions(+), 6 deletions(-) + +diff --git a/src/layouts/LoginLayout.vue b/src/layouts/LoginLayout.vue +index cdff204..a26a819 100644 +--- a/src/layouts/LoginLayout.vue ++++ b/src/layouts/LoginLayout.vue +@@ -2,10 +2,17 @@ + <main> + <div class="login-container"> + <div class="login-main"> ++ <div class="login-main__logo-vector"> ++ <img ++ height="100%" ++ src="@/assets/images/login-main-vector.svg" ++ alt="SILA" ++ /> ++ </div> + <div> + <div class="login-brand mb-5"> + <img +- width="90px" ++ width="60%" + src="@/assets/images/login-company-logo.svg" + :alt="altLogo" + /> +@@ -22,8 +29,8 @@ + </div> + <div class="login-aside__logo-bmc"> + <img +- height="60px" +- src="@/assets/images/built-on-openbmc-logo.svg" ++ height="32px" ++ src="@/assets/images/login-aside-vector.svg" + alt="Built on OpenBMC" + /> + </div> +@@ -50,7 +57,6 @@ export default { + display: flex; + flex-direction: column; + gap: $spacer * 2; +- max-width: 1400px; + min-width: 320px; + min-height: 100vh; + justify-content: space-around; +@@ -76,6 +82,13 @@ export default { + } + } + ++.login-main__logo-vector { ++ position: absolute; ++ top: 0; ++ left: 0; ++ height: $spacer * 3; ++} ++ + .login-form { + @include media-breakpoint-up('md') { + max-width: 360px; +@@ -88,11 +101,11 @@ export default { + justify-content: flex-end; + gap: $spacer * 1.5; + margin-right: $spacer * 3; +- margin-bottom: $spacer; ++ margin-bottom: $spacer * 3; + + @include media-breakpoint-up('md') { + min-height: 100vh; +- padding-bottom: $spacer; ++ padding-bottom: $spacer * 3; + flex: 1 1 25%; + margin-bottom: 0; + } +-- +2.35.1 + diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-Login-languages-list.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-Login-languages-list.patch index c4937439f0..c10d20d31e 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-Login-languages-list.patch +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-Login-languages-list.patch @@ -1,7 +1,7 @@ -From 76eb2ea8dfd78e2302cd7e6a37771cb8c433732f Mon Sep 17 00:00:00 2001 +From 38bafe7371b2bd0fa14cbc5be7d7ca658ecaf2af Mon Sep 17 00:00:00 2001 From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Fri, 27 May 2022 00:06:32 +0300 -Subject: [PATCH] Login languages list +Date: Fri, 10 Jun 2022 07:53:17 +0300 +Subject: [PATCH 2/2] Login languages list --- src/views/Login/Login.vue | 4 ---- diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-aside-vector.svg b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-aside-vector.svg new file mode 100644 index 0000000000..8d1c173141 --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-aside-vector.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<svg + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + width="40" height="32" viewBox="0 0 40 32" + fill="none"> + <path d="M40 0L40 32L0 32L1.59859e-06 13.7143L13.3333 13.7143L13.3333 -2.33127e-06L40 0Z" fill="#E11717"/> +</svg> diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-main-vector.svg b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-main-vector.svg new file mode 100644 index 0000000000..69d2dd75b7 --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-main-vector.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<svg + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + width="80" height="64" viewBox="0 0 80 64" + fill="none"> + <path d="M0 64L0 0L80 0V36.5714H53.3333V64L0 64Z" fill="#E11717"/> +</svg> diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend index e7345a0bae..69535f4f71 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend @@ -7,13 +7,15 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://git@git.sila.ru/srv/pub/scm/git/openbmc/webui-vue.git;branch=sila;protocol=ssh" -SRCREV = "11cc9ce2957d85b6f716dee68888a232cd57391f" +SRCREV = "6ec2071ce2afea746f84e2f2ad78489078097142" SRC_URI += "\ file://favicon.ico \ + file://login-main-vector.svg \ + file://login-aside-vector.svg \ file://login-company-logo.svg \ file://logo-header.svg \ - file://0001-Set-login-brand-width.patch \ + file://0001-Set-login-brand.patch \ file://0002-Login-languages-list.patch \ " @@ -23,7 +25,9 @@ do_update_logo () { cp ${WORKDIR}/favicon.ico \ ${S}/public/. - cp ${WORKDIR}/login-company-logo.svg \ + cp ${WORKDIR}/login-main-vector.svg \ + ${WORKDIR}/login-aside-vector.svg \ + ${WORKDIR}/login-company-logo.svg \ ${WORKDIR}/logo-header.svg \ ${S}/src/assets/images/. } |