ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-7650 Minor UI tweaks.
Date Fri, 03 Aug 2018 08:26:45 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 00bbd8eae -> f825dfc69


IGNITE-7650 Minor UI tweaks.


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

Branch: refs/heads/master
Commit: f825dfc69b898d3810c7128fce095574cb668ba9
Parents: 00bbd8e
Author: Dmitriy Shabalin <dmitriyff@gmail.com>
Authored: Fri Aug 3 15:26:24 2018 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Fri Aug 3 15:26:24 2018 +0700

----------------------------------------------------------------------
 .../app/primitives/form-field/checkbox.pug      |  2 +-
 .../app/primitives/form-field/index.scss        | 46 +++++++++++++++++++-
 .../app/primitives/form-field/number.pug        |  5 ++-
 3 files changed, 49 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f825dfc6/modules/web-console/frontend/app/primitives/form-field/checkbox.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/form-field/checkbox.pug b/modules/web-console/frontend/app/primitives/form-field/checkbox.pug
index 09596d4..b498cbd 100644
--- a/modules/web-console/frontend/app/primitives/form-field/checkbox.pug
+++ b/modules/web-console/frontend/app/primitives/form-field/checkbox.pug
@@ -15,7 +15,7 @@
     limitations under the License.
 
 mixin form-field__checkbox({ label, model, name, disabled, required, tip })
-    .form-field.form-field__checkbox
+    .form-field.form-field__checkbox(id=`{{ ${name} }}Field`)
         +form-field__label({ label, name, required })
             +form-field__tooltip({ title: tip, options: tipOpts })
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f825dfc6/modules/web-console/frontend/app/primitives/form-field/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/form-field/index.scss b/modules/web-console/frontend/app/primitives/form-field/index.scss
index 83dd55d..070dfe7 100644
--- a/modules/web-console/frontend/app/primitives/form-field/index.scss
+++ b/modules/web-console/frontend/app/primitives/form-field/index.scss
@@ -130,7 +130,7 @@
     }
    .ignite-form-field__errors {
         color: $ignite-brand-primary;
-        padding: 5px 10px 0px;
+        padding: 5px 10px 0;
         line-height: 14px;
         font-size: 12px;
         clear: both;
@@ -215,6 +215,7 @@
             box-sizing: border-box;
             width: 100%;
             max-width: initial;
+            min-width: 0;
             height: 36px;
             padding: 9px 10px;
             margin-right: 0;
@@ -241,6 +242,13 @@
             }
         }
 
+        &--postfix::after {
+            content: attr(data-postfix);
+            display: inline-flex;
+            place-self: center;
+            margin-left: 10px;
+        }
+
         // Added right offset to appearance of input for invalid password
         & > input[type='email'].ng-invalid.ng-touched,
         & > input[type='text'].ng-invalid.ng-touched,
@@ -261,6 +269,8 @@
         right: 0;
         bottom: 0;
 
+        display: flex;
+
         [ng-message] {
             // TODO: remove after replace all fields to new
             overflow: visible !important;
@@ -268,6 +278,12 @@
         }
     }
 
+    &__control--postfix + &__errors::after {
+        content: attr(data-postfix);
+        margin-left: 10px;
+        visibility: hidden;
+    }
+
     &__error {
         z-index: 2;
         position: relative;
@@ -328,6 +344,7 @@
                 width: auto;
                 height: auto;
                 margin: 0;
+                border-radius: 0;
             }
         }
 
@@ -382,3 +399,30 @@
         height: 36px;
     }
 }
+
+.form-fieldset {
+    padding: 10px;
+
+    border: 1px solid hsla(0,0%,77%,.5);
+    border-radius: 4px;
+
+    legend {
+        width: auto;
+        margin: 0 -5px;
+        padding: 0 5px;
+
+        border: 0;
+
+        color: #393939;
+        font-size: 14px;
+        line-height: 1.42857;
+    }
+
+    legend + * {
+        margin-top: 0 !important;
+    }
+
+    & > *:last-child {
+        margin-bottom: 0 !important;
+    }
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/f825dfc6/modules/web-console/frontend/app/primitives/form-field/number.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/form-field/number.pug b/modules/web-console/frontend/app/primitives/form-field/number.pug
index e5f1454..11f8e22 100644
--- a/modules/web-console/frontend/app/primitives/form-field/number.pug
+++ b/modules/web-console/frontend/app/primitives/form-field/number.pug
@@ -14,14 +14,14 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
-mixin form-field__number({ label, model, name, disabled, required, placeholder, tip, min,
max, step })
+mixin form-field__number({ label, model, name, disabled, required, placeholder, tip, min,
max, step, postfix })
     -var errLbl = label.substring(0, label.length - 1)
 
     .form-field
         +form-field__label({ label, name, required })
             +form-field__tooltip({ title: tip, options: tipOpts })
 
-        .form-field__control
+        .form-field__control(class=postfix && 'form-field__control--postfix' data-postfix=postfix)
             - attributes.type = 'number'
             - attributes.min = min ? min : '0'
             - attributes.max = max ? max : '{{ Number.MAX_VALUE }}'
@@ -29,6 +29,7 @@ mixin form-field__number({ label, model, name, disabled, required, placeholder,
             +form-field__input({ name, model, disabled, required, placeholder })(attributes=attributes)
 
         .form-field__errors(
+            data-postfix=postfix
             ng-messages=`(${form}[${name}].$dirty || ${form}[${name}].$touched || ${form}[${name}].$submitted)
&& ${form}[${name}].$invalid ? ${form}[${name}].$error : {}`
         )
             if block


Mime
View raw message