This is an automated email from the ASF dual-hosted git repository. sarath pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push: new 9afa495 ATLAS-3420 : New logo for Apache Atlas 9afa495 is described below commit 9afa4951982947b50a675c74d4ceff675bf66936 Author: kevalbhatt <kbh...@apache.org> AuthorDate: Tue Sep 24 21:05:20 2019 +0530 ATLAS-3420 : New logo for Apache Atlas Signed-off-by: Sarath Subramanian <sar...@apache.org> (cherry picked from commit 5bffc7cfb4fe322b7ef9275906bc24cd61a2c759) --- dashboardv2/public/css/scss/login.scss | 3 +- dashboardv2/public/css/scss/theme.scss | 35 +++++++++------------ dashboardv2/public/img/atlas-logo-beta-ui.png | Bin 0 -> 7927 bytes dashboardv2/public/img/atlas-logo.png | Bin 9433 -> 17455 bytes dashboardv2/public/img/atlas_logo.svg | 17 ++++++++++ dashboardv2/public/img/atlas_logo_beta.svg | 17 ++++++++++ dashboardv2/public/img/favicon.ico | Bin 0 -> 1778 bytes dashboardv2/public/index.html.tpl | 8 ++--- .../js/templates/site/SideNavLayoutView_tmpl.html | 6 ++-- dashboardv3/public/css/scss/login.scss | 3 +- dashboardv3/public/css/scss/theme.scss | 4 +-- dashboardv3/public/img/atlas-logo-beta-side.png | Bin 10266 -> 0 bytes dashboardv3/public/img/atlas-logo-beta-ui.png | Bin 10391 -> 7927 bytes dashboardv3/public/img/atlas-logo.png | Bin 9433 -> 17455 bytes dashboardv3/public/img/atlas_logo.svg | 17 ++++++++++ dashboardv3/public/img/atlas_logo_beta.svg | 17 ++++++++++ dashboardv3/public/img/favicon.ico | Bin 0 -> 1778 bytes dashboardv3/public/index.html.tpl | 4 +-- dashboardv3/public/js/templates/site/Header.html | 2 +- webapp/src/main/webapp/login.jsp | 2 +- 20 files changed, 100 insertions(+), 35 deletions(-) diff --git a/dashboardv2/public/css/scss/login.scss b/dashboardv2/public/css/scss/login.scss index 3724991..d4dba17 100644 --- a/dashboardv2/public/css/scss/login.scss +++ b/dashboardv2/public/css/scss/login.scss @@ -43,7 +43,8 @@ body { } img { - width: 168px; + height: 65px; + padding: 6px; margin-bottom: 28px; } diff --git a/dashboardv2/public/css/scss/theme.scss b/dashboardv2/public/css/scss/theme.scss index ea41689..a38080a 100644 --- a/dashboardv2/public/css/scss/theme.scss +++ b/dashboardv2/public/css/scss/theme.scss @@ -14,7 +14,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - /* theme.scss */ body { @@ -34,11 +33,10 @@ header.atlas-header { float: none; display: table-cell; padding: 0px 5px; - } } - &>table { + & > table { td { padding: 3px 2px; position: relative; @@ -47,7 +45,7 @@ header.atlas-header { } .header-menu { - .dropdown-menu>li>a { + .dropdown-menu > li > a { color: $color_ironside_gray_approx; &:hover { @@ -59,7 +57,7 @@ header.atlas-header { } } - td>a { + td > a { display: inline-block; color: $color_ironside_gray_approx; padding: 15px 14px; @@ -81,7 +79,12 @@ header.atlas-header { } } - +.sidebar-brand { + .logo { + height: 50px; + padding: 6px; + } +} .main-search { .form-control { @@ -102,7 +105,6 @@ header.atlas-header { } } - .close { font-size: 2em; } @@ -114,7 +116,6 @@ header.atlas-header { color: $white; font-size: 16px !important; - .well { background: transparent; border: 1px solid #666363; @@ -124,7 +125,6 @@ header.atlas-header { } } - .page-title { background-color: $color_white_lilac_approx; padding: 15px 15px 0px 15px; @@ -218,7 +218,6 @@ a[href^="#!/"]:not(.btn, .not-blue-link) { @extend .blue-link; } - th { text-transform: capitalize; } @@ -258,10 +257,9 @@ hr[size="10"] { } .gray-bg { - background-color: $color_white_lilac_approx + background-color: $color_white_lilac_approx; } - .comment-input { background-color: $color_white_lilac_approx; padding: 20px; @@ -288,7 +286,6 @@ hr[size="10"] { } } - @media (min-width: 768px) { .col-sm-custom { //width: 92%; @@ -386,10 +383,10 @@ hr[size="10"] { } .inline-content { - >.inline { + > .inline { display: inline-block; - &+.inline { + & + .inline { margin-left: 5px; } } @@ -398,7 +395,7 @@ hr[size="10"] { .inline-content-fl { @extend .inline-content; - >.inline { + > .inline { display: block; float: left; } @@ -407,17 +404,16 @@ hr[size="10"] { .inline-content-fr { @extend .inline-content-fl; - >.inline { + > .inline { float: right; - &+.inline { + & + .inline { margin-right: 5px; } } } .has-error { - .select2-selection--single, .select2-selection--multiple { border-color: $color_apple_blossom_approx; @@ -454,7 +450,6 @@ hr[size="10"] { } } - .ui-menu.ui-widget-content.ui-autocomplete { box-shadow: 0px 11px 30px -8px grey; max-width: 60% !important; diff --git a/dashboardv2/public/img/atlas-logo-beta-ui.png b/dashboardv2/public/img/atlas-logo-beta-ui.png new file mode 100644 index 0000000..fcd54d4 Binary files /dev/null and b/dashboardv2/public/img/atlas-logo-beta-ui.png differ diff --git a/dashboardv2/public/img/atlas-logo.png b/dashboardv2/public/img/atlas-logo.png index 118d39b..c99345b 100644 Binary files a/dashboardv2/public/img/atlas-logo.png and b/dashboardv2/public/img/atlas-logo.png differ diff --git a/dashboardv2/public/img/atlas_logo.svg b/dashboardv2/public/img/atlas_logo.svg new file mode 100644 index 0000000..3314cb0 --- /dev/null +++ b/dashboardv2/public/img/atlas_logo.svg @@ -0,0 +1,17 @@ +<!-- + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +--> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 976.59 177.38"><defs><style>.cls-1{fill:#cdcccc;}.cls-2,.cls-3{fill:#1fcfb8;}.cls-2{stroke:#1fcfb8;stroke-width:1.18px;}.cls-2,.cls-4,.cls-5{stroke-miterlimit:10;}.cls-4,.cls-5{fill:none;stroke:#cdcccc;}.cls-4{stroke-width:3.55px;}.cls-5{stroke-width:5px;}.cls-6{fill:#009883;}</style></defs><title>Asset 6</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M260.81,55.74l23.37,65.13h9. [...] \ No newline at end of file diff --git a/dashboardv2/public/img/atlas_logo_beta.svg b/dashboardv2/public/img/atlas_logo_beta.svg new file mode 100644 index 0000000..ce9e4b0 --- /dev/null +++ b/dashboardv2/public/img/atlas_logo_beta.svg @@ -0,0 +1,17 @@ +<!-- + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +--> +<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1218.25 177.38"><defs><style>.cls-1{fill:#cdcccc;}.cls-2,.cls-3{fill:#1fcfb8;}.cls-2{stroke:#1fcfb8;stroke-width:1.18px;}.cls-2,.cls-4,.cls-5{stroke-miterlimit:10;}.cls-4,.cls-5{fill:none;stroke:#cdcccc;}.cls-4{stroke-width:3.55px;}.cls-5{stroke-width:5px;}.cls-6{fill:#fff;}.cls-7{fill:#009883;}.cls-8{font-size:55.24px;fill:#999;font-family:SourceSansPro-Regular, Source Sans Pro;}.cls-9{letter-spacing:- [...] \ No newline at end of file diff --git a/dashboardv2/public/img/favicon.ico b/dashboardv2/public/img/favicon.ico new file mode 100644 index 0000000..62375dd Binary files /dev/null and b/dashboardv2/public/img/favicon.ico differ diff --git a/dashboardv2/public/index.html.tpl b/dashboardv2/public/index.html.tpl index 99df243..a6a999e 100644 --- a/dashboardv2/public/index.html.tpl +++ b/dashboardv2/public/index.html.tpl @@ -31,10 +31,10 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8;" /> <title>Atlas</title> - <meta name="description" content=""> - <meta name="viewport" content="width=device-width"> - <link rel="shortcut icon" href="favicon.ico?bust=<%- bust %>" type="image/x-icon"> - <link rel="icon" href="favicon.ico?bust=<%- bust %>" type="image/x-icon"> + <meta name="description" content="" /> + <meta name="viewport" content="width=device-width" /> + <link rel="shortcut icon" href="img/favicon.ico?bust=<%- bust %>" type="image/x-icon" /> + <link rel="icon" href="img/favicon.ico?bust=<%- bust %>" type="image/x-icon" /> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" type="text/css" href="css/animate.min.css?bust=<%- bust %>" /> <link rel="stylesheet" href="js/libs/backgrid/css/backgrid.css?bust=<%- bust %>"> diff --git a/dashboardv2/public/js/templates/site/SideNavLayoutView_tmpl.html b/dashboardv2/public/js/templates/site/SideNavLayoutView_tmpl.html index 31ac8e4..9e72c67 100644 --- a/dashboardv2/public/js/templates/site/SideNavLayoutView_tmpl.html +++ b/dashboardv2/public/js/templates/site/SideNavLayoutView_tmpl.html @@ -16,12 +16,12 @@ --> <ul class="sidebar-nav"> <li class="sidebar-brand"> - <a href="{{apiBaseUrl}}/index.html"><i class="fa fa-globe"></i> Apache Atlas</a> + <a href="{{apiBaseUrl}}/index.html"><img src="img/atlas_logo.svg" class="logo" /></a> </li> <ul class="tabs" style="width: 100%;" role="tablist"> <li role="presentation" class="tab col-sm-3"><a href="#tab-search" aria-controls="tab-search" data-name="tab-search" role="tab" data-toggle="tab" class=""><i class="fa fa-search"></i> Search</a></li> <li role="presentation" class="tab col-sm-5"><a href="#tab-classification" aria-controls="tab-classification" data-name="tab-classification" role="tab" data-toggle="tab"><i class="fa fa-tags"></i> Classification</a></li> - <li role="presentation" class="tab col-sm-4"><a href="#tab-glossary" aria-controls="tab-glossary" data-name="tab-glossary" role="tab" data-toggle="tab"><i class="fa fa-folder-open"></i> Glossary</a></li> + <li role="presentation" class="tab col-sm-4"><a href="#tab-glossary" aria-controls="tab-glossary" data-name="tab-glossary" role="tab" data-toggle="tab"><i class="fa fa-folder-open"></i> Glossary</a></li> </ul> </ul> <div class="tab-content"> @@ -34,4 +34,4 @@ <div role="tabpanel" class="tab-pane" id="tab-glossary"> <div id="r_glossaryLayoutView"></div> </div> -</div> +</div> \ No newline at end of file diff --git a/dashboardv3/public/css/scss/login.scss b/dashboardv3/public/css/scss/login.scss index 3724991..d4dba17 100644 --- a/dashboardv3/public/css/scss/login.scss +++ b/dashboardv3/public/css/scss/login.scss @@ -43,7 +43,8 @@ body { } img { - width: 168px; + height: 65px; + padding: 6px; margin-bottom: 28px; } diff --git a/dashboardv3/public/css/scss/theme.scss b/dashboardv3/public/css/scss/theme.scss index 8e99ce2..f619dcd 100644 --- a/dashboardv3/public/css/scss/theme.scss +++ b/dashboardv3/public/css/scss/theme.scss @@ -142,8 +142,8 @@ header.atlas-header { .logo { // width: 172px; - height: 49px; - padding: 10px; + height: 50px; + padding: 6px; margin-left: 15px; } } diff --git a/dashboardv3/public/img/atlas-logo-beta-side.png b/dashboardv3/public/img/atlas-logo-beta-side.png deleted file mode 100644 index 8073848..0000000 Binary files a/dashboardv3/public/img/atlas-logo-beta-side.png and /dev/null differ diff --git a/dashboardv3/public/img/atlas-logo-beta-ui.png b/dashboardv3/public/img/atlas-logo-beta-ui.png index 0fad8fc..fcd54d4 100644 Binary files a/dashboardv3/public/img/atlas-logo-beta-ui.png and b/dashboardv3/public/img/atlas-logo-beta-ui.png differ diff --git a/dashboardv3/public/img/atlas-logo.png b/dashboardv3/public/img/atlas-logo.png index 118d39b..c99345b 100644 Binary files a/dashboardv3/public/img/atlas-logo.png and b/dashboardv3/public/img/atlas-logo.png differ diff --git a/dashboardv3/public/img/atlas_logo.svg b/dashboardv3/public/img/atlas_logo.svg new file mode 100644 index 0000000..3314cb0 --- /dev/null +++ b/dashboardv3/public/img/atlas_logo.svg @@ -0,0 +1,17 @@ +<!-- + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +--> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 976.59 177.38"><defs><style>.cls-1{fill:#cdcccc;}.cls-2,.cls-3{fill:#1fcfb8;}.cls-2{stroke:#1fcfb8;stroke-width:1.18px;}.cls-2,.cls-4,.cls-5{stroke-miterlimit:10;}.cls-4,.cls-5{fill:none;stroke:#cdcccc;}.cls-4{stroke-width:3.55px;}.cls-5{stroke-width:5px;}.cls-6{fill:#009883;}</style></defs><title>Asset 6</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M260.81,55.74l23.37,65.13h9. [...] \ No newline at end of file diff --git a/dashboardv3/public/img/atlas_logo_beta.svg b/dashboardv3/public/img/atlas_logo_beta.svg new file mode 100644 index 0000000..ce9e4b0 --- /dev/null +++ b/dashboardv3/public/img/atlas_logo_beta.svg @@ -0,0 +1,17 @@ +<!-- + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +--> +<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1218.25 177.38"><defs><style>.cls-1{fill:#cdcccc;}.cls-2,.cls-3{fill:#1fcfb8;}.cls-2{stroke:#1fcfb8;stroke-width:1.18px;}.cls-2,.cls-4,.cls-5{stroke-miterlimit:10;}.cls-4,.cls-5{fill:none;stroke:#cdcccc;}.cls-4{stroke-width:3.55px;}.cls-5{stroke-width:5px;}.cls-6{fill:#fff;}.cls-7{fill:#009883;}.cls-8{font-size:55.24px;fill:#999;font-family:SourceSansPro-Regular, Source Sans Pro;}.cls-9{letter-spacing:- [...] \ No newline at end of file diff --git a/dashboardv3/public/img/favicon.ico b/dashboardv3/public/img/favicon.ico new file mode 100644 index 0000000..62375dd Binary files /dev/null and b/dashboardv3/public/img/favicon.ico differ diff --git a/dashboardv3/public/index.html.tpl b/dashboardv3/public/index.html.tpl index 2af1ab3..2edbb65 100644 --- a/dashboardv3/public/index.html.tpl +++ b/dashboardv3/public/index.html.tpl @@ -33,8 +33,8 @@ <title>Atlas</title> <meta name="description" content="" /> <meta name="viewport" content="width=device-width" /> - <link rel="shortcut icon" href="favicon.ico?bust=<%- bust %>" type="image/x-icon" /> - <link rel="icon" href="favicon.ico?bust=<%- bust %>" type="image/x-icon" /> + <link rel="shortcut icon" href="img/favicon.ico?bust=<%- bust %>" type="image/x-icon" /> + <link rel="icon" href="img/favicon.ico?bust=<%- bust %>" type="image/x-icon" /> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" type="text/css" href="css/animate.min.css?bust=<%- bust %>" /> <link rel="stylesheet" href="js/libs/backgrid/css/backgrid.css?bust=<%- bust %>" /> diff --git a/dashboardv3/public/js/templates/site/Header.html b/dashboardv3/public/js/templates/site/Header.html index 78613e8..bb531da 100644 --- a/dashboardv3/public/js/templates/site/Header.html +++ b/dashboardv3/public/js/templates/site/Header.html @@ -19,7 +19,7 @@ <tr> <td> <ul class="nav navbar-nav"> - <a href="#/"><img src="img/atlas-logo-beta-ui.png" class="logo"></a> + <a href="#/"><img src="img/atlas_logo_beta.svg" class="logo"></a> </ul> </td> <td class="global-search-container"> diff --git a/webapp/src/main/webapp/login.jsp b/webapp/src/main/webapp/login.jsp index 141674b..70ec06d 100644 --- a/webapp/src/main/webapp/login.jsp +++ b/webapp/src/main/webapp/login.jsp @@ -52,7 +52,7 @@ <body class="login-body"> <div class="login-form"> <div class="logo-container text-center"> - <img src="img/atlas-logo.png" /> + <img src="img/atlas_logo.svg" /> </div> <h4>Sign In to your account</h4> <form action="" method="post" accept-charset="utf-8">