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/24 12:37:47 UTC
ignite git commit: # IGNITE-843 Fixed dropdown.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 beb402755 -> 7c60be0d2
# IGNITE-843 Fixed dropdown.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7c60be0d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7c60be0d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7c60be0d
Branch: refs/heads/ignite-843
Commit: 7c60be0d23b18f74ea0326f65cdcc2956ac68267
Parents: beb4027
Author: Andrey <an...@gridgain.com>
Authored: Thu Sep 24 17:37:57 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Sep 24 17:37:57 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 4 ++-
.../stylesheets/_bootstrap-variables.scss | 2 +-
.../src/main/js/public/stylesheets/style.scss | 30 ++++++--------------
.../main/js/views/configuration/summary.jade | 2 +-
.../src/main/js/views/sql/paragraph-rate.jade | 8 +++---
.../src/main/js/views/sql/sql.jade | 2 +-
6 files changed, 18 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c60be0d/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index 6a51109..45eeb99 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -348,7 +348,9 @@ controlCenterModule.controller('sqlController',
paragraph.gridOptions.api.setRowData(res.rows);
- paragraph.gridOptions.api.sizeColumnsToFit();
+ setTimeout(function () {
+ paragraph.gridOptions.api.sizeColumnsToFit();
+ }, 1);
if (paragraph.result == 'none')
paragraph.result = 'table';
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c60be0d/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 70925c7..d109b10 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
@@ -345,7 +345,7 @@ $screen-md-max: ($screen-lg-min - 1) !default;
//** Number of columns in the grid.
$grid-columns: 12 !default;
//** Padding between columns. Gets divided in half for the left and right.
-$grid-gutter-width: 30px !default;
+$grid-gutter-width: 0 !default;
// Navbar collapse
//** Point at which the navbar becomes uncollapsed.
$grid-float-breakpoint: $screen-sm-min !default;
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c60be0d/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 d3c009b..7a8b393 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
@@ -358,9 +358,6 @@ h1, h2, h3, h4, h5, h6 {
display: inline-block;
vertical-align: middle;
float: none;
-
- padding-left: 0 !important;
- padding-right: 0 !important;
}
input[type="checkbox"] {
@@ -472,11 +469,6 @@ button.form-control {
}
.theme-line .paragraphs {
- [class*="col-"] {
- padding-left: 0;
- padding-right: 0;
- }
-
.panel-group .panel + .panel {
margin-top: 30px;
}
@@ -581,11 +573,6 @@ button.form-control {
.theme-line .panel-body {
padding: 10px 20px;
-
- [class*="col-"] {
- padding-left: 0 !important;
- padding-right: 0 !important;
- }
}
.theme-line .main-content a.customize {
@@ -814,11 +801,6 @@ button.form-control {
.theme-line table.sql-results {
- [class*="col-"] {
- padding-left: 0 !important;
- padding-right: 0 !important;
- }
-
margin: 0;
td {
@@ -1528,7 +1510,7 @@ button.dropdown-toggle {
}
button.select-toggle {
- padding-right: 12px;
+ padding-right: 15px;
}
button.select-toggle::after {
@@ -1542,12 +1524,16 @@ button.select-toggle::after {
border-right: 0.3em solid transparent;
border-left: 0.3em solid transparent;
position: absolute;
- right: 22px;
+ right: 5px;
top: 50%;
transform: translateY(-50%);
}
-button.select-toggle.btn::after {
+button.btn.select-toggle::after {
+ right: 15px;
+}
+
+.input-tip > button.select-toggle::after {
right: 20px;
}
@@ -1606,7 +1592,7 @@ treecontrol.tree-classic {
}
.ag-cell {
- padding: 3px 6px !important;
+ padding: 3px 6px;
border-right: 1px solid #ccc
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c60be0d/modules/control-center-web/src/main/js/views/configuration/summary.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade
index 1e46694..cb9c645 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade
@@ -65,7 +65,7 @@ block content
.col-xs-2.col-sm-2.col-md-1
label Generate:
.col-xs-4.col-sm-3.col-md-3
- button.form-control(type='button' ng-model='configServer.javaClassServer' bs-select data-placeholder='{{detail.placeholder}}' bs-options='item.value as item.label for item in javaClassItems' data-sort='false')
+ button.select-toggle.form-control(type='button' ng-model='configServer.javaClassServer' bs-select data-placeholder='{{detail.placeholder}}' bs-options='item.value as item.label for item in javaClassItems' data-sort='false')
div(ui-ace='{ onLoad: aceInit, mode: "java" }' ng-model='javaServer')
div(bs-pane title='POJO' ng-show='pojoAvailable()')
.details-row
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c60be0d/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade b/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade
index 91411a0..de9c172 100644
--- a/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade
+++ b/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade
@@ -20,11 +20,11 @@
button.close(id='paragraph-rate-close' type='button' ng-click='$hide()') ×
.popover-content
form(name='popoverForm')
- .form-group(style='margin: 0; padding: 5px')
- .col-sm-4(style='padding: 0')
+ .form-group(style='padding: 5px')
+ .col-sm-4
input.form-control(id='paragraph-rate' ng-init='value = paragraph.rate.value' ng-model='value' type='number' min='1' required auto-focus)
- .col-sm-8(style='padding-left: 5px; padding-right: 0')
- button.form-control(id='paragraph-unit' ng-init='unit = paragraph.rate.unit' ng-model='unit' required placeholder='Time unit' bs-select bs-options='item.value as item.label for item in timeUnit' data-container='false' tabindex='0')
+ .col-sm-8(style='padding-left: 5px')
+ button.form-control.select-toggle(id='paragraph-unit' ng-init='unit = paragraph.rate.unit' ng-model='unit' required placeholder='Time unit' bs-select bs-options='item.value as item.label for item in timeUnit' data-container='false' tabindex='0')
.form-actions(style='margin-top: 30px; padding: 5px')
button.btn.btn-primary(id='paragraph-rate-start' ng-disabled='popoverForm.$invalid' type='button' ng-click='startRefresh(paragraph, value, unit); $hide()') Start
button.btn.btn-primary.btn-default(id='paragraph-rate-stop' type='button' ng-click='stopRefresh(paragraph); $hide()' ng-disabled='!paragraph.rate.installed') Stop
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c60be0d/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 5991dac..1a61aa5 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
@@ -126,7 +126,7 @@ block container
label.tipLabel Refresh rate:
button.btn.btn-default.fa.fa-clock-o.tipLabel(ng-class='{"btn-info": paragraph.rate && paragraph.rate.installed}' bs-popover data-template-url='rate' data-placement='left' data-auto-close='1' data-trigger='click') {{rateAsString(paragraph)}}
label.tipLabel Page size:
- button.tipLabel.select-toggle.btn.btn-default(ng-model='paragraph.pageSize' bs-options='item for item in pageSizes' bs-select)
+ button.select-toggle.fieldButton.btn.btn-default(ng-model='paragraph.pageSize' bs-options='item for item in pageSizes' bs-select)
.col-sm-12(ng-show='paragraph.errMsg')
hr(style='margin-top: 0; margin-bottom: 10px')
.sql-error-result(ng-show='paragraph.errMsg') Error: {{paragraph.errMsg}}