Merge branch 'release/v0.4.3'

ProtocolONE · Feb 18, 2021 · f4154b4 · f4154b4
2 parents 2bca8df + 74c52dd
commit f4154b4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,30 +6,32 @@ before_script: curl https://rclone.org/install.sh | sudo bash
 jobs:
   include:
   - name: dev
-    if: "(branch = master) or (tag =~ ^v)"
+    if: "(branch = develop)"
     script:
     - set -e
     - npm run lint
     - npm run test
     - npm run build
-    - rclone copy dist :s3://auth/form/dev/ --s3-access-key-id=$MINIO_S3_ACCESS_KEY --s3-secret-access-key=$MINIO_S3_SECRET_KEY --s3-endpoint=$MINIO_S3_HOST
-  - name: dev
-    if: "(branch = develop)"
+    #- rclone copy dist :s3://auth/form/develop/ --s3-access-key-id=$MINIO_S3_ACCESS_KEY --s3-secret-access-key=$MINIO_S3_SECRET_KEY --s3-endpoint=$MINIO_S3_HOST
+    - rclone copy dist :s3://cdn-auth-super-com/authform/dev/ --s3-access-key-id=$AWS_CDN_ACCESS_KEY_ID --s3-secret-access-key=$AWS_CDN_ACCESS_SECRET_KEY --s3-region=eu-west-1
+  - name: stg
+    if: "(branch =~ ^release)"
     script:
     - set -e
     - npm run lint
     - npm run test
     - npm run build
-    - rclone copy dist :s3://auth/form/develop/ --s3-access-key-id=$MINIO_S3_ACCESS_KEY --s3-secret-access-key=$MINIO_S3_SECRET_KEY --s3-endpoint=$MINIO_S3_HOST
+    - rclone copy dist :s3://cdn-auth-super-com/authform/stage/ --s3-access-key-id=$AWS_CDN_ACCESS_KEY_ID --s3-secret-access-key=$AWS_CDN_ACCESS_SECRET_KEY --s3-region=eu-west-1
+    #- rclone copy dist :s3://auth/form/dev/ --s3-access-key-id=$MINIO_S3_ACCESS_KEY --s3-secret-access-key=$MINIO_S3_SECRET_KEY --s3-endpoint=$MINIO_S3_HOST
   - name: release
     if: "(tag =~ ^v)"
     script:
     - set -e
     - npm run lint
     - npm run test
     - npm run build
-    - rclone copy dist :s3://auth/form/latest/ --s3-access-key-id=$MINIO_S3_ACCESS_KEY --s3-secret-access-key=$MINIO_S3_SECRET_KEY --s3-endpoint=$MINIO_S3_HOST
-    - rclone copy dist :s3://auth/form/$TRAVIS_TAG/ --s3-access-key-id=$MINIO_S3_ACCESS_KEY --s3-secret-access-key=$MINIO_S3_SECRET_KEY --s3-endpoint=$MINIO_S3_HOST
+    #- rclone copy dist :s3://auth/form/latest/ --s3-access-key-id=$MINIO_S3_ACCESS_KEY --s3-secret-access-key=$MINIO_S3_SECRET_KEY --s3-endpoint=$MINIO_S3_HOST
+    #- rclone copy dist :s3://auth/form/$TRAVIS_TAG/ --s3-access-key-id=$MINIO_S3_ACCESS_KEY --s3-secret-access-key=$MINIO_S3_SECRET_KEY --s3-endpoint=$MINIO_S3_HOST
     - rclone copy dist :s3://cdn-auth-super-com/authform/latest/ --s3-access-key-id=$AWS_CDN_ACCESS_KEY_ID --s3-secret-access-key=$AWS_CDN_ACCESS_SECRET_KEY --s3-region=eu-west-1
     - rclone copy dist :s3://cdn-auth-super-com/authform/$TRAVIS_TAG/ --s3-access-key-id=$AWS_CDN_ACCESS_KEY_ID --s3-secret-access-key=$AWS_CDN_ACCESS_SECRET_KEY --s3-region=eu-west-1
 notifications:

diff --git a/src/components/PaySuperRegisterForm.vue b/src/components/PaySuperRegisterForm.vue
@@ -143,8 +143,7 @@ export default {
 
 .info {
   position: relative;
-  margin-top: 8px;
-  margin-bottom: 22px;
+  margin: 22px 0;
 
   & > svg {
     position: absolute;

diff --git a/src/components/UiTextField.vue b/src/components/UiTextField.vue
@@ -4,7 +4,6 @@ export default {
     prop: 'value',
     event: 'input',
   },
-
   props: {
     additionalInfo: {
       default: '',
@@ -74,7 +73,6 @@ export default {
       this.inputValue = val;
     },
   },
-
   methods: {
     handleInput() {
       const prevValue = this.value || '';
@@ -83,7 +81,6 @@ export default {
         this.$emit('input', value);
       }
     },
-
     togglePasswordInputType() {
       this.innerType = this.innerType === 'text' ? 'password' : 'text';
     },
@@ -228,7 +225,7 @@ $left-indent: 17px;
   top: 0;
 }
 .error {
-  bottom: -2px;
+  top: 60px;
   color: $error-input-color;
   display: block;
   font-size: $secondary-input-size;