Commit 5e5dccb6 authored by Denys Mishunov's avatar Denys Mishunov

Revert "Merge branch 'ps-update-startup-css' into 'master'"

This reverts merge request !62486
parent 9ad3af0f
...@@ -45,7 +45,6 @@ input[type='checkbox']:hover { ...@@ -45,7 +45,6 @@ input[type='checkbox']:hover {
margin: 0 8px; margin: 0 8px;
form { form {
display: block;
margin: 0; margin: 0;
padding: 4px; padding: 4px;
width: $search-input-width; width: $search-input-width;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
= favicon_link_tag favicon, id: 'favicon', data: { original_href: favicon }, type: 'image/png' = favicon_link_tag favicon, id: 'favicon', data: { original_href: favicon }, type: 'image/png'
= render 'layouts/startup_css', { startup_filename: local_assigns.fetch(:startup_filename, nil) } = render 'layouts/startup_css'
- if user_application_theme == 'gl-dark' - if user_application_theme == 'gl-dark'
= stylesheet_link_tag_defer "application_dark" = stylesheet_link_tag_defer "application_dark"
= yield :page_specific_styles = yield :page_specific_styles
......
- startup_filename_default = user_application_theme == 'gl-dark' ? 'dark' : 'general' - startup_filename = current_path?("sessions#new") ? 'signin' : user_application_theme == 'gl-dark' ? 'dark' : 'general'
- startup_filename = local_assigns.fetch(:startup_filename, nil) || startup_filename_default
%style %style
= Rails.application.assets_manifest.find_sources("themes/#{user_application_theme_css_filename}.css").first.to_s.html_safe if user_application_theme_css_filename = Rails.application.assets_manifest.find_sources("themes/#{user_application_theme_css_filename}.css").first.to_s.html_safe if user_application_theme_css_filename
......
!!! 5 !!! 5
%html.devise-layout-html{ class: system_message_class } %html.devise-layout-html{ class: system_message_class }
= render "layouts/head", { startup_filename: 'signin' } = render "layouts/head"
%body.ui-indigo.login-page.application.navless{ class: "#{client_class_list}", data: { page: body_data_page, qa_selector: 'login_page' } } %body.ui-indigo.login-page.application.navless{ class: "#{client_class_list}", data: { page: body_data_page, qa_selector: 'login_page' } }
= header_message = header_message
= render "layouts/init_client_detection_flags" = render "layouts/init_client_detection_flags"
......
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