You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rn...@apache.org on 2016/05/03 22:52:46 UTC
ambari git commit: AMBARI-16198. Ambari Look & Feel for LogSearch.
(Dharmesh Makwana via rnettleton)
Repository: ambari
Updated Branches:
refs/heads/trunk 360fda044 -> 5b80f4902
AMBARI-16198. Ambari Look & Feel for LogSearch. (Dharmesh Makwana via rnettleton)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5b80f490
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5b80f490
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5b80f490
Branch: refs/heads/trunk
Commit: 5b80f490227a3908608af314aded3cb8b2adc5c7
Parents: 360fda0
Author: Bob Nettleton <rn...@hortonworks.com>
Authored: Tue May 3 16:52:12 2016 -0400
Committer: Bob Nettleton <rn...@hortonworks.com>
Committed: Tue May 3 16:52:12 2016 -0400
----------------------------------------------------------------------
.../src/main/webapp/images/logo-white.png | Bin 0 -> 4538 bytes
.../src/main/webapp/index.html | 11 +-
.../src/main/webapp/login.jsp | 2 +-
.../troubleshoot/TroubleShootLayoutView.js | 6 +-
.../src/main/webapp/styles/style.css | 23 +-
.../src/main/webapp/styles/style_v2.css | 425 ++++++++++++++++++-
.../templates/common/DatePickerLayout_tmpl.html | 2 +-
.../webapp/templates/common/Header_tmpl.html | 4 +-
.../TroubleShootLayoutView_tmpl.html | 2 +-
9 files changed, 437 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b80f490/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/images/logo-white.png
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/images/logo-white.png b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/images/logo-white.png
new file mode 100644
index 0000000..a562ba7
Binary files /dev/null and b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/images/logo-white.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b80f490/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/index.html b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/index.html
index 88b6c22..e374895 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/index.html
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/index.html
@@ -76,9 +76,12 @@
<header class="navbar">
<div class="container-fluid expanded-panel">
- <div class="row">
- <div id="logo" class="col-xs-12 col-sm-2">
- <a href="javascript:void(0);">Log Search</a>
+ <div class="row top-panel-right">
+ <div id="logo" class="col-xs-12 col-sm-3">
+ <div class="row">
+ <div class="col-sm-2"><img title="Apache Ambari" alt="Apache Ambari" src="images/logo-white.png" height="32px"></div>
+ <div class="col-sm-10"><a href="javascript:void(0);">Log Search</a></div>
+ </div>
</div>
<div id="r_header"></div>
</div>
@@ -101,7 +104,7 @@
<!--Start Content-->
<div id="content" class="col-xs-12 col-sm-12">
<div id="r_content" >
- <div><img style="position: absolute;top: 7%;left: 44%;" alt="Loading...." src="images/loading_game.gif"></div>
+ <i class="icon-spinner"></i>
</div>
<!-- <div class="preloader">
<img src="img/devoops_getdata.gif" class="devoops-getdata" alt="preloader"/>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b80f490/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/login.jsp
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/login.jsp b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/login.jsp
index 756726c..27fd8ec 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/login.jsp
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/login.jsp
@@ -88,7 +88,7 @@
<input type="password" class="form-control custTxtInput" id="password" name="password" required="true"/>
</div>
<div class="text-left">
- <input name="submit" type="submit" class="btn btn-primary custLogin" value="Sign In"/>
+ <input name="submit" type="submit" class="btn btn-success custLogin" value="Sign In"/>
</div>
<div> </div>
</form>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b80f490/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js
index 892bc57..1409df0 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js
@@ -210,7 +210,7 @@ define(['backbone',
}
if(optionalComponents.length){
for(var i=0; i<optionalComponents.length; i++){
- this.ui.dependencyCont.append('<button data-service="'+optionalComponents[i].value+'" class="btn-component depLinks">'+optionalComponents[i].label+'</button>');
+ this.ui.dependencyCont.append('<button data-service="'+optionalComponents[i].value+'" class="btn depLinks">'+optionalComponents[i].label+'</button>');
}
if(this.$(".dependencies").is(":hidden")){
this.$(".dependencies").slideDown();
@@ -229,11 +229,11 @@ define(['backbone',
renderServices : function(data){
var that = this;
//that.ui.serviceContainer.append('<label class="btn btn-primary"> <input data-name="All" type="checkbox" name="services" id="option1">All</label>');
- that.ui.serviceContainer.append('<button class="btn-component btn_wrap" href="javascript:void(0);">All</button>');
+ that.ui.serviceContainer.append('<button class="btn btn-trbl" href="javascript:void(0);">All</button>');
_.each(data.service,function(obj,key){
/*var html = '<label class="btn btn-primary"> <input data-name="'+key+'" type="checkbox" name="services" '+
' id="option1" />'+obj.label+'</label>';*/
- var html = '<button class="btn-component btn_wrap" data-name="'+key+'" href="javascript:void(0);">'+obj.label+'</button>';
+ var html = '<button class="btn btn-trbl" data-name="'+key+'" href="javascript:void(0);">'+obj.label+'</button>';
that.ui.serviceContainer.append(html);
});
var compos = _.pluck(data.service,"components");
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b80f490/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css
index de5e45a..3b01223 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css
@@ -95,12 +95,6 @@ hr {
position: relative;
}
-.box {
- -moz-box-shadow: 0px 0px 5px #CCC;
- -webkit-box-shadow: 0px 0px 5px #CCC;
- box-shadow: 0px 0px 5px #CCC;
-}
-
.checkbox input[type=checkbox]:indeterminate + i:before,
.checkbox-inline input[type=checkbox]:indeterminate + i:before {
content:"\f146";
@@ -604,6 +598,10 @@ div.columnmanager-visibilitycontrol {
font-size: 19px;
}
+.selectDateRange .btn {
+ margin-top: 2px;
+}
+
.widthOfInput {
width: 90%;
}
@@ -661,8 +659,6 @@ div.columnmanager-visibilitycontrol {
padding-top: 3px;
}
.selectDateRange div button.goBtn {
- margin: 0px;
- padding:5px 13px 2px 13px;
}
/* Visual Search Extended */
@@ -841,7 +837,7 @@ svg.nvd3-svg{
.dateRangeTitle {
padding: 4px 6px 4px 6px;
- margin-top: 8px;
+ margin-top: 7px;
/*margin-left: 20px;*/
font-size: 9px;
float: left;
@@ -890,9 +886,7 @@ body {
padding: 5px 10px;
overflow: hidden;
}
-.btn {
- font-size: 10px;
-}
+
.form-control {
height: 23px;
}
@@ -1939,6 +1933,8 @@ button.applyBtn{
}
.logBox{
background-color: #F5F5F5;
+ padding-left: 25px;
+ padding-right: 25px;
}
.custTxtInput{
height:34px;
@@ -1968,8 +1964,9 @@ h2.page-header{
-o-transform : translate(-30%,-43%);
}
.custLogin{
- font-size: 12px;
+ font-size: 14px;
}
+
.componentWrap{
width:100%;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b80f490/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style_v2.css
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style_v2.css b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style_v2.css
index a4264a1..3d36344 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style_v2.css
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style_v2.css
@@ -37,10 +37,9 @@ h1, .h1, h2, .h2, h3, .h3 {
#logo {
position:relative;
- background:#505559;
}
#logo a {
- color: #D8D8D8;
+ color: white;
font-family: "Helvetica Neue",\u200bHelvetica,\u200bArial,\u200bsans-serif;
display: block;
font-size: 20px;
@@ -55,6 +54,11 @@ line-height: 50px;
background-position: right 25px;
text-decoration: none;
}
+#logo img {
+ margin-top: 9px;
+ position: relative;
+ right: -15px;
+}
.navbar {
margin: 0;
border: 0;
@@ -196,7 +200,6 @@ a.show-sidebar:hover {
#top-panel {
line-height: 50px;
height: 50px;
- background:#505559;
}
#main {
margin-top: 50px;
@@ -269,6 +272,9 @@ textarea.searchArea{
}
.top-panel-right {
padding-left: 0;
+ background-image: linear-gradient(to bottom, #555555, #333333);
+ box-shadow: 0 0 0 rgba(0, 0, 0, 0.1) inset, 0 1px 10px rgba(0, 0, 0, 0.1);
+ max-height: 50px;
}
.panel-menu > li > a {
padding: 0 5px 0 10px;
@@ -283,7 +289,7 @@ textarea.searchArea{
margin-top: 8px;
padding: 5px;
font-size: 20px;
- color: #9C9A78;
+ color: white;
line-height: 1em;
vertical-align: top;
-webkit-transition: 0.05s;
@@ -337,7 +343,7 @@ textarea.searchArea{
}
.panel-menu .dropdown-menu > li > a {
padding:5px 10px !important;
- color:#9C9A78;
+ color: white;
}
.panel-menu .dropdown-menu > li > a > i {
border: 0;
@@ -373,12 +379,7 @@ textarea.searchArea{
overflow: hidden;
height: 24px;
border-bottom: 1px solid #ccc;
- background-color: #eaeaea;
- background-image: -webkit-linear-gradient(top, #eaeaea, #e0e0e0);
- background-image: -moz-linear-gradient(top, #eaeaea, #e0e0e0);
- background-image: -ms-linear-gradient(top, #eaeaea, #e0e0e0);
- background-image: -o-linear-gradient(top, #eaeaea, #e0e0e0);
- background-image: linear-gradient(to bottom, #eaeaea, #e0e0e0);
+ background: #f5f5f5 none repeat scroll 0 0;
}
.box-name, .modal-header-name {
padding-left: 15px;
@@ -767,7 +768,7 @@ ul.DTTT_dropdown.dropdown-menu > li:hover > a {
.well pre code {
white-space: normal;
}
-.btn {
+/*.btn {
border: 1px solid transparent;
border-bottom: 3px solid transparent;
text-decoration: none;
@@ -788,6 +789,7 @@ ul.DTTT_dropdown.dropdown-menu > li:hover > a {
-webkit-user-select: none;
outline: none !important;
}
+*/
.btn-label-left span {
position: relative;
left: -10px;
@@ -831,12 +833,14 @@ ul.DTTT_dropdown.dropdown-menu > li:hover > a {
border-radius: 50%;
border: 2px solid rgba(0, 0, 0, 0.25);
}
+/*
.btn.active {
background-image: none;
outline: 0;
-webkit-box-shadow: none;
box-shadow: none;
}
+*/
.progress {
overflow: visible;
}
@@ -875,6 +879,7 @@ ul.DTTT_dropdown.dropdown-menu > li:hover > a {
.ui-widget-header {
background:none;
}
+/*
.progress-bar .ui-widget-header, .bg-default, .btn-default, .btn-default.disabled, .btn-default[disabled], fieldset[disabled] .btn-default, .btn-default.disabled:hover, .btn-default[disabled]:hover, fieldset[disabled] .btn-default:hover, .btn-default.disabled:focus, .btn-default[disabled]:focus, fieldset[disabled] .btn-default:focus, .btn-default.disabled:active, .btn-default[disabled]:active, fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active, .progress-bar {
background-color: #D8D8D8;
color: #505559;
@@ -953,6 +958,399 @@ ul.DTTT_dropdown.dropdown-menu > li:hover > a {
background-color: #8F8D6C;
border-color: #8D8B61;
}
+*/
+.btn-trbl {
+ margin: 10px;
+ width: 103px;
+ color: #333333;
+ -moz-border-bottom-colors: none;
+ -moz-border-left-colors: none;
+ -moz-border-right-colors: none;
+ -moz-border-top-colors: none;
+ background-color: #f5f5f5;
+ background-image: -moz-linear-gradient(center top , #ffffff, #e6e6e6);
+ background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+ background-repeat: repeat-x;
+ border-color: #e6e6e6 #e6e6e6 #a2a2a2;
+ border-image: none;
+ border-radius: 4px;
+ border-style: solid;
+ border-width: 1px;
+ box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
+ color: #333333;
+ cursor: pointer;
+ display: inline-block;
+ font-size: 14px;
+ line-height: 20px;
+ margin-bottom: 0;
+ padding: 4px 14px;
+ text-align: center;
+ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+ vertical-align: middle;
+}
+/*
+.btn-success {
+ background-color: #5bb75b;
+ background-image: -moz-linear-gradient(center top , #62c462, #51a351);
+ background-repeat: repeat-x;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ color: white;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.btn-success:hover, .btn-success:focus, .btn-success:active {
+ background-color: #51a351;
+}
+
+.btn:hover,
+.btn:active,
+.btn.active,
+.btn.disabled,
+.btn[disabled] {
+ color: #333333;
+ background-color: #e6e6e6;
+ *background-color: #d9d9d9;
+}
+
+.btn {
+ font-family: "Helvetica Neue",\u200bHelvetica,\u200bArial,\u200bsans-serif;
+ border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
+}
+.btn {
+ -moz-border-bottom-colors: none;
+ -moz-border-left-colors: none;
+ -moz-border-right-colors: none;
+ -moz-border-top-colors: none;
+ background-color: #f5f5f5;
+ background-image: -moz-linear-gradient(center top , #62c462, #51a351)
+ background-repeat: repeat-x;
+ border-color: #e6e6e6 #e6e6e6 #a2a2a2;
+ border-image: none;
+ border-radius: 4px;
+ border-style: solid;
+ border-width: 1px;
+ box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
+ color: white;
+ cursor: pointer;
+ display: inline-block;
+ font-size: 14px;
+ line-height: 20px;
+ margin-bottom: 0;
+ padding: 4px 14px;
+ text-align: center;
+ vertical-align: middle;
+}
+*/
+.btn:hover,
+.btn:active,
+.btn.active,
+.btn.disabled,
+.btn[disabled] {
+ color: #333333;
+ background-color: #e6e6e6;
+ *background-color: #d9d9d9;
+}
+
+.btn:active,
+.btn.active {
+ background-color: #cccccc \9;
+}
+
+.btn:first-child {
+ *margin-left: 0;
+}
+
+.btn:hover {
+ color: #333333;
+ text-decoration: none;
+ background-color: #e6e6e6;
+ *background-color: #d9d9d9;
+ /* Buttons in IE7 don't get borders, so darken on hover */
+
+ background-position: 0 -15px;
+ -webkit-transition: background-position 0.1s linear;
+ -moz-transition: background-position 0.1s linear;
+ -o-transition: background-position 0.1s linear;
+ transition: background-position 0.1s linear;
+}
+
+.btn:focus {
+ outline: thin dotted #333;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px;
+}
+
+.btn.active,
+.btn:active {
+ background-color: #e6e6e6;
+ background-color: #d9d9d9 \9;
+ background-image: none;
+ outline: 0;
+ -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn.disabled,
+.btn[disabled] {
+ cursor: default;
+ background-color: #e6e6e6;
+ background-image: none;
+ opacity: 0.65;
+ filter: alpha(opacity=65);
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+}
+
+
+
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+ color: rgba(255, 255, 255, 0.75);
+}
+
+.btn {
+ border-color: #c5c5c5;
+ border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
+ font-size: 13px;
+}
+
+.btn-primary {
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ background-color: #006dcc;
+ *background-color: #0044cc;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+ background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+ background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+ background-image: linear-gradient(to bottom, #0088cc, #0044cc);
+ background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+ background-repeat: repeat-x;
+ border-color: #0044cc #0044cc #002a80;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-primary:hover,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary.disabled,
+.btn-primary[disabled],
+.btn-primary.disabled:hover,
+.btn-primary[disabled]:hover
+ {
+ color: #ffffff;
+ background-color: #0044cc;
+ *background-color: #003bb3;
+}
+
+.btn-primary:active,
+.btn-primary.active {
+ background-color: #003399 \9;
+}
+
+.btn-warning {
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ background-color: #faa732;
+ *background-color: #f89406;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+ background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+ background-image: -o-linear-gradient(top, #fbb450, #f89406);
+ background-image: linear-gradient(to bottom, #fbb450, #f89406);
+ background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+ background-repeat: repeat-x;
+ border-color: #f89406 #f89406 #ad6704;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-warning:hover,
+.btn-warning:active,
+.btn-warning.active,
+.btn-warning.disabled,
+.btn-warning[disabled] {
+ color: #ffffff;
+ background-color: #f89406;
+ *background-color: #df8505;
+}
+
+.btn-warning:active,
+.btn-warning.active {
+ background-color: #c67605 \9;
+}
+
+.btn-danger {
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ background-color: #da4f49;
+ *background-color: #bd362f;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
+ background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
+ background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
+ background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
+ background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
+ background-repeat: repeat-x;
+ border-color: #bd362f #bd362f #802420;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-danger:hover,
+.btn-danger:active,
+.btn-danger.active,
+.btn-danger.disabled,
+.btn-danger[disabled] {
+ color: #ffffff;
+ background-color: #bd362f;
+ *background-color: #a9302a;
+}
+
+.btn-danger:active,
+.btn-danger.active {
+ background-color: #942a25 \9;
+}
+
+.btn-success {
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ background-color: #5bb75b;
+ *background-color: #51a351;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
+ background-image: -webkit-linear-gradient(top, #62c462, #51a351);
+ background-image: -o-linear-gradient(top, #62c462, #51a351);
+ background-image: linear-gradient(to bottom, #62c462, #51a351);
+ background-image: -moz-linear-gradient(top, #62c462, #51a351);
+ background-repeat: repeat-x;
+ border-color: #51a351 #51a351 #387038;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-success:hover,
+.btn-success:active,
+.btn-success.active,
+.btn-success.disabled,
+.btn-success[disabled] {
+ color: #ffffff;
+ background-color: #51a351;
+ *background-color: #499249;
+}
+
+.btn-success:active,
+.btn-success.active {
+ background-color: #408140 \9;
+}
+
+.btn-info {
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ background-color: #49afcd;
+ *background-color: #2f96b4;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
+ background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
+ background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
+ background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
+ background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
+ background-repeat: repeat-x;
+ border-color: #2f96b4 #2f96b4 #1f6377;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-info:hover,
+.btn-info:active,
+.btn-info.active,
+.btn-info.disabled,
+.btn-info[disabled] {
+ color: #ffffff;
+ background-color: #2f96b4;
+ *background-color: #2a85a0;
+}
+
+.btn-info:active,
+.btn-info.active {
+ background-color: #24748c \9;
+}
+
+.btn-inverse {
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ background-color: #363636;
+ *background-color: #222222;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
+ background-image: -webkit-linear-gradient(top, #444444, #222222);
+ background-image: -o-linear-gradient(top, #444444, #222222);
+ background-image: linear-gradient(to bottom, #444444, #222222);
+ background-image: -moz-linear-gradient(top, #444444, #222222);
+ background-repeat: repeat-x;
+ border-color: #222222 #222222 #000000;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-inverse:hover,
+.btn-inverse:active,
+.btn-inverse.active,
+.btn-inverse.disabled,
+.btn-inverse[disabled] {
+ color: #ffffff;
+ background-color: #222222;
+ *background-color: #151515;
+}
+
+.btn-inverse:active,
+.btn-inverse.active {
+ background-color: #080808 \9;
+}
+
+button.btn,
+input[type="submit"].btn {
+ *padding-top: 3px;
+ *padding-bottom: 3px;
+}
+
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
+ padding: 0;
+ border: 0;
+}
+
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
+ *padding-top: 7px;
+ *padding-bottom: 7px;
+}
+
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
+ *padding-top: 3px;
+ *padding-bottom: 3px;
+}
+
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+ *padding-top: 1px;
+ *padding-bottom: 1px;
+}
+
+button.btn.btn-xs{
+ padding: 1px 5px;
+ font-size: 12px;
+ line-height: 1.5;
+ border-radius: 3px;
+}
.has-warning .form-control:focus {
border-color: #8D8B61;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #8D8B61;
@@ -1360,7 +1758,8 @@ ul.DTTT_dropdown.dropdown-menu > li:hover > a {
margin-bottom: 5px;
}
.input-group .form-control {
- margin:0;
+ margin-top: 3px;
+ height: 25px;
}
#ui-datepicker-div {
background: rgba(0, 0, 0, 0.7) !important;
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b80f490/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/DatePickerLayout_tmpl.html
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/DatePickerLayout_tmpl.html b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/DatePickerLayout_tmpl.html
index 771d7fb..ed1df61 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/DatePickerLayout_tmpl.html
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/DatePickerLayout_tmpl.html
@@ -20,7 +20,7 @@
<input id="dateRange" class="col-md-4 form-control pull-left" readonly style="cursor:pointer;" />
</div>
<div class="col-md-1 col-sm-1">
- <button class="goBtn btn btn-xs btn-success" type="button">Go</button>
+ <button class="goBtn btn btn-success" type="button">Go</button>
<!-- <button class="cancelBtn btn btn-xs btn-default" type="button">Cancel</button> -->
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b80f490/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/Header_tmpl.html
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/Header_tmpl.html b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/Header_tmpl.html
index 0bc60c3..c0b7ad5 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/Header_tmpl.html
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/Header_tmpl.html
@@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<div id="top-panel" class="col-xs-12 col-sm-10">
+<div id="top-panel" class="col-xs-12 col-sm-9">
<div class="row">
- <div class="col-xs-12 col-sm-12 top-panel-right">
+ <div class="col-xs-12 col-sm-12">
<ul class="nav navbar-nav pull-right panel-menu">
<li class="dropdown" data-id="timeZoneChange" title="Change timezone">
<span style="color: white; position: absolute; top: -16px; right: -4px; font-size: 10px;"></span>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b80f490/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/troubleshoot/TroubleShootLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/troubleshoot/TroubleShootLayoutView_tmpl.html b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/troubleshoot/TroubleShootLayoutView_tmpl.html
index 3faaaa6..b3eeaf5 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/troubleshoot/TroubleShootLayoutView_tmpl.html
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/troubleshoot/TroubleShootLayoutView_tmpl.html
@@ -57,7 +57,7 @@
</div>
<div class="col-md-2 text-right pull-right" style="z-index:1">
<button data-id="searchServiceLogs"
- class="goBig_btn btn btn-xs btn-success" type="button">
+ class="btn btn-success" type="button">
Go to Logs</button>
</div>
</div>