Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 1aa14d167 -> ad6f0290a
IGNITE-2251 Added tooltips. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/37d8a260 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/37d8a260 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/37d8a260 Branch: refs/heads/ignite-843-rc2 Commit: 37d8a260f509dfb5ba3a90ebbb7077ea112db236 Parents: 1aa14d1 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Wed Dec 23 17:18:51 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Wed Dec 23 17:18:51 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade | 6 ++++++ .../src/main/js/public/stylesheets/style.scss | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/37d8a260/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade index 311ddcd..f2f48b6 100644 --- a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade +++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade @@ -14,6 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. +mixin check-tooltip(message) + i.tipLabel.fa.fa-question-circle(bs-tooltip='"#{message}"') + div .details-row .col-xs-2.col-sm-2.col-md-2 @@ -26,9 +29,12 @@ div label input(type='checkbox' ng-model='ctrl.useConstructor') | Generate constructors + +check-tooltip("Generate empty and full constructors in POJO classes") + .details-row.checkbox .col-xs-2.col-sm-2.col-md-2 .col-xs-10.col-sm-10.col-md-10 label input(type='checkbox' ng-model='ctrl.includeKeyFields') | Include key fields + +check-tooltip("Generate key fields in POJO value class") div(ng-if='ctrl.data' ui-ace='{onLoad: onLoad, mode: "java"}' ng-model='ctrl.data') http://git-wip-us.apache.org/repos/asf/ignite/blob/37d8a260/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 d353575..154e980 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 @@ -431,7 +431,7 @@ h1, h2, h3, h4, h5, h6 { margin-top: 0; } -.details-row, .settings-row:last-child { +.settings-row:last-child { margin-bottom: 0; }