Commit 4be7c8d6 authored by Sarah Groff Hennigh-Palermo's avatar Sarah Groff Hennigh-Palermo

Merge branch '239795-convert-stylesheets-pages-boards-scss-into-page-specific-bundle' into 'master'

Convert stylesheets/pages/boards.scss into page specific bundle

Closes #239795

See merge request gitlab-org/gitlab!42795
parents 5f8f8461 ec0762e4
...@@ -188,7 +188,7 @@ export default { ...@@ -188,7 +188,7 @@ export default {
<h3 <h3
:class="{ :class="{
'user-can-drag': !disabled && !list.preset, 'user-can-drag': !disabled && !list.preset,
'gl-py-3 gl-h-full': !list.isExpanded && !isSwimlanesHeader, 'gl-py-3 gl-h-full!': !list.isExpanded && !isSwimlanesHeader,
'gl-border-b-0': !list.isExpanded || isSwimlanesHeader, 'gl-border-b-0': !list.isExpanded || isSwimlanesHeader,
'gl-py-2': !list.isExpanded && isSwimlanesHeader, 'gl-py-2': !list.isExpanded && isSwimlanesHeader,
}" }"
......
@import './pages/admin'; @import './pages/admin';
@import './pages/alert_management/details'; @import './pages/alert_management/details';
@import './pages/alert_management/severity-icons'; @import './pages/alert_management/severity-icons';
@import './pages/boards';
@import './pages/branches'; @import './pages/branches';
@import './pages/builds'; @import './pages/builds';
@import './pages/ci_projects'; @import './pages/ci_projects';
......
@import 'mixins_and_variables_and_functions';
.user-can-drag { .user-can-drag {
cursor: grab; cursor: grab;
} }
...@@ -356,8 +358,6 @@ ...@@ -356,8 +358,6 @@
} }
.avatar { .avatar {
margin: 0;
@include media-breakpoint-down(md) { @include media-breakpoint-down(md) {
width: $gl-padding; width: $gl-padding;
height: $gl-padding; height: $gl-padding;
......
.user-can-drag {
cursor: grab;
}
.is-ghost {
opacity: 0.3;
pointer-events: none;
}
...@@ -2,6 +2,7 @@ ...@@ -2,6 +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')
= stylesheet_link_tag 'page_bundles/issues'
= 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")
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
- 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)
= stylesheet_link_tag '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
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
- @content_class = "issue-boards-content js-focus-mode-board" - @content_class = "issue-boards-content js-focus-mode-board"
- breadcrumb_title _("Issue Boards") - breadcrumb_title _("Issue Boards")
- page_title("#{board.name}", _("Boards")) - page_title("#{board.name}", _("Boards"))
= stylesheet_link_tag 'page_bundles/boards'
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
......
...@@ -184,7 +184,9 @@ module Gitlab ...@@ -184,7 +184,9 @@ module Gitlab
config.assets.precompile << "notify.css" config.assets.precompile << "notify.css"
config.assets.precompile << "mailers/*.css" config.assets.precompile << "mailers/*.css"
config.assets.precompile << "page_bundles/_mixins_and_variables_and_functions.css" config.assets.precompile << "page_bundles/_mixins_and_variables_and_functions.css"
config.assets.precompile << "page_bundles/boards.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/jira_connect.css" config.assets.precompile << "page_bundles/jira_connect.css"
config.assets.precompile << "page_bundles/todos.css" config.assets.precompile << "page_bundles/todos.css"
config.assets.precompile << "page_bundles/xterm.css" config.assets.precompile << "page_bundles/xterm.css"
......
...@@ -140,7 +140,7 @@ export default { ...@@ -140,7 +140,7 @@ export default {
<template> <template>
<div <div
class="board gl-px-3 gl-vertical-align-top gl-white-space-normal gl-display-flex gl-flex-shrink-0" class="board gl-px-3 gl-vertical-align-top gl-white-space-normal gl-display-flex! gl-flex-shrink-0"
:class="{ 'is-collapsed': !list.isExpanded }" :class="{ 'is-collapsed': !list.isExpanded }"
> >
<div class="board-inner gl-rounded-base gl-relative gl-w-full"> <div class="board-inner gl-rounded-base gl-relative gl-w-full">
......
...@@ -12,6 +12,11 @@ ...@@ -12,6 +12,11 @@
} }
} }
.is-ghost {
opacity: 0.3;
pointer-events: none;
}
.epic-discussion-separator { .epic-discussion-separator {
border-color: $border-color; border-color: $border-color;
} }
......
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