Commit 437a0caa authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch...

Merge branch '239826-convert-stylesheets-pages-error_details-scss-into-page-specific-bundle' into 'master'

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

See merge request gitlab-org/gitlab!44750
parents 021ec839 2e6b428e
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
@import './pages/diff'; @import './pages/diff';
@import './pages/editor'; @import './pages/editor';
@import './pages/environment_logs'; @import './pages/environment_logs';
@import './pages/error_details';
@import './pages/error_list'; @import './pages/error_list';
@import './pages/error_tracking_list'; @import './pages/error_tracking_list';
@import './pages/events'; @import './pages/events';
......
@import 'page_bundles/mixins_and_variables_and_functions';
.error-details { .error-details {
li { li {
@include gl-line-height-32; @include gl-line-height-32;
} }
.btn-outline-info { .btn-outline-info {
color: $blue-500; color: var(--blue-500, $blue-500);
border-color: $blue-500; border-color: var(--blue-500, $blue-500);
} }
.error-details-header { .error-details-header {
border-bottom: 1px solid $border-color; border-bottom: 1px solid var(--border-color, $border-color);
@include media-breakpoint-down(xs) { @include media-breakpoint-down(xs) {
flex-flow: column; flex-flow: column;
......
- page_title _('Error Details') - page_title _('Error Details')
- add_to_breadcrumbs 'Errors', project_error_tracking_index_path(@project) - add_to_breadcrumbs 'Errors', project_error_tracking_index_path(@project)
- add_page_specific_style 'page_bundles/error_tracking_details'
#js-error_details{ data: error_details_data(@project, @issue_id) } #js-error_details{ data: error_details_data(@project, @issue_id) }
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
- page_card_attributes @issue.card_attributes - page_card_attributes @issue.card_attributes
- if @issue.relocation_target - if @issue.relocation_target
- page_canonical_link @issue.relocation_target.present(current_user: current_user).web_url - page_canonical_link @issue.relocation_target.present(current_user: current_user).web_url
- if @issue.sentry_issue.present?
- add_page_specific_style 'page_bundles/error_tracking_details'
- can_update_issue = can?(current_user, :update_issue, @issue) - can_update_issue = can?(current_user, :update_issue, @issue)
- can_reopen_issue = can?(current_user, :reopen_issue, @issue) - can_reopen_issue = can?(current_user, :reopen_issue, @issue)
......
...@@ -176,6 +176,7 @@ module Gitlab ...@@ -176,6 +176,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/environments.css" config.assets.precompile << "page_bundles/environments.css"
config.assets.precompile << "page_bundles/error_tracking_details.css"
config.assets.precompile << "page_bundles/ide.css" config.assets.precompile << "page_bundles/ide.css"
config.assets.precompile << "page_bundles/issues_list.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"
......
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