From: KIRAN KASHALKAR Date: Thu, 29 Sep 2016 19:02:29 +0000 (-0400) Subject: Bug 65 resolved. X-Git-Tag: v1.0.0^2 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=9b0dda62a678352e47c3c9a8d9738c7b46ab5316;p=osm%2FUI.git Bug 65 resolved. Signed-off-by: KIRAN KASHALKAR --- diff --git a/skyquake/framework/style/core.css b/skyquake/framework/style/core.css index 8183eab5f..01b728b47 100644 --- a/skyquake/framework/style/core.css +++ b/skyquake/framework/style/core.css @@ -95,7 +95,8 @@ body { position: relative } .header-app h1 { - background: url(./img/header-logo.png) no-repeat left center; + /*background: url(./img/header-logo.png) no-repeat left center;*/ + background: url(./img/svg/osm-logo_color_rgb.svg) no-repeat left center; height: 51px; line-height: 51px; margin-left: 80px; @@ -2022,7 +2023,8 @@ a[role=button] { margin-top: 150px; margin-bottom: 20px; background-size: 154px 102px; - background-image: url(./img/header-logo.png) + /*background-image: url(./img/header-logo.png)*/ + background-image: url(./img/svg/osm-logo_color_rgb.svg); } .login-cntnr .riftio { margin-bottom: 40px; diff --git a/skyquake/framework/style/img/osm_header.png b/skyquake/framework/style/img/osm_header.png index c67dca3fa..53a950063 100644 Binary files a/skyquake/framework/style/img/osm_header.png and b/skyquake/framework/style/img/osm_header.png differ diff --git a/skyquake/framework/style/img/osm_header_253x50.png b/skyquake/framework/style/img/osm_header_253x50.png index 3055122bf..10054312e 100644 Binary files a/skyquake/framework/style/img/osm_header_253x50.png and b/skyquake/framework/style/img/osm_header_253x50.png differ diff --git a/skyquake/framework/style/img/osm_header_506x100.png b/skyquake/framework/style/img/osm_header_506x100.png index 4b7a34477..7ece8458b 100644 Binary files a/skyquake/framework/style/img/osm_header_506x100.png and b/skyquake/framework/style/img/osm_header_506x100.png differ diff --git a/skyquake/framework/style/img/svg/osm-logo_color_rgb.svg b/skyquake/framework/style/img/svg/osm-logo_color_rgb.svg new file mode 100644 index 000000000..5f5033e62 --- /dev/null +++ b/skyquake/framework/style/img/svg/osm-logo_color_rgb.svg @@ -0,0 +1 @@ +osm-logo_color_rgb \ No newline at end of file diff --git a/skyquake/framework/style/img/svg/osm-logo_color_rgb_white_text.svg b/skyquake/framework/style/img/svg/osm-logo_color_rgb_white_text.svg new file mode 100644 index 000000000..640040d30 --- /dev/null +++ b/skyquake/framework/style/img/svg/osm-logo_color_rgb_white_text.svg @@ -0,0 +1 @@ +osm-logo_color_rgb_white_textLayer 1 \ No newline at end of file diff --git a/skyquake/framework/widgets/header/header.scss b/skyquake/framework/widgets/header/header.scss index 9238c22c6..5e1e71750 100644 --- a/skyquake/framework/widgets/header/header.scss +++ b/skyquake/framework/widgets/header/header.scss @@ -27,7 +27,8 @@ header.header-app-component { align-items:center; } h1 { - background: url('../../style/img/header-logo.png') no-repeat; + /*background: url('../../style/img/header-logo.png') no-repeat;*/ + background: url('../../style/img/svg/osm-logo_color_rgb.svg') no-repeat; background-size:contain; height: 51px; line-height: 51px; diff --git a/skyquake/framework/widgets/login/login.scss b/skyquake/framework/widgets/login/login.scss index cb14e9b76..c7968a259 100644 --- a/skyquake/framework/widgets/login/login.scss +++ b/skyquake/framework/widgets/login/login.scss @@ -16,6 +16,7 @@ * */ .login-cntnr .logo { - background-image: url(../../style/img/header-logo.png); - + /*background-image: url(../../style/img/header-logo.png);*/ + background: url('../../style/img/svg/osm-logo_color_rgb.svg') no-repeat center; + background-size: contain; } diff --git a/skyquake/framework/widgets/skyquake_container/skyquakeApp.scss b/skyquake/framework/widgets/skyquake_container/skyquakeApp.scss index 4f77d7137..a01f1547f 100644 --- a/skyquake/framework/widgets/skyquake_container/skyquakeApp.scss +++ b/skyquake/framework/widgets/skyquake_container/skyquakeApp.scss @@ -89,12 +89,12 @@ html, body { &:before { content: ''; height:1.85rem; - width:2.5rem; - margin:0 1rem; - padding:0 0.125rem; - // background: url('../../style/img/header-logo.png') no-repeat center center white; - background: url('../../style/img/svg/riftio_logo_white.svg') no-repeat center center; - background-size:65%; + width:5.5rem; + /*margin:0 1rem;*/ + /*padding:0 0.125rem;*/ + /*background: url('../../style/img/svg/riftio_logo_white.svg') no-repeat center center;*/ + background: url('../../style/img/svg/osm-logo_color_rgb_white_text.svg') no-repeat center center; + background-size: contain; } } .skyquakeContainerWrapper {