ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [1/2] ignite git commit: IGNITE-843 Title fix
Date Fri, 05 Feb 2016 06:11:22 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 95ae53b92 -> 880564708


IGNITE-843 Title fix


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/30f7623b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/30f7623b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/30f7623b

Branch: refs/heads/ignite-843-rc2
Commit: 30f7623b30cfeaacf3a846187850460dfac4e90e
Parents: a39a8d8
Author: Andrey <anovikov@gridgain.com>
Authored: Fri Feb 5 13:10:20 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Fri Feb 5 13:10:20 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/public/stylesheets/style.scss                 | 2 +-
 .../control-center-web/src/main/js/views/includes/header.jade | 7 ++-----
 modules/control-center-web/src/main/js/views/login.jade       | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/30f7623b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index f28516f..46aa510 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -233,7 +233,7 @@ ul.navbar-nav, .sidebar-nav {
 }
 
 .header .title {
-    margin: 5px 0;
+    margin: 20px 0 5px 0;
     padding: 0 15px;
 
     font-size: 1.4em;

http://git-wip-us.apache.org/repos/asf/ignite/blob/30f7623b/modules/control-center-web/src/main/js/views/includes/header.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/header.jade b/modules/control-center-web/src/main/js/views/includes/header.jade
index e1ed222..5ff7766 100644
--- a/modules/control-center-web/src/main/js/views/includes/header.jade
+++ b/modules/control-center-web/src/main/js/views/includes/header.jade
@@ -19,12 +19,9 @@ header#header.header
         | Currently assuming #[strong {{$root.user.username}}], #[a(ng-click='$root.revertIdentity()')
revert to your identity].
     table.container
         tr
-            td.col-xs-3.col-sm-3.col-md-2(rowspan='2')
+            td.col-xs-3.col-sm-3.col-md-2
                 ignite-logo
-            td
-                ignite-title
-        tr
-            td.navbar-collapse.collapse(ng-if='$root.user')
+            td(ng-if='$root.user' style='padding-top: 20px')
                 ul.nav.navbar-nav(ignite-configuration-sidebar ignite-navbar)
                     li(ng-class='{active: $state.includes("base.configuration")}')
                         a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='sidebar.items'
data-placement='bottom-right') Configuration

http://git-wip-us.apache.org/repos/asf/ignite/blob/30f7623b/modules/control-center-web/src/main/js/views/login.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/login.jade b/modules/control-center-web/src/main/js/views/login.jade
index 9c3fe38..96e24ad 100644
--- a/modules/control-center-web/src/main/js/views/login.jade
+++ b/modules/control-center-web/src/main/js/views/login.jade
@@ -23,9 +23,9 @@ mixin lblRequired(txt)
 header#header.header
     table.container
         tr
-            td.col-xs-3.col-sm-3.col-md-2(rowspan='2')
+            td.col-xs-3.col-sm-3.col-md-2
                 ignite-logo
-            td(style='padding-top: 20px')
+            td
                 ignite-title
 
 .container.body-container


Mime
View raw message