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/10/27 05:13:38 UTC
ignite git commit: IGNITE-1781 Fixed css
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 31c502b04 -> 8b9a57148
IGNITE-1781 Fixed css
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8b9a5714
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8b9a5714
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8b9a5714
Branch: refs/heads/ignite-843-rc1
Commit: 8b9a57148c94375bf442f6293e4c147c1b26f4dd
Parents: 31c502b
Author: Andrey <an...@gridgain.com>
Authored: Tue Oct 27 11:13:40 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Oct 27 11:13:40 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 25 ++++++++++++++------
.../src/main/js/views/includes/controls.jade | 2 +-
2 files changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8b9a5714/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 29926e7..63f11a5 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
@@ -585,7 +585,7 @@ button.form-control {
margin: 0;
cursor: pointer;
font-size: $font-size-large;
- line-height: 27px;
+ line-height: 24px;
label {
overflow: hidden;
@@ -595,29 +595,40 @@ button.form-control {
}
.btn-group {
- margin-top: -5px;
+ vertical-align:top;
margin-left: 10px;
+
+ i { line-height: 18px; }
+ }
+
+ > i {
+ vertical-align: top;
+ line-height: 26px;
+ height: 26px;
+ }
+
+ .fa {
+ line-height: 26px;
}
.fa-floppy-o {
float: right;
- line-height: 30px;
}
.fa-chevron-circle-up, .fa-chevron-circle-down {
+ font-size: $font-size-base;
color: inherit;
float: left;
- line-height: 30px;
}
.fa-undo {
- font-size: 16px;
+ padding: 1px 6px;
- padding: 5px 7px;
+ font-size: 16px;
}
.fa-undo:hover {
- padding: 4px 6px;
+ padding: 0 5px;
border-radius: 5px;
border: thin dotted $ignite-darck-border-color;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8b9a5714/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index d532bca..68fdd7a 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -510,7 +510,7 @@ mixin main-table(title, rows, focusId, click, rowTemplate)
mixin groups(groups, dataSource)
.panel.panel-default(ng-repeat='group in #{groups}' ng-click='triggerDigest=true' ng-hide='{{group.hide}}')
.panel-heading(bs-collapse-toggle ng-click='hidePopover()')
- i.tipLabel.fa(ng-class='panelExpanded(panels, "{{group.group}}") ? "fa-chevron-circle-up" : "fa-chevron-circle-down"')
+ i.fa(ng-class='panelExpanded(panels, "{{group.group}}") ? "fa-chevron-circle-up" : "fa-chevron-circle-down"')
label(id='{{::group.group + "-title"}}') {{::group.label}}
i.tipLabel.fa.fa-question-circle(ng-if='group.tip' bs-tooltip='joinTip(group.tip)')
i.tipLabel.fa.fa-question-circle.blank(ng-if='!group.tip')