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/13 13:10:17 UTC
ignite git commit: IGNITE-843 Fixed select caret
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 a9cb42a5b -> e800714d8
IGNITE-843 Fixed select caret
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e800714d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e800714d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e800714d
Branch: refs/heads/ignite-843-rc1
Commit: e800714d8a62705e48b1d4535c96b7123140d69b
Parents: a9cb42a
Author: Andrey <an...@gridgain.com>
Authored: Tue Oct 13 18:10:16 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Oct 13 18:10:16 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 19 +++++++++++++++++--
.../src/main/js/views/sql/sql.jade | 8 +++-----
2 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e800714d/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 9bcd01e..a09adc7 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
@@ -1509,9 +1509,24 @@ a {
}
.chart-settings-link {
- font-size: $font-size-base;
- color: $link-color !important;
margin-left: 10px;
+ line-height: $input-height;
+
+ label, button {
+ margin-left: 5px;
+ margin-right: 0;
+ }
+
+ button.select-manual-caret {
+ padding-right: 3px;
+
+ .caret { margin-left: 3px; }
+ }
+
+ a, i {
+ font-size: $font-size-base;
+ color: $link-color !important;
+ }
}
.chart-settings {
http://git-wip-us.apache.org/repos/asf/ignite/blob/e800714d/modules/control-center-web/src/main/js/views/sql/sql.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade
index 20dcde1..55a5d91 100644
--- a/modules/control-center-web/src/main/js/views/sql/sql.jade
+++ b/modules/control-center-web/src/main/js/views/sql/sql.jade
@@ -32,14 +32,12 @@ mixin btn-toolbar-data(btn, kind, tip)
i.btn.btn-default.fa(class=btn ng-click='setResult(paragraph, "#{kind}")' ng-class='{active: resultEq(paragraph, "#{kind}")}' bs-tooltip='' data-title=tip data-trigger='hover' data-placement='bottom')
mixin chart-settings(mdl)
- .col-sm-2.chart-settings-link
+ .chart-settings-link
i.fa.fa-chevron-circle-down
a(ng-show='paragraph.chart' ng-click='$event.stopPropagation()' bs-popover data-template-url='chart-settings' data-placement='bottom' data-auto-close='1' data-trigger='click') Chart settings
- .col-sm-3
- label Show
- button.select-toggle.btn.btn-default(ng-model='paragraph.timeLineSpan' bs-options='item for item in timeLineSpans' bs-select)
+ label(style='margin-left: 20px') Show
+ button.select-manual-caret.btn.btn-default(ng-model='paragraph.timeLineSpan' bs-options='item for item in timeLineSpans' bs-select data-caret-html='<span class="caret"></span>')
label min
-
block container
.row
.col-sm-12(ng-init='noteId = "#{noteId}"')