fixup! Fix GitHub loading repos and some feedbacks

eclipse-che · Jun 27, 2017 · 527ca9f · 527ca9f
1 parent c98c4a7
commit 527ca9f
Show file tree

Hide file tree

Showing 17 changed files with 51 additions and 40 deletions.
diff --git a/dashboard/src/app/index.styl b/dashboard/src/app/index.styl
@@ -237,3 +237,8 @@ md-option:hover
 
 .noselect
   user-select none
+
+.popover
+  font-family 'Open Sans'
+  font-size 12px
+  border-radius 2px
diff --git a/dashboard/src/app/stacks/stack-details/stack.styl b/dashboard/src/app/stacks/stack-details/stack.styl
@@ -72,7 +72,7 @@
 
   .md-chip
     background-color $che-medium-blue-color
-    border-radius 3px
+    border-radius 2px
     padding 0 !important
     font-weight bold
     font-size 11px
@@ -90,7 +90,7 @@
 
     md-chip-template .stack-library-text
       border none
-      border-radius 3px
+      border-radius 2px
       padding 0 25px 0 11px
 
     md-chip-template .stack-library-btn

diff --git a/...paces/create-workspace/project-source-selector/import-zip-project/import-zip-project.html b/...paces/create-workspace/project-source-selector/import-zip-project/import-zip-project.html
@@ -13,8 +13,8 @@
                    required>
     </che-input-box>
 
-    <div layout="row" layout-align="left"
-         flex flex-offset="15">
+    <div layout="row" layout-align="left" class="skip-root-container">
+      <div flex="20"></div>
       <md-checkbox ng-model="importZipProjectController.skipFirstLevel"
                    ng-change="importZipProjectController.onCheckboxChanged()"
                    aria-label="Skip the root folder of the archive">

diff --git a/...paces/create-workspace/project-source-selector/import-zip-project/import-zip-project.styl b/...paces/create-workspace/project-source-selector/import-zip-project/import-zip-project.styl
@@ -18,3 +18,6 @@
     span
       color $label-primary-color
       vertical-align text-top
+
+  .skip-root-container
+    max-width 800px
diff --git a/.../src/app/workspaces/create-workspace/project-source-selector/project-source-selector.html b/.../src/app/workspaces/create-workspace/project-source-selector/project-source-selector.html
@@ -5,7 +5,7 @@
     <toggle-single-button class="add-project"
                           che-title="Add or Import Project"
                           che-multiline-title
-                          che-font-icon="fa fa-plus"
+                          che-font-icon="material-design icon-ic_add_24px"
                           che-on-change="projectSourceSelectorController.updateData({buttonState: state, buttonType: projectSourceSelectorController.buttonType.ADD_PROJECT})"
                           ng-init="projectSourceSelectorController.selectedButtonType = projectSourceSelectorController.buttonType.ADD_PROJECT"
                           che-value="projectSourceSelectorController.buttonValues['ADD_PROJECT']"></toggle-single-button>

diff --git a/.../src/app/workspaces/create-workspace/project-source-selector/project-source-selector.styl b/.../src/app/workspaces/create-workspace/project-source-selector/project-source-selector.styl
@@ -23,6 +23,13 @@
         color white
         height 50px
 
+        md-icon
+          min-width 35px
+          text-align center
+
+          &:before
+            font-size 28px
+
         &:hover
           background-color darken($primary-color, 10%)
 
@@ -35,7 +42,7 @@
     button
       position relative
       line-height 33px
-      border-radius 5px
+      border-radius 2px
       float none
       display block
       text-align left
@@ -83,7 +90,7 @@
 
     .project-source-selector-popover-toggle-buttons
       .che-toggle-button .che-toggle-title
-        font-size 13px
+        font-size 12px
 
     .project-source-selector-button
 

diff --git a/...es/create-workspace/ram-settings/ram-settings-machine-item/ram-settings-machine-item.html b/...es/create-workspace/ram-settings/ram-settings-machine-item/ram-settings-machine-item.html
@@ -15,9 +15,9 @@
         </div>
       </div>
 
-      <div flex layout="row">
+      <div flex layout="row" flex="auto">
         <!-- Name -->
-        <div flex layout="column" layout-align="center start">
+        <div flex="40" layout="column" layout-align="center start">
           <span class="che-list-item-name ram-settings-machine-item-item-name">{{ramSettingsMachineItemController.machineName}}</span>
         </div>
 
@@ -28,7 +28,7 @@
       </div>
 
       <!-- RAM limit -->
-      <div flex="30" layout="column" layout-align="center start">
+      <div flex="25" layout="column" layout-align="center start">
         <ng-form name="ramAmountForm">
           <che-number-spinner che-form="ramAmountForm"
                               che-name="memory"
@@ -44,9 +44,10 @@
           </che-number-spinner>
         </ng-form>
       </div>
-
+      <div style="width: 10px"></div>
     </div>
 
+
   </che-list-item>
 
 </div>
diff --git a/...es/create-workspace/ram-settings/ram-settings-machine-item/ram-settings-machine-item.styl b/...es/create-workspace/ram-settings/ram-settings-machine-item/ram-settings-machine-item.styl
@@ -1,4 +1,6 @@
 .ram-settings-machine-item
+  font-size 12px
+
   md-item.che-list-item
     border none
 

diff --git a/...spaces/create-workspace/stack-selector/stack-library-filter/che-stack-library-filter.styl b/...spaces/create-workspace/stack-selector/stack-library-filter/che-stack-library-filter.styl
@@ -52,7 +52,7 @@
       margin-right 16px
 
     .md-chip
-      border-radius 3px !important
+      border-radius 2px !important
       border none !important
       padding 0 !important
       height 17px
