Commit 334347fe authored by Luke "Jared" Bennett's avatar Luke "Jared" Bennett

Frontend review changes

parent 67fde388
...@@ -68,8 +68,10 @@ label { ...@@ -68,8 +68,10 @@ label {
} }
} }
.help-form { .help-form .form-group {
.form-group { margin-left: 0;
margin-right: 0;
.control-label { .control-label {
font-weight: bold; font-weight: bold;
padding-top: 4px; padding-top: 4px;
...@@ -104,7 +106,6 @@ label { ...@@ -104,7 +106,6 @@ label {
padding-left: 0; padding-left: 0;
} }
} }
}
} }
.fieldset-form fieldset { .fieldset-form fieldset {
......
...@@ -20,3 +20,7 @@ ...@@ -20,3 +20,7 @@
.danger-title { .danger-title {
color: $gl-danger; color: $gl-danger;
} }
.service-settings .control-label {
padding-top: 0;
}
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
- run_actions_text = "Perform common operations on this project: #{pretty_path_with_namespace}" - run_actions_text = "Perform common operations on this project: #{pretty_path_with_namespace}"
.well .well
%p
This service allows GitLab users to perform common operations on this This service allows GitLab users to perform common operations on this
project by entering slash commands in Mattermost. project by entering slash commands in Mattermost.
%p %br
See list of available commands in Mattermost after setting up this service, See list of available commands in Mattermost after setting up this service,
by entering by entering
%code /<command_trigger_word> help %code /<command_trigger_word> help
%p %br
%br
To setup this service: To setup this service:
%ul.list-unstyled %ul.list-unstyled
%li %li
......
...@@ -7,12 +7,13 @@ ...@@ -7,12 +7,13 @@
= preserve do = preserve do
= markdown @service.help = markdown @service.help
.form-group .service-settings
.form-group
= form.label :active, "Active", class: "control-label" = form.label :active, "Active", class: "control-label"
.col-sm-10 .col-sm-10
= form.check_box :active = form.check_box :active
- if @service.supported_events.present? - if @service.supported_events.present?
.form-group .form-group
= form.label :url, "Trigger", class: 'control-label' = form.label :url, "Trigger", class: 'control-label'
...@@ -34,7 +35,7 @@ ...@@ -34,7 +35,7 @@
%p.light %p.light
= service_event_description(event) = service_event_description(event)
- @service.global_fields.each do |field| - @service.global_fields.each do |field|
- type = field[:type] - type = field[:type]
- if type == 'fieldset' - if type == 'fieldset'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment