From 939731183bb746f10e33a706c8dcb4f0b7f93c06 Mon Sep 17 00:00:00 2001 From: Rob Cresswell Date: Thu, 15 Dec 2016 10:35:40 +0000 Subject: [PATCH] Update default OpenStack branding across Horizon This patch updates the OpenStack logos across Horizon to the newer versions. It also uses SVG files instead of PNG, so that it scales better. Change-Id: Ief3661023332ed6777256d20a4dc865f6a51695f Closes-Bug: 1637490 --- doc/source/topics/customizing.rst | 8 +- horizon/templates/auth/_splash.html | 2 +- .../static/dashboard/img/favicon.ico | Bin 1150 -> 10174 bytes .../static/dashboard/img/logo-splash.png | Bin 3187 -> 0 bytes .../static/dashboard/img/logo-splash.svg | 377 +++--------------- .../static/dashboard/img/logo.png | Bin 2405 -> 0 bytes .../static/dashboard/img/logo.svg | 355 +++-------------- .../dashboard/scss/components/_login.scss | 6 +- .../dashboard/scss/components/_navbar.scss | 2 +- openstack_dashboard/templates/500.html | 2 +- .../templates/header/_brand.html | 2 +- .../notes/bug/1637490-c29444e4eb458087.yaml | 5 + 12 files changed, 137 insertions(+), 622 deletions(-) delete mode 100644 openstack_dashboard/static/dashboard/img/logo-splash.png delete mode 100644 openstack_dashboard/static/dashboard/img/logo.png create mode 100644 releasenotes/notes/bug/1637490-c29444e4eb458087.yaml diff --git a/doc/source/topics/customizing.rst b/doc/source/topics/customizing.rst index 9115b0e7ed..ca2a09e71c 100644 --- a/doc/source/topics/customizing.rst +++ b/doc/source/topics/customizing.rst @@ -139,7 +139,7 @@ If the static root of the theme folder contains an ``img`` directory, then all images that make use of the {% themable_asset %} templatetag can be overridden. -These assets include logo.png, splash-logo.png and favicon.ico, however +These assets include logo.svg, splash-logo.svg and favicon.ico, however overriding the SVG/GIF assets used by Heat within the `dashboard/img` folder is not currently supported. @@ -151,10 +151,10 @@ Simple If you wish to customize the logo that is used on the splash screen or in the top navigation bar, then you need to create an ``img`` directory under your -theme's static root directory and place your custom ``logo.png`` or -``logo-splash.png`` within it. +theme's static root directory and place your custom ``logo.svg`` or +``logo-splash.svg`` within it. -If you wish to override the ``logo.png`` using the previous method, and if the +If you wish to override the ``logo.svg`` using the previous method, and if the image used is larger than the height of the top navigation, then the image will be constrained to fit within the height of nav. You can customize the height of the top navigation bar by customizing the SCSS variable: ``$navbar-height``. diff --git a/horizon/templates/auth/_splash.html b/horizon/templates/auth/_splash.html index b89aa33c7c..8ccdc272cf 100644 --- a/horizon/templates/auth/_splash.html +++ b/horizon/templates/auth/_splash.html @@ -1,5 +1,5 @@ {% load themes %}
- +
diff --git a/openstack_dashboard/static/dashboard/img/favicon.ico b/openstack_dashboard/static/dashboard/img/favicon.ico index f3b9bf9c440bad810cf0508569216543bb96bf11..6257c06e9879ee918f40259a4a503d5773d2ca1b 100644 GIT binary patch literal 10174 zcmeHNu};H440YO_bc2lyAQ(Hbwo-qDKS_RrKVak&@+JI1rH%|$jop*cDNS2jr>lC@ zCpo^mJloGcM=2-(6-;412ht6EJ_Eb~K+{ZUUBSEp_@=$tEUdri-rWnpD`_%;cM`VS zkEfvi<8}40#*!pHgOYg1Tsen$?ensF(9g@y%X`3k;F3KMzxQ&?bLNtR@0ibAIgG{1 zv3FDa@7EtIrR1pfm`^Pq#*Nwgo>xFy0n4+l^_hyZaI#=id1>t}oGe&v{8XHUlLec~ zOKWf8WWj3Vr{XM}EZ9_DT6+s83sxIH6=&gO!KU)k+FLkTu-f>kI148WHkFsw{u()H zxjU|`3S8sg3KmY+_^ensS+JMtEDI+KwsiiSYwjE@^>nQN@78<3d%%0(c6)%|N2Q*B z{4OmmhnRcGbKDPro|BjYbgb!{qU2E{ZrI5q;?D^!@rU}Ho%R0EzpT&tkvtL$(y=|& zwP#IrmiYXgRztER;qSS4bo*<#OrkkGBd|c+wurl6e|X&iv@BvK>tlL|JMHYMFl|oUQl>_suD^JebAf{;zoM zpU3Mr-!buFiTOOUjD-b}q{4{ij}^O-%->;@IvNcNGJW3fKk5XCUk95swY z;fBpViu^tC`IGo_&=?z;&0AmMa_!_Fd9$M$)LKayc?LIj?ro3Vqq9~)Z*F0>=LX5x zA)GutiHgc8xNpp$;odB4S&fX&+zeOFD2^PRh~*_@{aRBKL-YUQ%6W&v1OG2C6E2bc z*2)+xy)at)VX=E*b&!3U<;Nyx08ZBkL+8%U8^iv??_=xFE9i#7*2U;7T@XxUj~Y5b z_pMxLhg|)uHl*m<&^Iu}^3i{AZhjfm^z;%!6Y~fR&%x{ag6=0XxZgU7n(HCvRA~Uc L&mvil16JcFha9?* diff --git a/openstack_dashboard/static/dashboard/img/logo-splash.png b/openstack_dashboard/static/dashboard/img/logo-splash.png deleted file mode 100644 index d83e9c6644f03247c9c55cd8894c15a6ca740973..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3187 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 ZI^P4$j2~yL-}e9j002ovPDHLkV1m4X_SgUb diff --git a/openstack_dashboard/static/dashboard/img/logo-splash.svg b/openstack_dashboard/static/dashboard/img/logo-splash.svg index 0257920c20..70c6c51cec 100644 --- a/openstack_dashboard/static/dashboard/img/logo-splash.svg +++ b/openstack_dashboard/static/dashboard/img/logo-splash.svg @@ -1,314 +1,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/openstack_dashboard/static/dashboard/img/logo.png b/openstack_dashboard/static/dashboard/img/logo.png deleted file mode 100644 index 1a48c2124c2752412bd0d98c382851962ebccd1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2405 zcmV-r37YnaP)3)I1~GQwF!L`N#f)Ro7-7a2vfXQ; z`qr-_Co>CwL@87>dJ^4Jm$;r?o$Hh4e6O^Gd_ou_5&{y-hQdq)=OEY4ZN88PYSS%IKLrgJYF- z2j^4`fcha|twtgP>MWTF!Td7{x7eBd%pY71dBmSC8%y(qg_nbKs&SV^sQ-1WQ!ND7d@sT+awaD%&PZvf%}9|t_ege6r8$faVTxn^ zxkewu0n51`LO31F28AU!fvWFCxchu*wnZ*S1M#GuaPRAAEWBZf0Kgn*U(K{*d#|dH ze_c71Ip-svjWgUWx7;!Vy%21~a40Puf(4j|6EJWu20)oO(FMUVlt5`WLr{r_aU8u^ z1Qo%048>ZA_Ba#-21Lg@jz2-+S{&BL1dE}fxEUYf1pW0S`!W)4 zA9R=#jQi1vSMfNDy^!%H+`##3+a?v?^k|kxmIPd~`HIq0x6baFmF(OKgWpqkaQ2LW zP|>hhH4yBbS^Fi<&6cRB63JF*a19LGzA5$2N zAL*Y%5FJ@*IS_n;!5E-NWeJywUc8M9P8)9Ff4}2ig47YNxvW5%N+!t4P>!rGD`?wQ zUH)UJShy}9r@}om#w|?~0u2Y#h+os@o*xV(l$X*d7AIITr-r(gAmMt6M_!R!}Yik2O$`03bz7E8-_#p0+C(yF$DKR z!4_w@6x3s*CENx05}#sNAK@N?U`5;yC$;X8k#JI@P1q^4^p} zCsZuvaN)wS1Pg&^*h9G8goCnTu^xlqZYYyo5DY{b1WiyT_d~D%Zb%fLqt_DdF-y3^ zk#JBt%25cyxG;`zzkr|@+wi$5+{OBM7tV_n&g4<3Z@lB`u!9%v$im|Y(xGDEy241f z)%lmmds9ya`&QxJHSf3>;qHUr4pX?*dY)+#fQmPqj+cS05NtwXAK}U%*o{$8=s1IL zUtli;W8w3FxImvDwT91DLk zoD(XRTazzN=i1{iRjxZi?3wpa+ zLjG-p+KqjL>tQ_1coarU$R{t4_ZauNQ)C5Cl?|g)WlfGt*5^89bH2NNdx2*lR5UEu zWQg_-1RF5O67GFdEP;X1P};@V3Bf1W3c+u$9aA}T_2`M8SsrDp$)~Mmhg?Bq0uMtjo zX_f~(sq(NdRhHt3K&tWD4LO1gcv@vf*GxN20 zh4}-x3b|1I&YrkFl;O`zTao9RvNhzXc`M|-l!uHQj%N`k4R&_axje88;Ft~SyVvhO XN>$QhhOC$400000NkvXXu0mjf;_z_2 diff --git a/openstack_dashboard/static/dashboard/img/logo.svg b/openstack_dashboard/static/dashboard/img/logo.svg index 14ede6031f..004fc0232c 100644 --- a/openstack_dashboard/static/dashboard/img/logo.svg +++ b/openstack_dashboard/static/dashboard/img/logo.svg @@ -1,297 +1,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/openstack_dashboard/static/dashboard/scss/components/_login.scss b/openstack_dashboard/static/dashboard/scss/components/_login.scss index 50890dcb60..bd6e708886 100644 --- a/openstack_dashboard/static/dashboard/scss/components/_login.scss +++ b/openstack_dashboard/static/dashboard/scss/components/_login.scss @@ -6,8 +6,8 @@ margin-top: $navbar-height*2; .splash-logo { - padding: $padding-large-horizontal $padding-large-vertical; - max-width: 100%; + margin: $padding-large-horizontal $padding-large-vertical; + max-width: 65%; } .help_text { @@ -29,4 +29,4 @@ .hz-icon-required { display: none; } -} \ No newline at end of file +} diff --git a/openstack_dashboard/static/dashboard/scss/components/_navbar.scss b/openstack_dashboard/static/dashboard/scss/components/_navbar.scss index 74bb3cb5e7..6a6ecf7c12 100644 --- a/openstack_dashboard/static/dashboard/scss/components/_navbar.scss +++ b/openstack_dashboard/static/dashboard/scss/components/_navbar.scss @@ -5,7 +5,7 @@ img { display: inline-block; - max-height: $navbar-height; + max-height: $navbar-height - $padding-small-vertical*2; vertical-align: middle; } } diff --git a/openstack_dashboard/templates/500.html b/openstack_dashboard/templates/500.html index b901983e87..6037fb6e2d 100644 --- a/openstack_dashboard/templates/500.html +++ b/openstack_dashboard/templates/500.html @@ -38,7 +38,7 @@ left: 50%; width: 390px; - background: url("{% static "dashboard/img/logo.png" %}") no-repeat scroll center 35px padding-box rgb(255, 255, 255); + background: url("{% static "dashboard/img/logo.svg" %}") no-repeat scroll center 35px padding-box rgb(255, 255, 255); border: 1px solid rgb(225, 225, 225); -webkit-border-radius: 6px; diff --git a/openstack_dashboard/templates/header/_brand.html b/openstack_dashboard/templates/header/_brand.html index c3d6ed964b..dd0e0e41e3 100644 --- a/openstack_dashboard/templates/header/_brand.html +++ b/openstack_dashboard/templates/header/_brand.html @@ -2,5 +2,5 @@ {% load themes %} - + diff --git a/releasenotes/notes/bug/1637490-c29444e4eb458087.yaml b/releasenotes/notes/bug/1637490-c29444e4eb458087.yaml new file mode 100644 index 0000000000..fb23273490 --- /dev/null +++ b/releasenotes/notes/bug/1637490-c29444e4eb458087.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - The logos in Horizon (previously logo-splash.png and logo.png) now + load SVG files instead of PNG. The default logos have been updated + to reflect the new OpenStack branding.