Commit 04337741 authored by Vitaly Slobodin's avatar Vitaly Slobodin

Merge branch...

Merge branch '268016-convert-ee-app-assets-stylesheets-pages-productivity_analytics-scss-into-page-specific-bundle' into 'master'

Convert productivity_analytics.scss into page specific bundle

See merge request gitlab-org/gitlab!45366
parents 0fe02c5d b95c3885
......@@ -189,6 +189,7 @@ module Gitlab
config.assets.precompile << "page_bundles/milestone.css"
config.assets.precompile << "page_bundles/pipeline.css"
config.assets.precompile << "page_bundles/pipelines.css"
config.assets.precompile << "page_bundles/productivity_analytics.css"
config.assets.precompile << "page_bundles/todos.css"
config.assets.precompile << "page_bundles/reports.css"
config.assets.precompile << "page_bundles/xterm.css"
......
@import 'page_bundles/mixins_and_variables_and_functions';
.dropdown-container {
flex: 0 0 25%;
width: 25%;
......@@ -121,7 +123,7 @@
.mr-title {
a {
color: $gl-text-color;
color: var(--gl-text-color, $gl-text-color);
}
}
}
- page_title _('Productivity Analytics')
- add_page_specific_style 'page_bundles/productivity_analytics'
- data_attributes = @request_params.valid? ? @request_params.to_data_attributes : @request_params.to_default_data_attributes
#js-productivity-analytics{ data: data_attributes.merge(hide_group_drop_down: 'true') }
......
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