Author: srimanth
Date: Mon Jan 28 23:58:37 2013
New Revision: 1439706
URL: http://svn.apache.org/viewvc?rev=1439706&view=rev
Log:
AMBARI-1274. Shrink top nav height. (srimanth)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/styles/application.less
incubator/ambari/trunk/ambari-web/app/templates/application.hbs
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1439706&r1=1439705&r2=1439706&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Jan 28 23:58:37 2013
@@ -34,6 +34,8 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMBARI-1274. Shrink top nav height. (srimanth)
+
AMBARI-1272. Controller javascripts need comments. (srimanth)
AMBARI-1271. On Confirm Hosts page, add a link to show the Host Checks popup
Modified: incubator/ambari/trunk/ambari-web/app/styles/application.less
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/styles/application.less?rev=1439706&r1=1439705&r2=1439706&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/styles/application.less (original)
+++ incubator/ambari/trunk/ambari-web/app/styles/application.less Mon Jan 28
23:58:37 2013
@@ -58,38 +58,34 @@ footer {
}
.navbar {
+ .logo {
+ float: left;
+ padding-top: 2px;
+ img{
+ height: 36px;
+ }
+ }
+
.brand {
color: #666666;
- display: block;
font-size: 16px;
font-weight: normal;
- line-height: 1;
+ line-height: 33px;
margin-left: 0;
- margin-top: 3px;
- padding: 14px 5px 14px 10px;
+ padding: 4px 5px 0 10px;
}
.brand.cluster-name {
padding-left: 0px;
}
}
-/*
- .navbar-inner {
- background: linear-gradient(#FAFAFA, #EAEAEA) repeat scroll 0 0
transparent;
- background: -moz-linear-gradient(#FAFAFA, #EAEAEA) repeat scroll 0 0
transparent;
- background: -webkit-linear-gradient(#FAFAFA, #EAEAEA) repeat scroll 0 0
transparent;
- border-radius: 0;
- border: 1px solid #bbb;
- border-width: 0 0 1px 0;
- }
-*/
+
.navbar .nav {
float: none;
overflow: hidden;
}
.navbar .nav .active > a, .navbar .nav .active > a:hover {
- /*background-color: #999999;*/
color: #FFFFFF;
text-decoration: none;
}
@@ -101,8 +97,8 @@ footer {
font-size: 13px;
font-weight: bold;
line-height: 19px;
- margin: 6px 10px 6px 0;
- padding: 8px 14px;
+ margin: 3px 10px 4px 0;
+ padding: 7px 14px;
text-decoration: none;
text-shadow: none;
}
@@ -113,12 +109,6 @@ footer {
text-decoration: none;
}
- .navbar #logo {
- float: left;
- padding-top: 7px;
- height: 36px;
- }
-
.navbar .nav > li.right {
float: right;
}
Modified: incubator/ambari/trunk/ambari-web/app/templates/application.hbs
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/application.hbs?rev=1439706&r1=1439705&r2=1439706&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/application.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/application.hbs Mon Jan 28
23:58:37 2013
@@ -21,11 +21,11 @@
<div class="navbar navbar-static-top">
<div class="navbar-inner">
<div class="container">
- <a {{translateAttr href="topnav.logo.href"}} target="_blank"><img
id="logo" src="/img/logo-small.png" alt="Apache Ambari" title="Apache
Ambari"></a>
+ <a {{translateAttr href="topnav.logo.href"}} class="logo"
target="_blank"><img src="/img/logo-small.png" alt="Apache Ambari"
title="Apache Ambari"></a>
<a class="brand" {{translateAttr href="topnav.logo.href"}}
target="_blank" alt="Apache Ambari" title="Apache Ambari">{{t app.name}}</a>
- {{#if App.router.loggedIn}}
+ {{!#if App.router.loggedIn} }
<a class="brand cluster-name" href="#">
-<!-- - {{clusterName}} -->
+ - {{clusterName} }
</a>
{{/if}}
<ul class="nav">
