diff options
author | Phil Hughes <me@iamphill.com> | 2019-07-16 10:42:02 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-07-16 10:42:02 +0300 |
commit | e38a3bba1b32754a11e805093f306135beee55dd (patch) | |
tree | da45dec863efcaf14021695dab6f818eee5aeaeb /app | |
parent | ede3b6a281bf539e63e2ff0eb7a3af7309463eb7 (diff) | |
parent | bad9d118806eb9a575cf6a5b20f530bf00826892 (diff) |
Merge branch '59875-stylelint-panels' into 'master'
Fixed style-lint errors for `panels.scss`
Closes #59875
See merge request gitlab-org/gitlab-ce!30748
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/panels.scss | 1 | ||||
-rw-r--r-- | app/views/projects/new.html.haml | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue b/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue index 6d908524da9..f0112a5a623 100644 --- a/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue +++ b/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue @@ -65,7 +65,7 @@ export default { <template> <div v-if="isFetchingMergeRequests || (!isFetchingMergeRequests && totalCount)"> - <div id="merge-requests" class="card-slim mt-3"> + <div id="merge-requests" class="card card-slim mt-3"> <div class="card-header"> <div class="card-title mt-0 mb-0 h5 merge-requests-title"> <span class="mr-1"> diff --git a/app/assets/stylesheets/framework/panels.scss b/app/assets/stylesheets/framework/panels.scss index cd3d6f8297e..d9c93fed1c4 100644 --- a/app/assets/stylesheets/framework/panels.scss +++ b/app/assets/stylesheets/framework/panels.scss @@ -3,7 +3,6 @@ } .card-slim { - @extend .card; margin-bottom: $gl-vert-padding; } diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 33de0aa153b..6eb7a124a5d 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -51,7 +51,7 @@ = render 'new_project_fields', f: f, project_name_id: "blank-project-name" #create-from-template-pane.tab-pane.js-toggle-container.px-0.pb-0{ class: active_when(active_tab == 'template'), role: 'tabpanel' } - .card-slim.m-4.p-4 + .card.card-slim.m-4.p-4 %div - contributing_templates_url = 'https://gitlab.com/gitlab-org/project-templates/contributing' - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: contributing_templates_url } |