@@ -70,7 +70,7 @@
 
         .stack-library-filter-tag-text, .stack-library-filter-suggestion-text
           border 1px solid #fff
-          border-radius 3px !important
+          border-radius 2px !important
 
         .stack-library-filter-tag-btn, .stack-library-filter-suggestion-btn
           border-left 1px solid #fff

diff --git a/...p/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.html b/...p/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.html
@@ -33,11 +33,11 @@
                  class="stack-selector-item-description">
               <!-- Name cell -->
               <div flex-gt-md="15">
-                <span class="stack-selector-item-name">{{stack.name}}</span>
+                <span class="che-list-item-name">{{stack.name}}</span>
               </div>
               <!-- Description cell -->
               <div flex-gt-md>
-                <span class="stack-selector-item-secondary-color">{{stack.description}}</span>
+                <span class="che-list-item-secondary">{{stack.description}}</span>
               </div>
             </div>
 
@@ -52,11 +52,10 @@
           </div>
 
           <!-- RAM -->
-          <div flex="25">
-            <span class="stack-selector-item-ram-offset stack-selector-item-secondary-color"
+          <div flex="25" layout="row" layout-align="start center">
+            <span class="stack-ram-offset stack-selector-item-secondary-color"
                   ng-if="stackMachines.length === 1">{{stackMachines[0].memoryLimitBytes | changeMemoryUnit:['B','GB']}}</span>
           </div>
-
           <!-- todo Pull number -->
           <!-- not implemented yet -->
 
@@ -75,7 +74,7 @@
                  class="stack-selector-item-machine-name">{{machine.name}}
             </div>
             <div flex="25"
-                 class="stack-selector-item-secondary-color">{{machine.memoryLimitBytes | changeMemoryUnit:['B','GB']}}</div>
+                 class="stack-selector-item-secondary-color stack-ram-offset">{{machine.memoryLimitBytes | changeMemoryUnit:['B','GB']}}</div>
           </div>
         </div>
 

diff --git a/...p/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.styl b/...p/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.styl
@@ -41,15 +41,6 @@
     div
       width 50px
 
-  .stack-selector-item-ram-offset
-    padding-left 0
-
-  .stack-selector-item-name, .stack-selector-item-machine-name
-    color lighten($che-black-color, 29%)
-
-  .stack-selector-item-secondary-color
-    color lighten($che-ide-background-color, 60%)
-
   .stack-selector-machines .stack-selector-machine-icon > div
     font-size 24px
     margin-left 120px

diff --git a/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector.html b/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector.html
@@ -61,7 +61,7 @@
                                       che-sort-item="name"
                                       che-column-title="Name"></che-list-header-column>
               <che-list-header-column flex="25"
-                                      class="stack-selector-title-ram-offset"
+                                      class="stack-ram-offset"
                                       che-column-title="RAM"></che-list-header-column>
             </div>
           </div>

diff --git a/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector.styl b/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector.styl
@@ -46,8 +46,6 @@
           top -40px
 
       .che-list-content
-        .stack-selector-item-ram-offset
-          line-height 50px
         .stack-selector-item-icon
           line-height inherit
 
@@ -60,3 +58,5 @@
       .che-list
         margin 0
 
+.stack-ram-offset
+    padding-left 52px
diff --git a/dashboard/src/components/api/namespace/che-namespace-registry.factory.ts b/dashboard/src/components/api/namespace/che-namespace-registry.factory.ts
@@ -34,7 +34,6 @@ export class CheNamespaceRegistry {
     this.$interval = $interval;
     this.$timeout = $timeout;
     this.namespaces = [];
-    this.namespaces.push({id: 'tets', label: 'test', location: 'test'});
 
     this.caption = 'Namespace';
   }

diff --git a/dashboard/src/components/widget/input/che-input-box.styl b/dashboard/src/components/widget/input/che-input-box.styl
@@ -34,8 +34,8 @@
       white-space nowrap
       background-color $che-white-color
       border 1px solid $default-border-color
-      padding 0 0 0 10px !important
-      border-radius 5px
+      padding 0 20px 0px 10px !important
+      border-radius 2px
 
       &:focus
         border-color $primary-color

diff --git a/dashboard/src/components/widget/input/che-number-spinner.styl b/dashboard/src/components/widget/input/che-number-spinner.styl
@@ -1,4 +1,5 @@
 .che-number-spinner
+  font-size 12px
   // hide spin buttons
   input[type=number] {
     -moz-appearance: textfield;
@@ -41,7 +42,7 @@
       text-align right
       font-weight 600
       min-width 1px
-      max-width 50px
+      max-width 26px
 
     .unit
       font-weight 600

diff --git a/dashboard/src/components/widget/toggle-button/toggle-single-button.styl b/dashboard/src/components/widget/toggle-button/toggle-single-button.styl
@@ -15,13 +15,16 @@ toggle-single-button
   .md-button
     height 20px
     line-height 20px
-    padding 2px 10px 0 20px
     margin 0 -1px 0 0
-    font-size 12px
     z-index 1
-
+    border-radius: 2px !important;
+    font-size: 1em;
+    width: auto;
+    padding-left: 10px;
+    text-transform: capitalize;
+    font-weight: normal;
+    box-shadow: 0 2px 1px 0 rgba(0,0,0,0.15);
     color $button-enabled-color
-    border-radius inherit
     border 1px solid $button-enabled-border-color
     background-color $button-enabled-background-color
 
@@ -47,7 +50,7 @@ toggle-single-button
         color inherit
         vertical-align initial
         margin-left 0
-        margin-right 0
+        margin-right 10px
 
     &:not(.toggle-single-button-disabled):hover
       background-color darken($button-enabled-background-color, 5%)