Skip to content

Commit dee40ef

Browse files
taylordolanthejsj
authored andcommitted
add default branch selector
1 parent 7e06631 commit dee40ef

File tree

5 files changed

+30
-2
lines changed

5 files changed

+30
-2
lines changed

client/assets/styles/scss/modals/modals-forms.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@
157157
// max-width on buttons
158158
> .btn,
159159
.btn-wrapped {
160+
@extend %btn-sm;
160161
display: block;
161162
font-size: 16px;
162163
max-width: 360px;

client/assets/styles/scss/views/views-new-service.scss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
max-width: 330px;
1515
}
1616

17+
// for "name" form
18+
+ .label {
19+
margin-bottom: 0;
20+
}
21+
1722
.btn-radio {
1823
border-radius: $input-border-radius-lg;
1924
flex: 1 1 50%;
@@ -44,6 +49,15 @@
4449
}
4550
}
4651

52+
// for branch selector
53+
.btn-wrapped {
54+
@extend %btn-md;
55+
display: block;
56+
font-weight: 400;
57+
padding-left: 8px;
58+
width: 100%;
59+
}
60+
4761
// for the nested compose test file
4862
.well > .label {
4963
margin-bottom: 0;

client/directives/components/fancySelectors/branchSelector/branchSelectorView.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
fancy-select.btn-sm.white.btn-wrapped(
1+
fancy-select.white.btn-wrapped(
22
ng-disabled = "branchFetching || !state.repo.branches.models.length"
33
ng-required = "true"
44
on-update = "onBranchChange"

client/directives/components/newContainer/forms/configureNewServiceView.jade

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,15 @@ section.grid-block.vertical.modal-body(
5151
)
5252

5353
//- form for naming the environment
54-
form.grid-block.vertical.label(
54+
form.grid-block.vertical.label.label-name(
5555
name = "NCC.nameForm"
5656
ng-include = "'nameNewServiceView'"
5757
)
5858

59+
form.grid-block.vertical.label(
60+
ng-include = "'defaultBranchView'"
61+
)
62+
5963
.grid-block.vertical.views-kubernetes-setup(
6064
ng-if = "NCC.state.dockerFileTab === 'kubernetes'"
6165
ng-include = "'kubernetesSetupView'"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
label
2+
.padding-xxs.small.label-sm Branch
3+
div(
4+
auto-update = "true"
5+
branch-selector
6+
loading-promises-target = "editServerModal"
7+
state = "state"
8+
)
9+
small.padding-xxs.small Select the branch you want to add first.

0 commit comments

Comments
 (0)