ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: # GG-843 Placeholder for tables.
Date Mon, 14 Sep 2015 05:42:49 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 3962d3165 -> 1a5de0092


# GG-843 Placeholder for tables.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1a5de009
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1a5de009
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1a5de009

Branch: refs/heads/ignite-843
Commit: 1a5de0092cbd700f9c30d3fe95ccf942b4ff5905
Parents: 3962d31
Author: Andrey <anovikov@gridgain.com>
Authored: Mon Sep 14 12:44:06 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Mon Sep 14 12:44:06 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/public/stylesheets/style.scss     | 18 +++++++++++-------
 .../src/main/js/views/includes/controls.jade      | 12 ++++++++----
 2 files changed, 19 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1a5de009/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 339cfb1..cb6a80a 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
@@ -615,6 +615,13 @@ button.form-control {
         line-height: $input-height;
     }
 
+    label.placeholder {
+        font-size: 0.8em;
+        line-height: 0.8em;
+        color: $ignite-placeholder-color;
+        width: 100%;
+    }
+
     td {
         padding-left: 0;
     }
@@ -858,14 +865,12 @@ button.form-control {
 }
 
 .group-legend {
-    top: -10px;
-    margin-left: 10px;
-    margin-right: 5px;
+    margin: -10px 5px 0 10px;
     overflow: visible;
     position: relative;
 
     label {
-        padding: 0 5px 0 5px;
+        padding: 0 5px;
         background: white;
     }
 }
@@ -878,15 +883,14 @@ button.form-control {
 }
 
 .group-content {
-    margin: 0 10px 10px 10px;
+    margin: -10px 10px 10px 10px;
 }
 
 .group-content-empty {
     color: $input-color-placeholder;
 
-    padding-top: 5px;
+    padding: 10px 0;
     position: relative;
-    top: -10px;
 
     text-align: center;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/1a5de009/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 8ae9d2f..bd9a434 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
@@ -198,25 +198,29 @@ mixin table-db-field-edit(prefix, focusId, index)
     -var javaTypeId = javaType + focusId
 
     .col-xs-3.col-sm-3.col-md-3
+        label.placeholder DB name
         label.fieldSep /
         .input-tip
-            input.form-control(id=databaseNameId enter-focus-next=databaseTypeId type='text'
ng-model=databaseNameModel placeholder='DB name' on-enter='#{javaNameModel} = #{javaNameModel}
? #{javaNameModel} : #{databaseNameModel}' on-escape='tableReset()')
+            input.form-control(id=databaseNameId enter-focus-next=databaseTypeId type='text'
ng-model=databaseNameModel on-enter='#{javaNameModel} = #{javaNameModel} ? #{javaNameModel}
: #{databaseNameModel}' on-escape='tableReset()')
     .col-xs-3.col-sm-3.col-md-3
+        label.placeholder DB type
         label.fieldSep /
         .input-tip
-            button.form-control(id=databaseTypeId enter-focus-next=javaNameId ng-model=databaseTypeModel
placeholder='DB type' bs-select bs-options='item.value as item.label for item in {{supportedJdbcTypes}}'
on-escape='tableReset()' tabindex='0')
+            button.form-control(id=databaseTypeId enter-focus-next=javaNameId ng-model=databaseTypeModel
placeholder='' bs-select bs-options='item.value as item.label for item in {{supportedJdbcTypes}}'
on-escape='tableReset()' tabindex='0')
     .col-xs-3.col-sm-3.col-md-3
+        label.placeholder Java name
         label.fieldSep /
         .input-tip
-            input.form-control(id=javaNameId enter-focus-next=javaTypeId type='text' ng-model=javaNameModel
placeholder='Java name' on-escape='tableReset()')
+            input.form-control(id=javaNameId enter-focus-next=javaTypeId type='text' ng-model=javaNameModel
on-escape='tableReset()')
     .col-xs-3.col-sm-3.col-md-3
         -var btnVisible = 'tableDbFieldSaveVisible(field, ' + index +')'
         -var btnSave = 'tableDbFieldSave(field, ' + index +')'
         -var btnVisibleAndSave = btnVisible + ' && ' + btnSave
 
+        label.placeholder Java type
         +btn-save(btnVisible, btnSave)
         .input-tip
-            button.form-control(id=javaTypeId ng-model=javaTypeModel placeholder='Java type'
bs-select bs-options='item.value as item.label for item in {{supportedJavaTypes}}' on-enter=btnVisibleAndSave
on-escape='tableReset()' tabindex='0')
+            button.form-control(id=javaTypeId ng-model=javaTypeModel placeholder='' bs-select
bs-options='item.value as item.label for item in {{supportedJavaTypes}}' on-enter=btnVisibleAndSave
on-escape='tableReset()' tabindex='0')
 
 mixin table-group-item-edit(prefix, index)
     -var fieldName = prefix + 'FieldName'


Mime
View raw message