You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ni...@apache.org on 2019/09/16 09:48:56 UTC
[ranger] branch master updated: RANGER-2534-Official logo for
Apache Ranger
This is an automated email from the ASF dual-hosted git repository.
ni3galave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new c46de42 RANGER-2534-Official logo for Apache Ranger
c46de42 is described below
commit c46de425783ce0ce2c4ce0a7d4dae58807c626ef
Author: Nitin Galave <ni...@apache.org>
AuthorDate: Thu Sep 12 14:42:24 2019 +0530
RANGER-2534-Official logo for Apache Ranger
---
.../conf.dist/security-applicationContext.xml | 4 +-
security-admin/src/main/webapp/favicon.ico | Bin 6774 -> 0 bytes
security-admin/src/main/webapp/images/favicon.ico | Bin 0 -> 15424 bytes
security-admin/src/main/webapp/images/logo.png | Bin 4493 -> 0 bytes
.../src/main/webapp/images/ranger_logo.png | Bin 0 -> 6298 bytes
security-admin/src/main/webapp/index.html | 4 +-
security-admin/src/main/webapp/login.jsp | 2 +-
security-admin/src/main/webapp/styles/xa.css | 204 +++++++++++++++++----
.../common/ServiceManagerLayout_tmpl.html | 2 +-
.../security_zone/ZoneResourceItem_tmpl.html | 2 +-
.../templates/users/UserTableLayout_tmpl.html | 2 +-
11 files changed, 174 insertions(+), 46 deletions(-)
diff --git a/security-admin/src/main/resources/conf.dist/security-applicationContext.xml b/security-admin/src/main/resources/conf.dist/security-applicationContext.xml
index e6b078b..672d4a6 100644
--- a/security-admin/src/main/resources/conf.dist/security-applicationContext.xml
+++ b/security-admin/src/main/resources/conf.dist/security-applicationContext.xml
@@ -35,8 +35,8 @@ http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd">
<security:http pattern="/fonts/**" security="none" />
<security:http pattern="/scripts/prelogin/XAPrelogin.js" security="none" />
<security:http pattern="/libs/bower/jquery/js/jquery-3.4.1.js" security="none" />
- <security:http pattern="/images/logo.png" security="none" />
- <security:http pattern="/favicon.ico" security="none" />
+ <security:http pattern="/images/ranger_logo.png" security="none" />
+ <security:http pattern="/images/favicon.ico" security="none"/>
<security:http pattern="/service/assets/policyList/*" security="none"/>
<security:http pattern="/service/assets/resources/grant" security="none"/>
<security:http pattern="/service/assets/resources/revoke" security="none"/>
diff --git a/security-admin/src/main/webapp/favicon.ico b/security-admin/src/main/webapp/favicon.ico
deleted file mode 100644
index 8a163fb..0000000
Binary files a/security-admin/src/main/webapp/favicon.ico and /dev/null differ
diff --git a/security-admin/src/main/webapp/images/favicon.ico b/security-admin/src/main/webapp/images/favicon.ico
new file mode 100644
index 0000000..60c2774
Binary files /dev/null and b/security-admin/src/main/webapp/images/favicon.ico differ
diff --git a/security-admin/src/main/webapp/images/logo.png b/security-admin/src/main/webapp/images/logo.png
deleted file mode 100644
index 47718f9..0000000
Binary files a/security-admin/src/main/webapp/images/logo.png and /dev/null differ
diff --git a/security-admin/src/main/webapp/images/ranger_logo.png b/security-admin/src/main/webapp/images/ranger_logo.png
new file mode 100644
index 0000000..9cae434
Binary files /dev/null and b/security-admin/src/main/webapp/images/ranger_logo.png differ
diff --git a/security-admin/src/main/webapp/index.html b/security-admin/src/main/webapp/index.html
index ebcea3b..392f0ab 100644
--- a/security-admin/src/main/webapp/index.html
+++ b/security-admin/src/main/webapp/index.html
@@ -29,7 +29,7 @@
<meta name="viewport" content="width=device-width">
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
- <link rel="shortcut icon" href="images/favicon.ico">
+ <link rel="shortcut icon" href="images/favicon.ico">
<link rel="stylesheet" href="styles/app-font.css">
<link href="styles/bootstrap.css" media="all" rel="stylesheet" type="text/css" id="bootstrap-css">
@@ -54,7 +54,7 @@
<header class="navbar navbar-fixed-top" id="top-navbar">
<div class="navbar-inner">
<div class="container">
- <a class="logo page-logo" href="#"><img alt="Af_logo" src="images/logo.png"></a>
+ <a class="logo page-logo" href="#"><img alt="Af_logo" src="images/ranger_logo.png"></a>
<a class="btn nav-button collapsed" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-reorder"></span> </a>
<div id="r_topNav">
diff --git a/security-admin/src/main/webapp/login.jsp b/security-admin/src/main/webapp/login.jsp
index 4202a9e..c5e80d1 100644
--- a/security-admin/src/main/webapp/login.jsp
+++ b/security-admin/src/main/webapp/login.jsp
@@ -61,7 +61,7 @@
================================================== -->
<section id="signin-container" style="margin-top: 4.5px;">
<div class="l-logo">
- <img src="images/logo.png" alt="Ranger logo">
+ <img src="images/ranger_logo.png" alt="Ranger logo">
</div>
<form action="" method="post" accept-charset="utf-8">
<fieldset>
diff --git a/security-admin/src/main/webapp/styles/xa.css b/security-admin/src/main/webapp/styles/xa.css
index 3968636..f75facb 100644
--- a/security-admin/src/main/webapp/styles/xa.css
+++ b/security-admin/src/main/webapp/styles/xa.css
@@ -15,9 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
body {
background:#eee;
padding: 52px 0 0 30px;
+ font-family:'Roboto', 'Helvetica Neue', 'Helvetica', 'Arial', 'sans-serif';
}
.fluid-layout .container,
@@ -32,19 +34,11 @@ body {
margin-right: 12px;
}
#top-navbar .navbar-inner {
- background: #3ea211;
- border-bottom: 1px solid #1b4607;
- -webkit-box-shadow: rgba(255, 255, 255, 0.25) 0px 1px 0px inset;
- -moz-box-shadow: rgba(255, 255, 255, 0.25) 0px 1px 0px inset;
- box-shadow: rgba(255, 255, 255, 0.25) 0px 1px 0px inset;
- background-color: #58b31f;
- background-image: -moz-linear-gradient(top, #69be28, #3ea211);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#69be28), to(#3ea211));
- background-image: -webkit-linear-gradient(top, #69be28, #3ea211);
- background-image: -o-linear-gradient(top, #69be28, #3ea211);
- background-image: linear-gradient(to bottom, #69be28, #3ea211);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff69be28', endColorstr='#ff3ea211', GradientType=0);
+ background-color: none;
+ background-image:linear-gradient(167deg, #333e47, #023259);
+ box-shadow: none;
+ -webkit-box-shadow:none;
+ -moz-box-shadow:none;
}
#top-navbar .nav .dropdown-toggle .icon-caret-down {
@@ -412,11 +406,12 @@ body {
position: absolute;
left: 0;
top: 0;
+ width: 102px
}
-#top-navbar .page-logo img {
+/*#top-navbar .page-logo img {
max-height: 33px;
-}
+}*/
.navbar .page-nav {
margin: 0 0 0 130px;
@@ -680,12 +675,12 @@ table.backgrid thead tr:hover {
padding: 5px 0 0 3px;
}
.policyVer i{
- color : #3C9C11 !important;
+ color : #0B7FAD !important;
opacity: 0.4;
-webkit-user-select: none;
}
.policyVer i.active{
- color : #3C9C11 !important;
+ color : #0B7FAD !important;
cursor : pointer;
opacity: 1;
}
@@ -761,7 +756,7 @@ div#center span {
font-family: Helvetica;
font-size: 20px;
font-weight: bolder;
- color: #3ea211;
+ color: #0B7FAD;
/* color: #7c9710; */
}
@@ -962,13 +957,13 @@ ul.tagit li.tagit-choice .tagit-close {
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
border: 0 !important;
color: #fff !important;
- background: #3ea211 !important;
+ background: #0B7FAD !important;
}
.ui-state-active {
border: 0 !important;
color: #fff !important;
- background: #3ea211 !important;
+ background: #0B7FAD !important;
margin: 0 !important;
}
@@ -1178,7 +1173,7 @@ ul.tabs > li > a {
.breadcrumb-flat li a {
color: #FFF;
display: block;
- background: #64a424;
+ background: #0B7FAD;
text-decoration: none;
position: relative;
height: 22px;
@@ -1188,14 +1183,14 @@ ul.tabs > li > a {
margin-right: 23px;
}
.breadcrumb-flat li:nth-child(even) a {
- background-color: #46662a;
+ background-color: #0a5c7d;
}
.breadcrumb-flat li:nth-child(even) a:before {
- border-color: #46662a;
+ border-color: #0a5c7d;
border-left-color: transparent;
}
.breadcrumb-flat li:nth-child(even) a:after {
- border-left-color: #46662a;
+ border-left-color: #0a5c7d;
}
.breadcrumb-flat li:first-child a {
padding-left: 15px;
@@ -1217,7 +1212,7 @@ ul.tabs > li > a {
content: "";
position: absolute;
top: 0;
- border: 0 solid #64a424;
+ border: 0 solid #0B7FAD;
border-width: 11px 10px;
width: 0;
height: 0;
@@ -1229,27 +1224,27 @@ ul.tabs > li > a {
.breadcrumb-flat li a:after {
left: 100%;
border-color: transparent;
- border-left-color: #64a424;
+ border-left-color: #0B7FAD;
}
.breadcrumb-flat li a:hover {
- background-color: #46662a;
+ background-color: #0f6d92;
}
.breadcrumb-flat li a:hover:before {
- border-color: #46662a;
+ border-color: #0f6d92;
border-left-color: transparent;
}
.breadcrumb-flat li a:hover:after {
- border-left-color: #46662a;
+ border-left-color: #0f6d92;
}
.breadcrumb-flat li a:active {
- background-color: #46662a;
+ background-color: #0f6d92;
}
.breadcrumb-flat li a:active:before {
- border-color: #46662a;
+ border-color: #0f6d92;
border-left-color: transparent;
}
.breadcrumb-flat li a:active:after {
- border-left-color: #46662a;
+ border-left-color: #0f6d92;
}
.reportSearchHeader {
margin-bottom: 18px;
@@ -1570,7 +1565,7 @@ table.table.backgrid thead th.resourceType {
}
/* overridding select2 option hover css */
.select2-results .select2-highlighted {
- background: #3ea211;
+ background: #0B7FAD;
}
.stretchTextInput{
width:40%;
@@ -1782,7 +1777,7 @@ margin-bottom: 5px;
font-size: 11.05px;
}
.label-ranger {
- background-color: #3C9C11;
+ background-color: #0B7FAD;
}
.sameLevelDropdown{
margin-right: 31px;
@@ -2473,7 +2468,7 @@ textarea:read-only{
font-size: 20px;
text-align: center;
background: #F5F5F5;
- color: #64A424;
+ color: #0B7FAD;
padding: 20px 40px;
}
.security-search {;
@@ -2494,7 +2489,7 @@ textarea:read-only{
}
.zone-listing li:hover,
.zone-listing li.selected {
- color: #588324;
+ color: #0B7FAD;
font-weight: bold;
}
.table-security {
@@ -2531,7 +2526,7 @@ textarea:read-only{
}
.security-details h2 {
font-weight: normal;
- color: #64a224;
+ color: #0B7FAD;
margin-top: 0;
}
.table-operations-new > thead > tr > th {
@@ -2810,4 +2805,137 @@ div#zoneServiceAccordion table thead {
width: 60px;
text-align: center;
border-right: 1px solid #ddd;
-}
\ No newline at end of file
+}
+
+/*Overriden styles - Use later for bootstrap 3*/
+
+a{
+ color:#0B7FAD;
+}
+
+a:focus,a:hover,a.active,a:active{
+ color: #2996ba;
+}
+
+.loading-img{
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+}
+
+
+.btn,
+.btn-default{
+ box-shadow: none;
+ -webkit-box-shadow:none;
+ -moz-box-shadow:none;
+ border:1px solid #d9d9d9;
+ color: #424242;
+ background-image: none;
+ background-color: white;
+}
+
+.btn:hover,
+.btn-default:focus,
+.btn-default:active,
+.btn-default.active,
+.btn-default.disabled,
+.btn-default:hover{
+ color: #0B7FAD;
+ border-color: #0B7FAD;
+ background-color: #fff;
+ outline: none;
+}
+
+
+.btn-primary{
+ background-color: #0B7FAD;
+ background-image: none;
+ color: #fff;
+ border-color: #0B7FAD;
+}
+
+.btn-primary:focus,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary.disabled,
+.btn-primary[disabled],
+.btn-primary:hover{
+ background-color:#2996ba;
+ background-image: none;
+ color: #fff;
+}
+
+.btn-danger{
+ background-color: #DE4D5F;
+ color: #fff;
+ border-color:#DE4D5F;
+}
+
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.btn-danger.disabled,
+.btn-danger[disabled],
+.btn-danger:hover{
+ background-color:#bd362f;
+ background-image: none;
+ color: #fff;
+ border-color:#DE4D5F;
+
+}
+
+.policy-manager span.policy-title{
+ font-size: 18px;
+ line-height: 20px;
+}
+
+.formHeader,.reportSearchHeader {
+ border-color: #0B7FAD;
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+ background-color: #0B7FAD;
+ background-image: none;
+}
+
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:focus,
+.nav-tabs > .active > a:active,
+.nav-tabs > .active > a:hover {
+ border-bottom-color: #0B7FAD;
+}
+
+.pagination ul > li.active > a,
+.pagination ul > li.active > a:hover,
+.pagination ul > li.active > a:focus,
+.pagination ul > li.active > span {
+ background: #0B7FAD;
+ border-color: #0B7FAD;
+ color: #fff;
+ font-weight: 700;
+}
+
+.pagination ul > li > a:hover {
+ background: none;
+ border-color: #0B7FAD;
+ color: #444;
+}
+
+.toggle-xa .toggle-slide .toggle-on {
+ background: #0B7FAD;
+ color: #fff;
+ background-image: none;
+ background-color:#0B7FAD;
+}
+
+.btn-group.open .btn-primary.dropdown-toggle {
+ background-color:#2996ba;
+}
+
+
+/*End of Overriden styles*/
\ No newline at end of file
diff --git a/security-admin/src/main/webapp/templates/common/ServiceManagerLayout_tmpl.html b/security-admin/src/main/webapp/templates/common/ServiceManagerLayout_tmpl.html
index 08082bd..82b667c 100644
--- a/security-admin/src/main/webapp/templates/common/ServiceManagerLayout_tmpl.html
+++ b/security-admin/src/main/webapp/templates/common/ServiceManagerLayout_tmpl.html
@@ -29,7 +29,7 @@
<button type="button" title="Export" class=" btn btn-small btn-right btn-import-export" data-id="exportBtn"> <i class="icon-external-link-sign"></i>
Export
</button>
- <button type="button" title="Import" class="btn btn-success btn btn-small btn-import-export" data-id="importBtn" > <i class="icon-rotate-180 icon-external-link-sign"></i>
+ <button type="button" title="Import" class="btn btn btn-small btn-import-export" data-id="importBtn" > <i class="icon-rotate-180 icon-external-link-sign"></i>
Import
</button>
{{/if}}
diff --git a/security-admin/src/main/webapp/templates/security_zone/ZoneResourceItem_tmpl.html b/security-admin/src/main/webapp/templates/security_zone/ZoneResourceItem_tmpl.html
index 31dd595..a4dbf6f 100644
--- a/security-admin/src/main/webapp/templates/security_zone/ZoneResourceItem_tmpl.html
+++ b/security-admin/src/main/webapp/templates/security_zone/ZoneResourceItem_tmpl.html
@@ -20,7 +20,7 @@ language governing permissions and limitations under the License. --}}
<a title="edit" class="btn btn-primary btn-mini m-r-xs" data-js="zoneResource" data-action="editResource">
<i class="icon-edit"></i>
</a>
- <a class="btn btn-danger btn-mini m-l-sm" data-action="delete">
+ <a class="btn btn-danger btn-mini" data-action="delete">
<i class="icon-remove"></i>
</a>
</div>
diff --git a/security-admin/src/main/webapp/templates/users/UserTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/users/UserTableLayout_tmpl.html
index 6562bac..5e6f567 100644
--- a/security-admin/src/main/webapp/templates/users/UserTableLayout_tmpl.html
+++ b/security-admin/src/main/webapp/templates/users/UserTableLayout_tmpl.html
@@ -34,7 +34,7 @@
</div>
<div class="clearfix" data-id="addNewBtnDiv">
{{#isSystemAdmin .}}
- <a href="javascript:void(0);" data-id="deleteUserGroup" title="Permanently delete selected users/groups/roles" class="btn btn-primary btn-right btn-danger"><i class="icon-trash icon-large" /></a>
+ <a href="javascript:void(0);" data-id="deleteUserGroup" title="Permanently delete selected users/groups/roles" class="btn btn-right btn-danger"><i class="icon-trash icon-large" /></a>
{{/isSystemAdmin}}
{{#isSystemAdmin .}}
<div class="btn-group btn-right" data-id="hideShowVisibility">