Commit c2f0c989 authored by Simon Knox's avatar Simon Knox

Merge branch '239841-extract-jira-issue-list-scss' into 'master'

Convert stylesheets/pages/issues/issue_list.scss into page specific

See merge request gitlab-org/gitlab!43241
parents 811e9a95 75befb61
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
@import './pages/incident_management_list'; @import './pages/incident_management_list';
@import './pages/issuable'; @import './pages/issuable';
@import './pages/issues/issue_count_badge'; @import './pages/issues/issue_count_badge';
@import './pages/issues/issues_list';
@import './pages/issues'; @import './pages/issues';
@import './pages/labels'; @import './pages/labels';
@import './pages/login'; @import './pages/login';
......
.user-can-drag {
cursor: grab;
}
.is-ghost {
opacity: 0.3;
pointer-events: none;
}
@import 'mixins_and_variables_and_functions';
.issues-list {
&.manual-ordering {
background-color: var(--gray-10, $gray-10);
border-radius: $border-radius-default;
padding: $gl-padding-8;
.issue {
background-color: var(--white, $white);
margin-bottom: $gl-padding-8;
border-radius: $border-radius-default;
border: 1px solid var(--border-color, $border-color);
box-shadow: 0 1px 2px $issue-boards-card-shadow;
}
}
.issue {
padding: 10px $gl-padding;
position: relative;
.title {
margin-bottom: 2px;
}
.issue-labels,
.author-link {
display: inline-block;
}
.icon-merge-request-unmerged {
height: 13px;
margin-bottom: 3px;
}
}
}
.issuable-list-root {
.gl-label-link {
text-decoration: none;
&:hover {
color: inherit;
}
}
}
.svg-container.jira-logo-container {
svg {
vertical-align: text-bottom;
}
}
.user-can-drag {
cursor: grab;
}
.is-ghost {
opacity: 0.3;
pointer-events: none;
}
.issues-list {
&.manual-ordering {
background-color: $gray-light;
border-radius: $border-radius-default;
padding: $gl-padding-8;
.issue {
background-color: $white;
margin-bottom: $gl-padding-8;
border-radius: $border-radius-default;
border: 1px solid $gray-100;
box-shadow: 0 1px 2px $issue-boards-card-shadow;
}
}
.issue {
padding: 10px $gl-padding;
position: relative;
.title {
margin-bottom: 2px;
}
.issue-labels,
.author-link {
display: inline-block;
}
.icon-merge-request-unmerged {
height: 13px;
margin-bottom: 3px;
}
}
}
.issue-realtime-pre-pulse { .issue-realtime-pre-pulse {
opacity: 0; opacity: 0;
} }
...@@ -369,13 +334,3 @@ ul.related-merge-requests > li { ...@@ -369,13 +334,3 @@ ul.related-merge-requests > li {
.issuable-header-slide-leave-to { .issuable-header-slide-leave-to {
transform: translateY(-100%); transform: translateY(-100%);
} }
.issuable-list-root {
.gl-label-link {
text-decoration: none;
&:hover {
color: inherit;
}
}
}
.svg-container.jira-logo-container {
svg {
vertical-align: text-bottom;
}
}
- @can_bulk_update = can?(current_user, :admin_issue, @group) && @group.feature_available?(:group_bulk_edit) - @can_bulk_update = can?(current_user, :admin_issue, @group) && @group.feature_available?(:group_bulk_edit)
- page_title _("Issues") - page_title _("Issues")
- add_page_specific_style 'page_bundles/issues_list'
= content_for :meta_tags do = content_for :meta_tags do
= auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{@group.name} issues") = auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{@group.name} issues")
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- page_title _("Issues") - page_title _("Issues")
- new_issue_email = @project.new_issuable_address(current_user, 'issue') - new_issue_email = @project.new_issuable_address(current_user, 'issue')
- add_page_specific_style 'page_bundles/issues' - add_page_specific_style 'page_bundles/issues_list'
= content_for :meta_tags do = content_for :meta_tags do
= auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{@project.name} issues") = auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{@project.name} issues")
......
- @can_bulk_update = false - @can_bulk_update = false
- page_title _("Service Desk") - page_title _("Service Desk")
- add_page_specific_style 'page_bundles/issues_list'
- content_for :breadcrumbs_extra do - content_for :breadcrumbs_extra do
= render "projects/issues/nav_btns", show_export_button: false, show_rss_button: false = render "projects/issues/nav_btns", show_export_button: false, show_rss_button: false
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
- can_report_spam = @issue.submittable_as_spam_by?(current_user) - can_report_spam = @issue.submittable_as_spam_by?(current_user)
- can_create_issue = show_new_issue_link?(@project) - can_create_issue = show_new_issue_link?(@project)
- related_branches_path = related_branches_project_issue_path(@project, @issue) - related_branches_path = related_branches_project_issue_path(@project, @issue)
- add_page_specific_style 'page_bundles/issues'
= render_if_exists "projects/issues/alert_blocked", issue: @issue, current_user: current_user = render_if_exists "projects/issues/alert_blocked", issue: @issue, current_user: current_user
= render "projects/issues/alert_moved_from_service_desk", issue: @issue = render "projects/issues/alert_moved_from_service_desk", issue: @issue
......
...@@ -189,7 +189,7 @@ module Gitlab ...@@ -189,7 +189,7 @@ module Gitlab
config.assets.precompile << "page_bundles/boards.css" config.assets.precompile << "page_bundles/boards.css"
config.assets.precompile << "page_bundles/cycle_analytics.css" config.assets.precompile << "page_bundles/cycle_analytics.css"
config.assets.precompile << "page_bundles/ide.css" config.assets.precompile << "page_bundles/ide.css"
config.assets.precompile << "page_bundles/issues.css" config.assets.precompile << "page_bundles/issues_list.css"
config.assets.precompile << "page_bundles/jira_connect.css" config.assets.precompile << "page_bundles/jira_connect.css"
config.assets.precompile << "page_bundles/milestone.css" config.assets.precompile << "page_bundles/milestone.css"
config.assets.precompile << "page_bundles/todos.css" config.assets.precompile << "page_bundles/todos.css"
......
- page_title _('Jira Issues') - page_title _('Jira Issues')
- add_page_specific_style 'page_bundles/issues_list'
.top-area.gl-border-b-0.gl-mt-6 .top-area.gl-border-b-0.gl-mt-6
= render 'shared/issuable/nav', type: :issues, display_count: false = render 'shared/issuable/nav', type: :issues, display_count: false
......
- page_title _('Requirements') - page_title _('Requirements')
- add_page_specific_style 'page_bundles/issues_list'
- @content_wrapper_class = 'js-requirements-container-wrapper' - @content_wrapper_class = 'js-requirements-container-wrapper'
- @content_class = 'requirements-container' - @content_class = 'requirements-container'
......
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