You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2016/10/04 15:20:15 UTC

[44/50] [abbrv] hadoop git commit: YARN-5161. [YARN-3368] Add Apache Hadoop logo in YarnUI home page. (Kai Sasaki via Sunil G)

YARN-5161. [YARN-3368] Add Apache Hadoop logo in YarnUI home page. (Kai Sasaki via Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/597b8a7f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/597b8a7f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/597b8a7f

Branch: refs/heads/YARN-3368
Commit: 597b8a7ff700d8225cee93192397c49491a44124
Parents: 57045f9
Author: Sunil <su...@apache.org>
Authored: Mon Jul 11 14:31:25 2016 +0530
Committer: sunilg <su...@apache.org>
Committed: Tue Oct 4 20:48:08 2016 +0530

----------------------------------------------------------------------
 .../src/main/webapp/app/styles/app.css             |  11 +++++++++++
 .../src/main/webapp/app/templates/application.hbs  |  12 +++++++-----
 .../webapp/public/assets/images/hadoop_logo.png    | Bin 0 -> 26495 bytes
 3 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/597b8a7f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css
index bcb6aab..e2d09dc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css
@@ -157,3 +157,14 @@ table.dataTable thead .sorting_desc_disabled {
   stroke: #ccc;  
   stroke-width: 2px;
 }
+
+.hadoop-brand-image {
+  margin-top: -10px;
+  width: auto;
+  height: 45px;
+}
+
+li a.navigation-link.ember-view {
+  color: #2196f3;
+  font-weight: bold;
+}

http://git-wip-us.apache.org/repos/asf/hadoop/blob/597b8a7f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
index b45ec6b..03b2c4a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
@@ -20,35 +20,37 @@
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
+      <a class="navbar-brand" href="#">
+        <img class="hadoop-brand-image" alt="Apache Hadoop" src="assets/images/hadoop_logo.png"  />
+      </a>
       <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
         <span class="sr-only">Toggle navigation</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="#">Apache Hadoop YARN</a>
     </div>
 
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
       <ul class="nav navbar-nav">
         {{#link-to 'yarn-queue' 'root' tagName="li"}}
-          {{#link-to 'yarn-queue' 'root'}}Queues
+          {{#link-to 'yarn-queue' 'root' class="navigation-link"}}Queues
             <span class="sr-only">(current)</span>
           {{/link-to}}
         {{/link-to}}
         {{#link-to 'yarn-apps' tagName="li"}}
-          {{#link-to 'yarn-apps'}}Applications
+          {{#link-to 'yarn-apps' class="navigation-link"}}Applications
             <span class="sr-only">(current)</span>
           {{/link-to}}
         {{/link-to}}
         {{#link-to 'cluster-overview' tagName="li"}}
-          {{#link-to 'cluster-overview'}}Cluster Overview
+          {{#link-to 'cluster-overview' class="navigation-link"}}Cluster Overview
             <span class="sr-only">(current)</span>
           {{/link-to}}
         {{/link-to}}
         {{#link-to 'yarn-nodes' tagName="li"}}
-          {{#link-to 'yarn-nodes'}}Nodes
+          {{#link-to 'yarn-nodes' class="navigation-link"}}Nodes
             <span class="sr-only">(current)</span>
           {{/link-to}}
         {{/link-to}}

http://git-wip-us.apache.org/repos/asf/hadoop/blob/597b8a7f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
new file mode 100644
index 0000000..275d39e
Binary files /dev/null and b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png differ


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org