Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
61143da0
Commit
61143da0
authored
Jan 06, 2021
by
Olena Horal-Koretska
Committed by
David O'Regan
Jan 06, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert incident_management_list.scss into page specific bundle
parent
d90d1f8e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
14 deletions
+20
-14
app/assets/stylesheets/_page_specific_files.scss
app/assets/stylesheets/_page_specific_files.scss
+0
-1
app/assets/stylesheets/page_bundles/incident_management_list.scss
...ts/stylesheets/page_bundles/incident_management_list.scss
+10
-7
app/views/projects/alert_management/index.html.haml
app/views/projects/alert_management/index.html.haml
+1
-0
app/views/projects/incidents/index.html.haml
app/views/projects/incidents/index.html.haml
+1
-0
app/views/projects/settings/operations/_alert_management.html.haml
.../projects/settings/operations/_alert_management.html.haml
+1
-0
config/application.rb
config/application.rb
+7
-6
No files found.
app/assets/stylesheets/_page_specific_files.scss
View file @
61143da0
...
...
@@ -10,7 +10,6 @@
@import
'./pages/events'
;
@import
'./pages/groups'
;
@import
'./pages/help'
;
@import
'./pages/incident_management_list'
;
@import
'./pages/issuable'
;
@import
'./pages/issues/issue_count_badge'
;
@import
'./pages/issues'
;
...
...
app/assets/stylesheets/pages/incident_management_list.scss
→
app/assets/stylesheets/page
_bundle
s/incident_management_list.scss
View file @
61143da0
@import
'mixins_and_variables_and_functions'
;
.incident-management-list
{
.new-alert
{
background-color
:
$issues-today-bg
;
background-color
:
var
(
--
green-50
,
$green-50
)
;
}
// these styles need to be deleted once GlTable component looks in GitLab same as in @gitlab/ui
table
{
@include
gl-text-gray-500
;
color
:
var
(
--
gray-500
,
$gray-500
)
;
tbody
{
tr
:not
(
.b-table-busy-slot
)
:not
(
.b-table-empty-row
)
{
...
...
@@ -34,7 +36,8 @@
th
{
@include
gl-bg-transparent
;
@include
gl-font-weight-bold
;
@include
gl-text-gray-400
;
color
:
var
(
--
gray-400
,
$gray-400
);
&
[
aria-sort
=
'none'
]
:hover
{
background-image
:
url('data:image/svg+xml, %3csvg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="4 0 8 16"%3e %3cpath style="fill: %23BABABA;" fill-rule="evenodd" d="M11.707085,11.7071 L7.999975,15.4142 L4.292875,11.7071 C3.902375,11.3166 3.902375, 10.6834 4.292875,10.2929 C4.683375,9.90237 5.316575,9.90237 5.707075,10.2929 L6.999975, 11.5858 L6.999975,2 C6.999975,1.44771 7.447695,1 7.999975,1 C8.552255,1 8.999975,1.44771 8.999975,2 L8.999975,11.5858 L10.292865,10.2929 C10.683395 ,9.90237 11.316555,9.90237 11.707085,10.2929 C12.097605,10.6834 12.097605,11.3166 11.707085,11.7071 Z"/%3e %3c/svg%3e')
;
...
...
@@ -67,7 +70,7 @@
}
&
:hover
{
@include
gl-bg-white
;
background-color
:
var
(
--
white
,
$white
)
;
@include
gl-border-none
;
}
...
...
@@ -80,7 +83,7 @@
&
.alert-management-table
{
.table-col
{
&
:last-child
{
@include
gl-bg-gray-10
;
background-color
:
var
(
--
gray-10
,
$gray-10
)
;
&
:
:
before
{
content
:
none
!
important
;
...
...
@@ -120,12 +123,12 @@
@include
gl-border-b-0
;
.gl-tab-nav-item
{
@include
gl-text-gray-500
;
color
:
var
(
--
gray-500
,
$gray-500
)
;
>
.gl-tab-counter-badge
{
@include
gl-reset-color
;
@include
gl-font-sm
;
@include
gl-bg-gray-50
;
background-color
:
var
(
--
gray-50
,
$gray-50
)
;
}
}
}
...
...
app/views/projects/alert_management/index.html.haml
View file @
61143da0
-
page_title
_
(
'Alerts'
)
-
add_page_specific_style
'page_bundles/incident_management_list'
#js-alert_management
{
data:
alert_management_data
(
@current_user
,
@project
)
}
app/views/projects/incidents/index.html.haml
View file @
61143da0
-
page_title
_
(
'Incidents'
)
-
add_page_specific_style
'page_bundles/incident_management_list'
#js-incidents
{
data:
incidents_data
(
@project
,
params
)
}
app/views/projects/settings/operations/_alert_management.html.haml
View file @
61143da0
-
return
unless
can?
(
current_user
,
:admin_operations
,
@project
)
-
expanded
=
expanded_by_default?
-
add_page_specific_style
'page_bundles/alert_management_settings'
-
add_page_specific_style
'page_bundles/incident_management_list'
%section
.settings.no-animate
#js-alert-management-settings
{
class:
(
'expanded'
if
expanded
)
}
.settings-header
...
...
config/application.rb
View file @
61143da0
...
...
@@ -177,6 +177,7 @@ module Gitlab
config
.
assets
.
precompile
<<
"mailers/*.css"
config
.
assets
.
precompile
<<
"page_bundles/_mixins_and_variables_and_functions.css"
config
.
assets
.
precompile
<<
"page_bundles/alert_management_details.css"
config
.
assets
.
precompile
<<
"page_bundles/alert_management_settings.css"
config
.
assets
.
precompile
<<
"page_bundles/boards.css"
config
.
assets
.
precompile
<<
"page_bundles/build.css"
config
.
assets
.
precompile
<<
"page_bundles/ci_status.css"
...
...
@@ -186,29 +187,29 @@ module Gitlab
config
.
assets
.
precompile
<<
"page_bundles/epics.css"
config
.
assets
.
precompile
<<
"page_bundles/error_tracking_details.css"
config
.
assets
.
precompile
<<
"page_bundles/error_tracking_index.css"
config
.
assets
.
precompile
<<
"page_bundles/signup.css"
config
.
assets
.
precompile
<<
"page_bundles/ide.css"
config
.
assets
.
precompile
<<
"page_bundles/import.css"
config
.
assets
.
precompile
<<
"page_bundles/incident_management_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_users.css"
config
.
assets
.
precompile
<<
"page_bundles/merge_conflicts.css"
config
.
assets
.
precompile
<<
"page_bundles/merge_requests.css"
config
.
assets
.
precompile
<<
"page_bundles/milestone.css"
config
.
assets
.
precompile
<<
"page_bundles/oncall_schedules.css"
config
.
assets
.
precompile
<<
"page_bundles/pipeline.css"
config
.
assets
.
precompile
<<
"page_bundles/pipelines.css"
config
.
assets
.
precompile
<<
"page_bundles/pipeline_schedules.css"
config
.
assets
.
precompile
<<
"page_bundles/pipelines.css"
config
.
assets
.
precompile
<<
"page_bundles/productivity_analytics.css"
config
.
assets
.
precompile
<<
"page_bundles/profile_two_factor_auth.css"
config
.
assets
.
precompile
<<
"page_bundles/reports.css"
config
.
assets
.
precompile
<<
"page_bundles/roadmap.css"
config
.
assets
.
precompile
<<
"page_bundles/security_dashboard.css"
config
.
assets
.
precompile
<<
"page_bundles/signup.css"
config
.
assets
.
precompile
<<
"page_bundles/terminal.css"
config
.
assets
.
precompile
<<
"page_bundles/todos.css"
config
.
assets
.
precompile
<<
"page_bundles/reports.css"
config
.
assets
.
precompile
<<
"page_bundles/roadmap.css"
config
.
assets
.
precompile
<<
"page_bundles/wiki.css"
config
.
assets
.
precompile
<<
"page_bundles/xterm.css"
config
.
assets
.
precompile
<<
"page_bundles/alert_management_settings.css"
config
.
assets
.
precompile
<<
"page_bundles/oncall_schedules.css"
config
.
assets
.
precompile
<<
"lazy_bundles/cropper.css"
config
.
assets
.
precompile
<<
"lazy_bundles/select2.css"
config
.
assets
.
precompile
<<
"performance_bar.css"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment