diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-08 21:09:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-08 21:09:19 +0300 |
| commit | 33ed90457e6c14d8344882efa01355c080e14149 (patch) | |
| tree | da22f262f096d619cbf79175bb54cd048a65f945 /app/assets/javascripts/feature_flags | |
| parent | e18e22ce4c7a4ee0680adda25e4cfa9cf4bb1be4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/feature_flags')
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/feature_flags/components/form.vue b/app/assets/javascripts/feature_flags/components/form.vue index 26da0d56f9a..ec5a241bb16 100644 --- a/app/assets/javascripts/feature_flags/components/form.vue +++ b/app/assets/javascripts/feature_flags/components/form.vue @@ -211,16 +211,16 @@ export default { </div> </fieldset> - <div class="form-actions"> + <div class="gl-mr-6"> <gl-button ref="submitButton" type="button" variant="confirm" - class="js-ff-submit col-xs-12" + class="js-ff-submit gl-mr-2" @click="handleSubmit" >{{ submitText }}</gl-button > - <gl-button :href="cancelPath" class="js-ff-cancel col-xs-12 float-right"> + <gl-button :href="cancelPath" class="js-ff-cancel"> {{ __('Cancel') }} </gl-button> </div> diff --git a/app/assets/javascripts/feature_flags/components/new_environments_dropdown.vue b/app/assets/javascripts/feature_flags/components/new_environments_dropdown.vue index 5575c6567b5..98982920121 100644 --- a/app/assets/javascripts/feature_flags/components/new_environments_dropdown.vue +++ b/app/assets/javascripts/feature_flags/components/new_environments_dropdown.vue @@ -72,7 +72,7 @@ export default { <span class="d-md-none mr-1"> {{ $options.translations.addEnvironmentsLabel }} </span> - <gl-icon class="d-none d-md-inline-flex" name="plus" /> + <gl-icon class="d-none d-md-inline-flex gl-mr-1" name="plus" /> </template> <gl-search-box-by-type ref="searchBox" diff --git a/app/assets/javascripts/feature_flags/components/strategy.vue b/app/assets/javascripts/feature_flags/components/strategy.vue index 3f515dcdf18..1d7a79f926a 100644 --- a/app/assets/javascripts/feature_flags/components/strategy.vue +++ b/app/assets/javascripts/feature_flags/components/strategy.vue @@ -176,7 +176,7 @@ export default { }}</label> <div class="gl-display-flex gl-flex-direction-column"> <div - class="gl-display-flex gl-flex-direction-column gl-md-flex-direction-row align-items-start gl-md-align-items-center" + class="gl-display-flex gl-flex-direction-column gl-md-flex-direction-row gl-md-align-items-center" > <new-environments-dropdown :id="environmentsDropdownId" |