You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2018/08/03 09:58:24 UTC
[11/50] [abbrv] ignite git commit: IGNITE-9139 Web Console: Fixed
issue with dropdown for chart options on Queries screen.
IGNITE-9139 Web Console: Fixed issue with dropdown for chart options on Queries screen.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f6c67e86
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6c67e86
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6c67e86
Branch: refs/heads/ignite-8446
Commit: f6c67e864212bf66abc38293f7c7c27e380116c2
Parents: ce30b1e
Author: Dmitriy Shabalin <dm...@gmail.com>
Authored: Tue Jul 31 18:12:13 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Jul 31 18:12:13 2018 +0700
----------------------------------------------------------------------
.../app/components/page-queries/index.js | 2 ++
.../app/components/page-queries/style.scss | 20 ++++++++++++++++++++
.../frontend/views/sql/chart-settings.tpl.pug | 2 +-
3 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f6c67e86/modules/web-console/frontend/app/components/page-queries/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-queries/index.js b/modules/web-console/frontend/app/components/page-queries/index.js
index ab64b44..9434dc1 100644
--- a/modules/web-console/frontend/app/components/page-queries/index.js
+++ b/modules/web-console/frontend/app/components/page-queries/index.js
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+import './style.scss';
+
import angular from 'angular';
import queriesNotebooksList from './components/queries-notebooks-list';
http://git-wip-us.apache.org/repos/asf/ignite/blob/f6c67e86/modules/web-console/frontend/app/components/page-queries/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-queries/style.scss b/modules/web-console/frontend/app/components/page-queries/style.scss
new file mode 100644
index 0000000..8f13c2e
--- /dev/null
+++ b/modules/web-console/frontend/app/components/page-queries/style.scss
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+button.select-toggle.btn-chart-column-agg-fx::after {
+ right: 0;
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f6c67e86/modules/web-console/frontend/views/sql/chart-settings.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/sql/chart-settings.tpl.pug b/modules/web-console/frontend/views/sql/chart-settings.tpl.pug
index 5a1ceed..054067f 100644
--- a/modules/web-console/frontend/views/sql/chart-settings.tpl.pug
+++ b/modules/web-console/frontend/views/sql/chart-settings.tpl.pug
@@ -36,5 +36,5 @@
ul.chart-settings-columns-list(dnd-list='paragraph.chartValCols' dnd-drop='chartAcceptValColumn(paragraph, item)')
li(ng-repeat='col in paragraph.chartValCols track by $index')
.btn.btn-default.btn-chart-column(ng-style='chartColor($index)') {{col.label}}
- button.btn-chart-column-agg-fx.select-toggle(ng-change='applyChartSettings(paragraph)' ng-show='paragraphTimeSpanVisible(paragraph)' ng-style='chartColor($index)' ng-model='col.aggFx' placeholder='...' bs-select bs-options='item for item in aggregateFxs' data-container='false' tabindex='-1')
+ button.btn-chart-column-agg-fx.select-toggle(ng-change='applyChartSettings(paragraph)' ng-show='paragraphTimeSpanVisible(paragraph)' ng-style='chartColor($index)' ng-model='col.aggFx' placeholder='...' bs-select bs-options='item for item in aggregateFxs' tabindex='-1')
i.fa.fa-close(ng-click='chartRemoveValColumn(paragraph, $index)')