You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2017/08/17 15:10:22 UTC
[3/3] activemq-artemis git commit: NOJIRA Console branding/style
improvements
NOJIRA Console branding/style improvements
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4004c959
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4004c959
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4004c959
Branch: refs/heads/master
Commit: 4004c959da7d59bf0fbe031913d18eb977462610
Parents: addec57
Author: Martyn Taylor <mt...@redhat.com>
Authored: Mon Aug 14 16:41:01 2017 +0100
Committer: Justin Bertram <jb...@apache.org>
Committed: Thu Aug 17 10:10:02 2017 -0500
----------------------------------------------------------------------
.../src/main/webapp/plugin/css/activemq.css | 44 ++++++++-----------
.../src/main/webapp/plugin/css/branding.css | 2 +-
.../src/main/webapp/plugin/doc/welcome.md | 16 -------
.../src/main/webapp/plugin/img/activemq.png | Bin 21601 -> 18181 bytes
.../plugin/img/login-screen-background.png | Bin 5658 -> 412499 bytes
.../webapp/plugin/img/login-screen-logo.png | Bin 28774 -> 50742 bytes
.../src/main/webapp/plugin/js/plugin.js | 10 +++--
7 files changed, 25 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4004c959/artemis-hawtio/activemq-branding/src/main/webapp/plugin/css/activemq.css
----------------------------------------------------------------------
diff --git a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/css/activemq.css b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/css/activemq.css
index 8c0a41e..f04f172 100644
--- a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/css/activemq.css
+++ b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/css/activemq.css
@@ -762,6 +762,7 @@ td.adding {
.login-form form fieldset .control-group label {
color: white;
+ font-weight: bolder;
}
.login-logo {
@@ -1435,23 +1436,23 @@ a:hover {
#main {
- margin-top: 90px!important;
+ margin-top: 106px!important;
}
#main-nav {
- max-height: 90px !important;
+ max-height: 106px !important;
}
#main-nav .main-nav-upper .nav {
- max-height: 45px !important;
+ max-height: 106px !important;
}
#main-nav .main-nav-upper .nav li {
- max-height: 45px !important;
+ max-height: 106px !important;
}
#main-nav .main-nav-upper .nav li a {
- max-height: 45px !important;
+ max-height: 106px !important;
}
#main-nav .main-nav-upper .nav li a i.fixme:before {
@@ -1477,10 +1478,9 @@ a:hover {
#main-nav > .main-nav-upper {
filter: none;
border-top: 3px solid #B21054;
- background: #FFFFFF !important;
border-bottom: none;
- height: 44px !important;
- min-height: 44px !important;
+ height: 60px !important;
+ min-height: 60px !important;
box-shadow: none;
}
@@ -1539,7 +1539,6 @@ a:hover {
}
#main-nav > .navbar-inner.main-nav-upper > .container > .pull-left > .brand {
- color: #333333;
text-shadow: none;
}
@@ -1640,7 +1639,7 @@ a:hover {
border: none;
height: 44px;
max-height: 44px;
- color: #333333;
+ color: #ffffff;
}
#main-nav .navbar-inner.main-nav-upper .nav > li:hover a {
@@ -1804,10 +1803,8 @@ select, textarea, input[type="text"], input[type="password"], input[type="dateti
}
div[ng-controller='Core.LoginController']:after {
- position: absolute;
- top: 50px;
- right: 64px;
- content: url('../img/login-screen-logo.png');
+ position: relative;
+ horiz-align: center;
}
@@ -1823,16 +1820,16 @@ div[ng-controller='Core.LoginController']:after {
min-width: 850px;
border-top: 1px rgba(255, 255, 255, 0.05) solid;
border-bottom: 1px rgba(255, 255, 255, 0.05) solid;
- background-color: rgba(178, 97, 130, 0.75);
+ background-color: rgba(255, 255, 255, 0.1);
}
.login-logo>img {
- height: 80px;
+ height: 150px;
}
.login-logo {
- top: -100px;
+ top: -200px;
/* with no app title */
/* left: 183px; */
left: 45px;
@@ -1860,10 +1857,6 @@ div[ng-controller='Core.LoginController']:after {
width: 344px;
}
-.login-wrapper form fieldset .control-group label {
- padding-top: 12px;
-}
-
.login-wrapper form fieldset input[type="text"],
.login-wrapper form fieldset input[type="password"] {
margin: 4px;
@@ -2327,10 +2320,9 @@ div[ng-controller="Log.LogController"] .logbar .logbar-container {
}
.help-header {
- background-color: #B2577A;
- color: white;
- padding-left: 10px;
- padding-right: 10px;
+ background-color: #43484D;
+ padding-left: 20px;
+ padding-right: 20px;
border-radius: 4px;
}
@@ -2338,7 +2330,7 @@ div[ng-controller="Log.LogController"] .logbar .logbar-container {
position: relative;
margin-right: 7px;
margin-left: 3px;
- height: 22px;
+ height: 50px;
top: -2px;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4004c959/artemis-hawtio/activemq-branding/src/main/webapp/plugin/css/branding.css
----------------------------------------------------------------------
diff --git a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/css/branding.css b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/css/branding.css
index 313548b..34da086 100644
--- a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/css/branding.css
+++ b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/css/branding.css
@@ -26,7 +26,7 @@
display: inline-block;
position: relative;
left: -3px;
- height: 43px;
+ height: 58px;
}
#main-nav > .navbar-inner.main-nav-upper > .container > .pull-left > .brand > strong {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4004c959/artemis-hawtio/activemq-branding/src/main/webapp/plugin/doc/welcome.md
----------------------------------------------------------------------
diff --git a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/doc/welcome.md b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/doc/welcome.md
index a294a5b..e69de29 100644
--- a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/doc/welcome.md
+++ b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/doc/welcome.md
@@ -1,16 +0,0 @@
-
-
-
-Apache ActiveMQ Artemis
-=======================
-
-
-Management Console
-------------------
-
-Links
------
-
-[Artemis User Guide](./help)
-
-[Java Docs](../api/index.html)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4004c959/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/activemq.png
----------------------------------------------------------------------
diff --git a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/activemq.png b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/activemq.png
index de602ee..078b2be 100644
Binary files a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/activemq.png and b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/activemq.png differ
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4004c959/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/login-screen-background.png
----------------------------------------------------------------------
diff --git a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/login-screen-background.png b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/login-screen-background.png
index e94c417..77d6207 100644
Binary files a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/login-screen-background.png and b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/login-screen-background.png differ
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4004c959/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/login-screen-logo.png
----------------------------------------------------------------------
diff --git a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/login-screen-logo.png b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/login-screen-logo.png
index d40baee..67abfbb 100644
Binary files a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/login-screen-logo.png and b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/img/login-screen-logo.png differ
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4004c959/artemis-hawtio/activemq-branding/src/main/webapp/plugin/js/plugin.js
----------------------------------------------------------------------
diff --git a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/js/plugin.js b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/js/plugin.js
index cb811e9..0388053 100644
--- a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/js/plugin.js
+++ b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/js/plugin.js
@@ -20,6 +20,8 @@
* @module activemqBranding
* @main activemq
*/
+var localStorage = Core.getLocalStorage();
+localStorage['showWelcomePage'] = false;
var activemqBranding = (function (self) {
self.log = Logger.get("activemq");
@@ -30,18 +32,18 @@ var activemqBranding = (function (self) {
Themes.definitions['activemq'] = {
label: 'activemq',
file: self.context + 'plugin/css/activemq.css',
- loginBg: self.context + 'plugin/img/login-screen-background.jpg'
+ loginBg: self.context + 'plugin/img/login-screen-background.png'
};
- var localStorage = Core.getLocalStorage();
if (!('theme' in localStorage)) {
localStorage['theme'] = 'activemq';
}
+ localStorage['showWelcomePage'] = false;
Themes.brandings['activemq'] = {
label: 'activemq',
setFunc: function(branding) {
- branding.appName = 'MANAGEMENT CONSOLE';
+ branding.appName = 'ActiveMQ Management Console';
branding.appLogo = self.context + 'plugin/img/activemq.png';
- branding.logoOnly = false;
+ branding.logoOnly = true;
branding.fullscreenLogin = true;
branding.css = self.context + 'plugin/css/branding.css';
branding.favicon = self.context + 'plugin/img/favicon.png';