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/15 06:04:07 UTC
ignite git commit: # GG-843 Fixed table placeholders.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 aed0fb028 -> d4f65055c
# GG-843 Fixed table placeholders.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d4f65055
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d4f65055
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d4f65055
Branch: refs/heads/ignite-843
Commit: d4f65055c53f63e4679796f7f8bf870c2c385839
Parents: aed0fb0
Author: Andrey <an...@gridgain.com>
Authored: Tue Sep 15 11:05:23 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Sep 15 11:05:23 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 14 +++++++-------
.../src/main/js/views/includes/controls.jade | 11 +++++------
2 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d4f65055/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 d99d01c..42787dc 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,6 +585,13 @@ button.form-control {
width: 100%;
+ label.placeholder {
+ font-size: 0.8em;
+ line-height: 0.8em;
+ color: $ignite-placeholder-color;
+ width: 100%;
+ }
+
tbody {
border-left: 10px solid transparent;
}
@@ -598,13 +605,6 @@ button.form-control {
tfoot > tr > td {
padding: 0;
- label.placeholder {
- font-size: 0.8em;
- line-height: 0.8em;
- color: $ignite-placeholder-color;
- width: 100%;
- }
-
.pagination {
margin: 10px 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d4f65055/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 64ac3cd..d01ef95 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
@@ -97,12 +97,11 @@ mixin table-pair(header, tblMdl, keyFld, valFld, keyPlaceholder, valPlaceholder,
table.links-edit(id='{{::field.model}}' st-table=tblMdl)
tbody
tr(ng-repeat='item in #{tblMdl}')
- td
- div(ng-show='!tableEditing(field, $index)')
- a.labelFormField(ng-click='tableStartEdit(backupItem, field, $index)') {{compactJavaName(field.model, $index + 1, 55, [item.#{keyFld}, item.#{valFld}])}}
- +btn-remove('tableRemove(backupItem, field, $index)', 'field.removeTip')
- div(ng-if='tableEditing(field, $index)')
- +table-pair-edit('cur', keyPlaceholder, valPlaceholder, keyJavaBuildInTypes, valueJavaBuildInTypes, '{{::field.focusId}}', '$index')
+ td.col-sm-12(ng-show='!tableEditing(field, $index)')
+ a.labelFormField(ng-click='tableStartEdit(backupItem, field, $index)') {{compactJavaName(field.model, $index + 1, 55, [item.#{keyFld}, item.#{valFld}])}}
+ +btn-remove('tableRemove(backupItem, field, $index)', 'field.removeTip')
+ td.col-sm-12(ng-show='tableEditing(field, $index)')
+ +table-pair-edit('cur', keyPlaceholder, valPlaceholder, keyJavaBuildInTypes, valueJavaBuildInTypes, '{{::field.focusId}}', '$index')
tfoot(ng-show='tableNewItemActive(field)')
tr
td.col-sm-12