Commit 37b4a3e1 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch...

Merge branch '239831-convert-stylesheets-pages-experimental_separate_sign_up-scss-into-page-specific-bundle' into 'master'

Convert experimental_separate_sign_up.scss into page specific bundle

See merge request gitlab-org/gitlab!44760
parents edaacb2e 5e58f562
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
@import './pages/editor'; @import './pages/editor';
@import './pages/environment_logs'; @import './pages/environment_logs';
@import './pages/events'; @import './pages/events';
@import './pages/experience_level';
@import './pages/experimental_separate_sign_up';
@import './pages/groups'; @import './pages/groups';
@import './pages/help'; @import './pages/help';
@import './pages/import'; @import './pages/import';
......
@import 'mixins_and_variables_and_functions';
.signup-page { .signup-page {
.page-wrap { .page-wrap {
background-color: $gray-light; background-color: var(--gray-10, $gray-10);
} }
.signup-box-container { .signup-box-container {
...@@ -8,22 +10,22 @@ ...@@ -8,22 +10,22 @@
} }
.signup-box { .signup-box {
background-color: $white; background-color: var(--white, $white);
box-shadow: 0 0 0 1px $border-color; box-shadow: 0 0 0 1px var(--border-color, $border-color);
border-radius: $border-radius; border-radius: $border-radius;
} }
.form-control { .form-control {
&:active, &:active,
&:focus { &:focus {
background-color: $white; background-color: var(--white, $white);
} }
} }
.devise-errors { .devise-errors {
h2 { h2 {
font-size: $gl-font-size; font-size: $gl-font-size;
color: $red-700; color: var(--red-700, $red-700);
} }
} }
...@@ -32,7 +34,7 @@ ...@@ -32,7 +34,7 @@
&::after { &::after {
content: ''; content: '';
flex: 1; flex: 1;
border-bottom: 1px solid $gray-dark; border-bottom: 1px solid var(--gray-100, $gray-100);
margin: $gl-padding-24 0; margin: $gl-padding-24 0;
} }
...@@ -62,3 +64,33 @@ ...@@ -62,3 +64,33 @@
width: 350px; width: 350px;
} }
} }
.signup-page[data-page^='registrations:experience_levels'] {
$card-shadow-color: rgba(var(--black, $black), 0.2);
.page-wrap {
background-color: var(--white, $white);
}
.card-deck {
max-width: 828px;
}
.card {
transition: box-shadow 0.3s ease-in-out;
}
.card:hover {
box-shadow: 0 $gl-spacing-scale-3 $gl-spacing-scale-5 $card-shadow-color;
}
@media (min-width: $breakpoint-sm) {
.card-deck .card {
margin: 0 $gl-spacing-scale-3;
}
}
.stretched-link:hover {
text-decoration: none;
}
}
.signup-page[data-page^='registrations:experience_levels'] {
$card-shadow-color: rgba($black, 0.2);
.page-wrap {
background-color: $white;
}
.card-deck {
max-width: 828px;
}
.card {
transition: box-shadow 0.3s ease-in-out;
}
.card:hover {
box-shadow: 0 $gl-spacing-scale-3 $gl-spacing-scale-5 $card-shadow-color;
}
@media (min-width: $breakpoint-sm) {
.card-deck .card {
margin: 0 $gl-spacing-scale-3;
}
}
.stretched-link:hover {
text-decoration: none;
}
}
!!! 5 !!! 5
%html.devise-layout-html.navless{ class: system_message_class } %html.devise-layout-html.navless{ class: system_message_class }
- add_page_specific_style 'page_bundles/experimental_separate_sign_up'
= render "layouts/head" = render "layouts/head"
%body.ui-indigo.signup-page{ class: "#{client_class_list}", data: { page: body_data_page, qa_selector: 'signup_page' } } %body.ui-indigo.signup-page{ class: "#{client_class_list}", data: { page: body_data_page, qa_selector: 'signup_page' } }
= render "layouts/header/logo_with_title" = render "layouts/header/logo_with_title"
......
!!! 5 !!! 5
%html.devise-layout-html.navless{ class: system_message_class } %html.devise-layout-html.navless{ class: system_message_class }
- add_page_specific_style 'page_bundles/experimental_separate_sign_up'
= render "layouts/head" = render "layouts/head"
%body.ui-indigo.signup-page{ class: "#{client_class_list}", data: { page: body_data_page, qa_selector: 'signup_page' } } %body.ui-indigo.signup-page{ class: "#{client_class_list}", data: { page: body_data_page, qa_selector: 'signup_page' } }
= render "layouts/header/logo_with_title" = render "layouts/header/logo_with_title"
......
...@@ -179,6 +179,7 @@ module Gitlab ...@@ -179,6 +179,7 @@ module Gitlab
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/error_tracking_details.css"
config.assets.precompile << "page_bundles/error_tracking_index.css" config.assets.precompile << "page_bundles/error_tracking_index.css"
config.assets.precompile << "page_bundles/experimental_separate_sign_up.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