You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/06/26 12:38:45 UTC

[incubator-dlab] branch feature/projects updated (a881ecc -> 790faa6)

This is an automated email from the ASF dual-hosted git repository.

ankovalyshyn pushed a change to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


    from a881ecc  Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects
     new 8e1d52b  [DLAB-821]: removed extra scrollbar on creating project dialog
     new d4517c9  [DLAB-822]: fixed key uploading on initial project creation form
     new 790faa6  [DLAB-822]: fixed key uploading on initial project creation form

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../administration/project/project.component.ts    |   2 +-
 ...utational-resource-create-dialog.component.html |   2 +-
 .../webapp/src/assets/styles/_dialogs.scss         | 174 +++++++++++++--------
 .../resources/webapp/src/assets/styles/_reset.scss |  32 +++-
 4 files changed, 139 insertions(+), 71 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


[incubator-dlab] 01/03: [DLAB-821]: removed extra scrollbar on creating project dialog

Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 8e1d52b27cd6dccb3103171fac3707169c7ef5dc
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Jun 26 15:35:38 2019 +0300

    [DLAB-821]: removed extra scrollbar on creating project dialog
---
 .../webapp/src/app/administration/project/project.component.ts          | 2 +-
 .../computational-resource-create-dialog.component.html                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
index c41ab27..dc888cf 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
@@ -115,7 +115,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
   `,
   styles: [`
     .content { color: #718ba6; padding: 0; font-size: 14px; font-weight: 400; margin: 0; overflow: hidden; }
-    .edit-form { height: 380px; }
+    .edit-form { height: 380px; overflow: hidden; }
   `]
 })
 export class EditProjectComponent {
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
index 627b7de..79822d8 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
@@ -170,7 +170,7 @@
           <label class="spot-label label">
             <input #spotInstancesCheck type="checkbox" (change)="selectSpotInstances($event)" />
             <span>Spot instance</span>
-            <span *ngIf="spotInstancesSelect?.nativeElement['checked'] || false"> bit, %</span>
+            <span *ngIf="spotInstancesSelect?.nativeElement['checked'] || false"> bid, %</span>
           </label>
           <div class="control spot-details" [ngClass]="{ show: spotInstancesSelect?.nativeElement['checked'] || false }"
             *ngIf="spotInstancesSelect?.nativeElement['checked'] || false">


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


[incubator-dlab] 03/03: [DLAB-822]: fixed key uploading on initial project creation form

Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 790faa6ca28f76c4e64b54f904c353383b387b29
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Jun 26 15:38:19 2019 +0300

    [DLAB-822]: fixed key uploading on initial project creation form
---
 .../resources/webapp/src/assets/styles/_reset.scss | 32 ++++++++++++++++------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_reset.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_reset.scss
index 1773d70..8875e14 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_reset.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_reset.scss
@@ -20,7 +20,7 @@
 * {
   box-sizing: border-box;
   margin: 0;
-	padding: 0;
+  padding: 0;
 }
 
 body {
@@ -28,21 +28,36 @@ body {
 }
 
 /* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+menu,
+nav,
+section {
   display: block;
 }
 
-ol, ul {
-	list-style: none;
+ol,
+ul {
+  list-style: none;
+}
+
+a {
+  text-decoration: none
 }
 
 table {
-	border-collapse: collapse;
-	border-spacing: 0;
+  border-collapse: collapse;
+  border-spacing: 0;
 }
 
-[hidden], .hidden {
+[hidden],
+.hidden {
   display: none !important;
 }
 
@@ -83,6 +98,7 @@ table {
 }
 
 input {
+
   &::-ms-clear,
   &::-ms-reveal {
     display: none;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


[incubator-dlab] 02/03: [DLAB-822]: fixed key uploading on initial project creation form

Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit d4517c91be9d96bc048c14a793b086fe63d68691
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Jun 26 15:37:58 2019 +0300

    [DLAB-822]: fixed key uploading on initial project creation form
---
 .../webapp/src/assets/styles/_dialogs.scss         | 174 +++++++++++++--------
 1 file changed, 113 insertions(+), 61 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
index 311048c..46aef3b 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
@@ -17,30 +17,58 @@
  * under the License.
  */
 
- @import '_variables.scss';
-
- .modal-xs { width: 375px; }
- .modal-sm { width: 525px; }
- .modal-md { width: 545px; }
- .modal-lg { width: 580px; }
- .modal-xl-s { width: 660px; }
- .modal-xl { width: 900px; }
- .modal-xxl { width: 1000px; }
- .modal-fullscreen { width: 100vw; height: 100vh;}
- 
+@import '_variables.scss';
+
+.modal-xs {
+  width: 375px;
+}
+
+.modal-sm {
+  width: 525px;
+}
+
+.modal-md {
+  width: 545px;
+}
+
+.modal-lg {
+  width: 580px;
+}
+
+.modal-xl-s {
+  width: 660px;
+}
+
+.modal-xl {
+  width: 900px;
+}
+
+.modal-xxl {
+  width: 1000px;
+}
+
+.modal-fullscreen {
+  width: 100vw;
+  height: 100vh;
+}
+
 mat-dialog-container {
   overflow-x: hidden;
+
   &.mat-dialog-container {
     padding: 0;
     border-radius: 0;
+
     #dialog-box {
       color: $modal-text-color;
+
       .dialog-header {
         padding-left: 30px;
         background: $modal-header-color;
         height: 50px;
         line-height: 50px;
         position: relative;
+
         .modal-title {
           width: 90%;
           margin: 0;
@@ -51,10 +79,12 @@ mat-dialog-container {
           color: #455c74;
           font-size: 18px;
           background: $modal-header-color;
+
           i {
             vertical-align: middle;
           }
         }
+
         .close {
           position: absolute;
           top: 0;
@@ -69,101 +99,65 @@ mat-dialog-container {
           outline: none;
           cursor: pointer;
           transition: all .45s ease-in-out;
+
           &:hover {
             color: #36afd5;
           }
         }
+
         &.header-white {
           background: #fff;
         }
       }
-    
+
       .dialog-body {
         padding-top: 0;
       }
+
       .upload-key {
         margin-bottom: 20px;
-        & > div > div {
+
+        &>div>div {
           margin-top: 5px;
         }
-    
-        .butt-file {
-          position: relative;
-          overflow: hidden;
-          margin-bottom: 10px;
-          display: inline-block;
-          color: #35afd5;
-          padding: 6px 29px 6px 23px;
-          width: 170px;
-          // font: 600 16px/1.45 'Open Sans';
-          font-style: normal;
-          font-weight: 600;
-          font-size: 16px;
-          line-height: 1.45;
-          font-family:'Open Sans', sans-serif;
-    
-          text-align: center;
-          box-shadow: 0 3px 1px -2px rgba(0,0,0,.2), 0 2px 2px 0 rgba(0,0,0,.14), 0 1px 5px 0 rgba(0,0,0,.12);
-          .upload-icon {
-            background: url(/../../assets/img/upload-icon.png) no-repeat;
-            background-size: 100%;
-            display: inline-block;
-            width: 17px;
-            height: 17px;
-            margin-right: 8px;
-            position: relative;
-            top: 2px;
-          }
-          input[type=file] {
-            width: 100%;
-            height: 100%;
-            position: absolute;
-            top: 0;
-            right: 0;
-            min-width: 100%;
-            min-height: 100%;
-            font-size: 100px;
-            text-align: right;
-            opacity: 0;
-            outline: none;
-            background: #fff;
-            cursor: inherit;
-            display: block;
-          }
-          &:active {
-            box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
-          }
-        }
+
         .butt-generate {
           color: #35afd5;
           width: 170px;
         }
       }
+
       .btn-success {
         margin-left: 40px;
         margin-right: 2px;
       }
+
       .btn {
         padding: 6px 15px;
         min-width: 140px;
         font-weight: 600;
       }
+
       a {
         color: #35afd5;
         text-decoration: none;
         transition: all .45s ease-in-out;
+
         &:hover {
           color: #5faec7;
         }
       }
+
       .info-label {
         font-size: 15px;
         margin-top: 20px;
       }
+
       .control-label {
         font-weight: 600;
         margin-top: 6px;
       }
+
       .form-group {
         small {
           font-size: 12px;
@@ -175,22 +169,75 @@ mat-dialog-container {
     }
   }
 }
+
 .content-box {
   padding: 25px 30px 35px;
 }
 
+.butt-file {
+  position: relative;
+  overflow: hidden;
+  margin-bottom: 10px;
+  display: inline-block;
+  color: #35afd5;
+  padding: 6px 29px 6px 23px;
+  width: 170px;
+  // font: 600 16px/1.45 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-size: 16px;
+  line-height: 1.45;
+  font-family: 'Open Sans', sans-serif;
+
+  text-align: center;
+  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, .2), 0 2px 2px 0 rgba(0, 0, 0, .14), 0 1px 5px 0 rgba(0, 0, 0, .12);
+
+  .upload-icon {
+    background: url(/../../assets/img/upload-icon.png) no-repeat;
+    background-size: 100%;
+    display: inline-block;
+    width: 17px;
+    height: 17px;
+    margin-right: 8px;
+    position: relative;
+    top: 2px;
+  }
+
+  input[type=file] {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    right: 0;
+    min-width: 100%;
+    min-height: 100%;
+    font-size: 100px;
+    text-align: right;
+    opacity: 0;
+    outline: none;
+    background: #fff;
+    cursor: inherit;
+    display: block;
+  }
+
+  &:active {
+    box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
+  }
+}
 
 .detail-header {
   border-bottom: 0;
   width: 100%;
   border-collapse: collapse;
   table-layout: fixed;
+
   td {
     border: 1px solid #edf1f5;
     text-align: center;
     padding: 20px;
     text-align: center !important;
     background: #fff;
+
     &:first-child {
       background: #f6fafe;
       font-size: 16px;
@@ -200,6 +247,7 @@ mat-dialog-container {
       overflow: hidden;
       cursor: default;
     }
+
     &.tooltip-wrap {
       .hint-title {
         font-size: 16px;
@@ -216,20 +264,24 @@ mat-dialog-container {
   p {
     font-weight: 400;
     margin-bottom: 10px;
+
     small {
       font-size: 12px;
       font-weight: 400;
     }
   }
+
   span {
     font-size: 14px;
     overflow: hidden;
     text-overflow: ellipsis;
     display: block;
   }
+
   .links_block {
     padding-left: 25px;
   }
+
   .time_info {
     margin-top: 15px;
   }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org