You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ch...@apache.org on 2017/11/27 06:45:22 UTC
[1/2] kylin git commit: KYLIN-3017 Footer covers the selection box
and some options can not be selected
Repository: kylin
Updated Branches:
refs/heads/master d9e1d8cd9 -> 92d13a0e6
KYLIN-3017 Footer covers the selection box and some options can not be selected
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/418fb4f9
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/418fb4f9
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/418fb4f9
Branch: refs/heads/master
Commit: 418fb4f9246fa7a1d49da274b03284b3ffeb8aa8
Parents: d9e1d8c
Author: peng.jianhua <pe...@zte.com.cn>
Authored: Fri Nov 24 09:56:32 2017 +0800
Committer: chenzhx <ch...@apache.org>
Committed: Mon Nov 27 14:41:12 2017 +0800
----------------------------------------------------------------------
webapp/app/less/component.less | 4 ++++
webapp/app/partials/query/query_detail.html | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/418fb4f9/webapp/app/less/component.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/component.less b/webapp/app/less/component.less
index d99ddbb..2fa2a54 100644
--- a/webapp/app/less/component.less
+++ b/webapp/app/less/component.less
@@ -1049,6 +1049,10 @@ span.input-icon {
box-shadow: 0 0 8px rgba(82, 168, 236, .6)
}
+.chosen-relative .chosen-container-active.chosen-with-drop .chosen-drop {
+ position: relative;
+}
+
//override callout info in AdinLTE.css
.callout {
margin: 0 0 20px 0 !important;
http://git-wip-us.apache.org/repos/asf/kylin/blob/418fb4f9/webapp/app/partials/query/query_detail.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/query/query_detail.html b/webapp/app/partials/query/query_detail.html
index 8e1286c..5668f10 100644
--- a/webapp/app/partials/query/query_detail.html
+++ b/webapp/app/partials/query/query_detail.html
@@ -150,7 +150,7 @@
<div class="graph_content">
<label>Metrics</label>
- <div>
+ <div class="chosen-relative">
<select ng-if="curQuery.graph.type.metrics.multiple"
chosen style="width: 100%;"
multiple
[2/2] kylin git commit: KYLIN-3058 We should limit the integer type
ID for 'Kafka Setting' in 'Streaming Cluster' page
Posted by ch...@apache.org.
KYLIN-3058 We should limit the integer type ID for 'Kafka Setting' in 'Streaming Cluster' page
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/92d13a0e
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/92d13a0e
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/92d13a0e
Branch: refs/heads/master
Commit: 92d13a0e6a725a25414ebdcc7bfcdc845dd10145
Parents: 418fb4f
Author: peng.jianhua <pe...@zte.com.cn>
Authored: Sat Nov 25 23:12:11 2017 +0800
Committer: chenzhx <ch...@apache.org>
Committed: Mon Nov 27 14:45:10 2017 +0800
----------------------------------------------------------------------
webapp/app/partials/cubeDesigner/streamingConfig.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/92d13a0e/webapp/app/partials/cubeDesigner/streamingConfig.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/streamingConfig.html b/webapp/app/partials/cubeDesigner/streamingConfig.html
index 5dc9788..b18b425 100644
--- a/webapp/app/partials/cubeDesigner/streamingConfig.html
+++ b/webapp/app/partials/cubeDesigner/streamingConfig.html
@@ -82,7 +82,7 @@
<tr ng-if="cluster.newBroker">
<td>
<div class="input-group">
- <input class="form-control" type="text" ng-model="cluster.newBroker.id" name="broker_id" placeholder="Input broker ID"/>
+ <input class="form-control" type="text" ng-model="cluster.newBroker.id" name="broker_id" placeholder="Input broker ID" onInput="this.value=this.value.replace(/[^0-9]/g, '')"/>
</div>
</td>
<td>
@@ -92,7 +92,7 @@
</td>
<td>
<div class="input-group">
- <input class="form-control" type="text" ng-model="cluster.newBroker.port" name="broker_port" placeholder="Input broker port">
+ <input class="form-control" type="text" ng-model="cluster.newBroker.port" name="broker_port" placeholder="Input broker port" onInput="this.value=this.value.replace(/[^0-9]/g, '')">
</div>
</td>
<td>