You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/12/01 20:05:44 UTC

[1/2] mesos git commit: Overrided the webui navbar color to match project website.

Repository: mesos
Updated Branches:
  refs/heads/master e19d77605 -> 326e23a42


Overrided the webui navbar color to match project website.

Review: https://reviews.apache.org/r/53287/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/22571bb4
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/22571bb4
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/22571bb4

Branch: refs/heads/master
Commit: 22571bb4c4c6743dac9c87f364c7be03d1d59a7e
Parents: e19d776
Author: haosdent huang <ha...@gmail.com>
Authored: Thu Dec 1 12:04:45 2016 -0800
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Thu Dec 1 12:04:45 2016 -0800

----------------------------------------------------------------------
 src/webui/master/static/css/mesos.css | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/22571bb4/src/webui/master/static/css/mesos.css
----------------------------------------------------------------------
diff --git a/src/webui/master/static/css/mesos.css b/src/webui/master/static/css/mesos.css
index 5b1227e..a2a1cff 100644
--- a/src/webui/master/static/css/mesos.css
+++ b/src/webui/master/static/css/mesos.css
@@ -2,6 +2,28 @@
  * BOOTSTRAP OVERRIDES
  */
 
+.navbar {
+  border: 0;
+}
+
+.navbar.navbar-inverse {
+  background-color: #2A6496;
+  color: #FFF;
+}
+
+.navbar .navbar-nav > li > a {
+  color: inherit;
+  padding-top: 20px;
+  padding-bottom: 20px;
+}
+
+.navbar .navbar-nav > .active > a,
+.navbar .navbar-nav > .active > a:focus,
+.navbar .navbar-nav > .active > a:hover {
+    color: inherit;
+    background-color: rgba(255,255,255,.1);
+}
+
 .table thead th {
   vertical-align: top;
 }

[2/2] mesos git commit: Show the Mesos logo in the webui navbar.

Posted by bm...@apache.org.
Show the Mesos logo in the webui navbar.

Review: https://reviews.apache.org/r/53288/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/326e23a4
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/326e23a4
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/326e23a4

Branch: refs/heads/master
Commit: 326e23a42ba49bcf16794803f5b4262c88ebb100
Parents: 22571bb
Author: haosdent huang <ha...@gmail.com>
Authored: Thu Dec 1 12:05:00 2016 -0800
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Thu Dec 1 12:05:00 2016 -0800

----------------------------------------------------------------------
 src/webui/master/static/css/mesos.css      |   5 +++++
 src/webui/master/static/img/mesos_logo.png | Bin 0 -> 7888 bytes
 src/webui/master/static/index.html         |   4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/326e23a4/src/webui/master/static/css/mesos.css
----------------------------------------------------------------------
diff --git a/src/webui/master/static/css/mesos.css b/src/webui/master/static/css/mesos.css
index a2a1cff..c817aae 100644
--- a/src/webui/master/static/css/mesos.css
+++ b/src/webui/master/static/css/mesos.css
@@ -185,3 +185,8 @@ a.badge-type:hover {
   -webkit-box-shadow: none;
   box-shadow: none;
 }
+
+#logo {
+  margin: -15px -10px;
+  height: 60px;
+}

http://git-wip-us.apache.org/repos/asf/mesos/blob/326e23a4/src/webui/master/static/img/mesos_logo.png
----------------------------------------------------------------------
diff --git a/src/webui/master/static/img/mesos_logo.png b/src/webui/master/static/img/mesos_logo.png
new file mode 100755
index 0000000..723a310
Binary files /dev/null and b/src/webui/master/static/img/mesos_logo.png differ

http://git-wip-us.apache.org/repos/asf/mesos/blob/326e23a4/src/webui/master/static/index.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/index.html b/src/webui/master/static/index.html
index 6211892..a4eda30 100644
--- a/src/webui/master/static/index.html
+++ b/src/webui/master/static/index.html
@@ -29,7 +29,9 @@
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#/">Mesos</a>
+            <a class="navbar-brand" href="#/">
+              <img id="logo" src="/static/img/mesos_logo.png" alt="Apache Mesos">
+            </a>
           </div>
 
           <div class="collapse navbar-collapse" data-collapse="!navbarExpanded">