diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-04-12 12:03:43 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-04-12 12:04:21 +0100 |
| commit | 73e6db84bd2395e84a4fa2ff15e7bbeb0cf1e40e (patch) | |
| tree | 1c7761c426b354391e0fc7433bd9ed83bd7d672c | |
| parent | 7457c1e1229cd1e90e608e8b247e2fbb217f05b6 (diff) | |
| download | gitlab-ce-73e6db84bd2395e84a4fa2ff15e7bbeb0cf1e40e.tar.gz | |
Replaces CSS with BS4 utility class
| -rw-r--r-- | app/assets/stylesheets/pages/pipeline_schedules.scss | 7 | ||||
| -rw-r--r-- | app/views/projects/pipeline_schedules/_form.html.haml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/59921-pipeline-schedule.yml | 5 |
3 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/pipeline_schedules.scss b/app/assets/stylesheets/pages/pipeline_schedules.scss index 617b3db2fae..85c4902eee2 100644 --- a/app/assets/stylesheets/pages/pipeline_schedules.scss +++ b/app/assets/stylesheets/pages/pipeline_schedules.scss @@ -1,9 +1,4 @@ -.js-pipeline-schedule-form { - .dropdown-select, - .dropdown-menu-toggle { - width: 100% !important; - } - +.pipeline-schedule-form { .gl-field-error { margin: 10px 0 0; } diff --git a/app/views/projects/pipeline_schedules/_form.html.haml b/app/views/projects/pipeline_schedules/_form.html.haml index 1121cf06b5c..396e5da87bc 100644 --- a/app/views/projects/pipeline_schedules/_form.html.haml +++ b/app/views/projects/pipeline_schedules/_form.html.haml @@ -1,4 +1,4 @@ -= form_for [@project.namespace.becomes(Namespace), @project, @schedule], as: :schedule, html: { id: "new-pipeline-schedule-form", class: "js-pipeline-schedule-form" } do |f| += form_for [@project.namespace.becomes(Namespace), @project, @schedule], as: :schedule, html: { id: "new-pipeline-schedule-form", class: "js-pipeline-schedule-form pipeline-schedule-form" } do |f| = form_errors(@schedule) .form-group.row .col-md-9 @@ -11,12 +11,12 @@ .form-group.row .col-md-9 = f.label :cron_timezone, _('Cron Timezone'), class: 'label-bold' - = dropdown_tag(_("Select a timezone"), options: { toggle_class: 'btn js-timezone-dropdown', title: _("Select a timezone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } ) + = dropdown_tag(_("Select a timezone"), options: { toggle_class: 'btn js-timezone-dropdown w-100', dropdown_class: 'w-100', title: _("Select a timezone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } ) = f.text_field :cron_timezone, value: @schedule.cron_timezone, id: 'schedule_cron_timezone', class: 'hidden', name: 'schedule[cron_timezone]', required: true .form-group.row .col-md-9 = f.label :ref, _('Target Branch'), class: 'label-bold' - = dropdown_tag(_("Select target branch"), options: { toggle_class: 'btn js-target-branch-dropdown', dropdown_class: 'git-revision-dropdown', title: _("Select target branch"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: @project.repository.branch_names, default_branch: @project.default_branch } } ) + = dropdown_tag(_("Select target branch"), options: { toggle_class: 'btn js-target-branch-dropdown w-100', dropdown_class: 'git-revision-dropdown w-100', title: _("Select target branch"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: @project.repository.branch_names, default_branch: @project.default_branch } } ) = f.text_field :ref, value: @schedule.ref, id: 'schedule_ref', class: 'hidden', name: 'schedule[ref]', required: true .form-group.row.js-ci-variable-list-section .col-md-9 diff --git a/changelogs/unreleased/59921-pipeline-schedule.yml b/changelogs/unreleased/59921-pipeline-schedule.yml new file mode 100644 index 00000000000..4227a047913 --- /dev/null +++ b/changelogs/unreleased/59921-pipeline-schedule.yml @@ -0,0 +1,5 @@ +--- +title: Replaces CSS with BS4 utility class for pipeline schedules +merge_request: +author: +type: other |