diff --git a/dashboard/src/app/index.styl b/dashboard/src/app/index.styl index 53231ce7e7ec..9e92bb759b4e 100644 --- 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 index 67a0acec307c..79709c75098b 100644 --- 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/dashboard/src/app/workspaces/create-workspace/project-source-selector/import-zip-project/import-zip-project.html b/dashboard/src/app/workspaces/create-workspace/project-source-selector/import-zip-project/import-zip-project.html index 33de08c372a5..43ba6ab1be81 100644 --- a/dashboard/src/app/workspaces/create-workspace/project-source-selector/import-zip-project/import-zip-project.html +++ b/dashboard/src/app/workspaces/create-workspace/project-source-selector/import-zip-project/import-zip-project.html @@ -13,8 +13,8 @@ required> -
+
+
diff --git a/dashboard/src/app/workspaces/create-workspace/project-source-selector/import-zip-project/import-zip-project.styl b/dashboard/src/app/workspaces/create-workspace/project-source-selector/import-zip-project/import-zip-project.styl index 568d8ceb6c8a..ba8c9a8fed34 100644 --- a/dashboard/src/app/workspaces/create-workspace/project-source-selector/import-zip-project/import-zip-project.styl +++ b/dashboard/src/app/workspaces/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/dashboard/src/app/workspaces/create-workspace/project-source-selector/project-source-selector.html b/dashboard/src/app/workspaces/create-workspace/project-source-selector/project-source-selector.html index 8917aca631bc..10e13164f98e 100644 --- a/dashboard/src/app/workspaces/create-workspace/project-source-selector/project-source-selector.html +++ b/dashboard/src/app/workspaces/create-workspace/project-source-selector/project-source-selector.html @@ -5,7 +5,7 @@ diff --git a/dashboard/src/app/workspaces/create-workspace/project-source-selector/project-source-selector.styl b/dashboard/src/app/workspaces/create-workspace/project-source-selector/project-source-selector.styl index 21ff08448f24..4247b1a6a296 100644 --- a/dashboard/src/app/workspaces/create-workspace/project-source-selector/project-source-selector.styl +++ b/dashboard/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/dashboard/src/app/workspaces/create-workspace/ram-settings/ram-settings-machine-item/ram-settings-machine-item.html b/dashboard/src/app/workspaces/create-workspace/ram-settings/ram-settings-machine-item/ram-settings-machine-item.html index 08abc327aaef..a01d2c103aeb 100644 --- a/dashboard/src/app/workspaces/create-workspace/ram-settings/ram-settings-machine-item/ram-settings-machine-item.html +++ b/dashboard/src/app/workspaces/create-workspace/ram-settings/ram-settings-machine-item/ram-settings-machine-item.html @@ -15,9 +15,9 @@
-
+
-
+
{{ramSettingsMachineItemController.machineName}}
@@ -28,7 +28,7 @@
-
+
- +
+
diff --git a/dashboard/src/app/workspaces/create-workspace/ram-settings/ram-settings-machine-item/ram-settings-machine-item.styl b/dashboard/src/app/workspaces/create-workspace/ram-settings/ram-settings-machine-item/ram-settings-machine-item.styl index bbde50050124..a7ad9b59c00a 100644 --- a/dashboard/src/app/workspaces/create-workspace/ram-settings/ram-settings-machine-item/ram-settings-machine-item.styl +++ b/dashboard/src/app/workspaces/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/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-library-filter/che-stack-library-filter.styl b/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-library-filter/che-stack-library-filter.styl index 8757c9d4e422..1354e5fa7dfe 100644 --- a/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-library-filter/che-stack-library-filter.styl +++ b/dashboard/src/app/workspaces/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/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.html b/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.html index 492970c78cef..0a0fe6dc5401 100644 --- a/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.html +++ b/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.html @@ -33,11 +33,11 @@ class="stack-selector-item-description">
- {{stack.name}} + {{stack.name}}
- {{stack.description}} + {{stack.description}}
@@ -52,11 +52,10 @@ -
- + {{stackMachines[0].memoryLimitBytes | changeMemoryUnit:['B','GB']}}
- @@ -75,7 +74,7 @@ class="stack-selector-item-machine-name">{{machine.name}}
{{machine.memoryLimitBytes | changeMemoryUnit:['B','GB']}}
+ class="stack-selector-item-secondary-color stack-ram-offset">{{machine.memoryLimitBytes | changeMemoryUnit:['B','GB']}} diff --git a/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.styl b/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.styl index 82acc2e6e4d4..5ffcbb674f29 100644 --- a/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.styl +++ b/dashboard/src/app/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 index d782d5f71c05..a2cb253a34b2 100644 --- 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"> 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 index 4a002b3e2f25..315cc661e864 100644 --- 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 index 5654799a301c..0f6ea2d42ca8 100644 --- 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 index 3fc7d97ce878..35d3d9bc3645 100644 --- 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 index 5f7ab2e43b2f..cd45108cbd16 100644 --- 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 index 5732e038efae..26d2fdefe9ed 100644 --- 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%)