diff --git a/client/assets/styles/scss/views/views-new-service.scss b/client/assets/styles/scss/views/views-new-service.scss index 552910e89..1ba50d754 100644 --- a/client/assets/styles/scss/views/views-new-service.scss +++ b/client/assets/styles/scss/views/views-new-service.scss @@ -44,17 +44,17 @@ } } - .label-branch { - margin-top: -$sm; - } - // for branch selector .btn-wrapped { @extend %btn-md; - display: block; - font-weight: 400; + display: flex; + flex: 1 1 auto; + justify-content: space-between; padding-left: 8px; - width: 100%; + + .icons-branch { + top: 9px; + } } // for the nested compose test file diff --git a/client/directives/components/newContainer/forms/configureNewServiceView.jade b/client/directives/components/newContainer/forms/configureNewServiceView.jade index 638abebec..4311d6468 100644 --- a/client/directives/components/newContainer/forms/configureNewServiceView.jade +++ b/client/directives/components/newContainer/forms/configureNewServiceView.jade @@ -57,7 +57,7 @@ section.grid-block.vertical.modal-body( ) //- default branch selector - form.grid-block.vertical.label.label-branch( + label.grid-block.vertical.label( ng-if = "NCC.state.dockerFileTab === 'compose' && $root.featureFlags.composeDefaultBranch" ng-include = "'defaultBranchView'" ) diff --git a/client/directives/components/newContainer/forms/defaultBranchView.jade b/client/directives/components/newContainer/forms/defaultBranchView.jade index bd7da1a76..658c8c196 100644 --- a/client/directives/components/newContainer/forms/defaultBranchView.jade +++ b/client/directives/components/newContainer/forms/defaultBranchView.jade @@ -1,9 +1,8 @@ -label - .padding-xxs.small.label-sm Branch - div( - auto-update = "true" - branch-selector - loading-promises-target = "editServerModal" - state = "state" - ) - small.padding-xxs.small Select the first branch you want to add. +.padding-xxs.small.label-sm Initial Branch +.grid-block( + auto-update = "true" + branch-selector + loading-promises-target = "editServerModal" + state = "state" +) +small.padding-xxs.small Select the first branch you want to add.