You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/09/11 12:37:56 UTC
[1/2] ignite git commit: # GG-843 Fixed select, typeahead.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 c86d24f63 -> 4abfd551e
# GG-843 Fixed select, typeahead.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/38220509
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/38220509
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/38220509
Branch: refs/heads/ignite-843
Commit: 382205096474e9587d1271cdb27ed888c93c5fd7
Parents: b463eaa
Author: Andrey <an...@gridgain.com>
Authored: Fri Sep 11 17:38:06 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Sep 11 17:38:06 2015 +0700
----------------------------------------------------------------------
.../public/stylesheets/_bootstrap-variables.scss | 4 ++--
.../src/main/js/public/stylesheets/style.scss | 19 ++++++++++++-------
2 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/38220509/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss b/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss
index 05fb9cc..64df4b5 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss
@@ -262,7 +262,7 @@ $dropdown-fallback-border: #ccc !default;
$dropdown-divider-bg: #e5e5e5 !default;
//** Dropdown link text color.
-$dropdown-link-color: #bbb !default;
+$dropdown-link-color: #555 !default;
//** Hover color for dropdown links.
$dropdown-link-hover-color: $link-hover-color !default;
//** Hover background for dropdown links.
@@ -271,7 +271,7 @@ $dropdown-link-hover-bg: transparent !default;
//** Active dropdown menu item text color.
$dropdown-link-active-color: $component-active-color !default;
//** Active dropdown menu item background color.
-$dropdown-link-active-bg: $component-active-bg !default;
+$dropdown-link-active-bg: transparent !default;
//** Disabled dropdown menu item background color.
$dropdown-link-disabled-color: $gray-light !default;
http://git-wip-us.apache.org/repos/asf/ignite/blob/38220509/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 4931a51..957e0e0 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
@@ -129,13 +129,18 @@ ul.navbar-nav, .sidebar-nav {
text-decoration: none;
}
-.theme-line .select,
-.theme-line .typeahead {
- li a {
- color: $ignite-header-color;
- background-color: transparent;
+.theme-line .select {
+ li a.active {
+ color: $dropdown-link-active-color;
}
+ li a:hover {
+ color: $dropdown-link-hover-color;
+ }
+}
+
+.theme-line .select,
+.theme-line .typeahead {
.active {
font-size: 1em;
background-color: $ignite-background-dark-color;
@@ -1275,7 +1280,7 @@ a {
}
.ace_editor {
- margin: 0.85em 0 0.85em 0;
+ margin: 5px 5px 5px 0;
.ace_gutter {
background: transparent !important;
@@ -1357,7 +1362,7 @@ a {
border-radius: 5px;
border: thin dotted lightgrey;
- padding: 0 3px;
+ padding: 0;
}
.preview-legend {
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4abfd551
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4abfd551
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4abfd551
Branch: refs/heads/ignite-843
Commit: 4abfd551eea6a3aa9ca4a511e61fa170cc9a6c75
Parents: 3822050 c86d24f
Author: Andrey <an...@gridgain.com>
Authored: Fri Sep 11 17:38:26 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Sep 11 17:38:26 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/caches-controller.js | 173 +++++++------------
.../main/js/controllers/clusters-controller.js | 87 ++++------
.../src/main/js/controllers/common-module.js | 71 +++++---
.../main/js/controllers/metadata-controller.js | 97 ++++-------
.../src/main/js/views/configuration/caches.jade | 2 +-
.../main/js/views/configuration/clusters.jade | 2 +-
.../main/js/views/configuration/metadata.jade | 2 +-
.../src/main/js/views/includes/controls.jade | 4 +-
8 files changed, 173 insertions(+), 265 deletions(-)
----------------------------------------------------------------------