Commit ab035a0e by AlasdairSwan

ECOM-531 updating grid column counts in media queries and added some more…

ECOM-531 updating grid column counts in media queries and added some more classes to style against instead of elements
parent 24a01ae3
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
.login-register { .login-register {
@include box-sizing(border-box); @include box-sizing(border-box);
@include outer-container; @include outer-container;
$grid-columns: 4;
background: white; background: white;
width: 100%; width: 100%;
...@@ -34,7 +35,7 @@ ...@@ -34,7 +35,7 @@
-webkit-text-fill-color: #333; -webkit-text-fill-color: #333;
} }
header { .header {
@include outer-container; @include outer-container;
border-bottom: 1px solid $gray-l4; border-bottom: 1px solid $gray-l4;
width: 100%; width: 100%;
...@@ -45,6 +46,7 @@ ...@@ -45,6 +46,7 @@
@include box-sizing(border-box); @include box-sizing(border-box);
@include span-columns(4); @include span-columns(4);
@include font-size(35); @include font-size(35);
padding: 0 10px;
font-family: $sans-serif; font-family: $sans-serif;
font-weight: $font-semibold; font-weight: $font-semibold;
text-align: left; text-align: left;
...@@ -56,20 +58,20 @@ ...@@ -56,20 +58,20 @@
@include box-sizing(border-box); @include box-sizing(border-box);
@include span-columns(4); @include span-columns(4);
@include font-size(24); @include font-size(24);
padding: 0 10px;
font-family: $sans-serif; font-family: $sans-serif;
font-weight: $font-regular; font-weight: $font-regular;
} }
} }
.form-toggle { .form-toggle {
margin: 0 10px; margin: 0;
} }
.form-type { .form-type {
padding-top: 25px;
padding-bottom: 25px;
@include box-sizing(border-box); @include box-sizing(border-box);
@include span-columns(4); @include span-columns(4);
padding: 25px 10px;
&:first-of-type { &:first-of-type {
border-bottom: 1px solid $gray-l4; border-bottom: 1px solid $gray-l4;
...@@ -83,7 +85,7 @@ ...@@ -83,7 +85,7 @@
padding-top: 25px; padding-top: 25px;
} }
.form-label { %bold-label {
@include font-size(16); @include font-size(16);
font-family: $sans-serif; font-family: $sans-serif;
font-weight: $font-semibold; font-weight: $font-semibold;
...@@ -91,10 +93,18 @@ ...@@ -91,10 +93,18 @@
text-transform: none; text-transform: none;
} }
.form-label {
@extend %bold-label;
padding: 0 0 0 5px;
}
.action-label {
@extend %bold-label;
}
.form-field { .form-field {
width: calc( 100% - 20px ); width: 100%;
margin: 0 0 $baseline 0; margin: 0 0 $baseline 0;
padding-left: 10px;
/** FROM _accounts.scss - start **/ /** FROM _accounts.scss - start **/
label, label,
...@@ -122,7 +132,13 @@ ...@@ -122,7 +132,13 @@
.field-link { .field-link {
position: relative; position: relative;
float: right float: right;
color: $link-color-d1;
font-weight: $font-regular;
text-decoration: none !important; // needed but nasty
font-family: $sans-serif;
font-size: 0.8em;
padding-top: 7px;
} }
input, input,
...@@ -161,7 +177,6 @@ ...@@ -161,7 +177,6 @@
width: 100%; width: 100%;
} }
.input-inline { .input-inline {
display: inline; display: inline;
} }
...@@ -176,27 +191,38 @@ ...@@ -176,27 +191,38 @@
.action-primary { .action-primary {
@extend %m-btn-primary; @extend %m-btn-primary;
width: calc( 100% - 20px ); width: 100%;
margin-left: 10px;
text-transform: none; text-transform: none;
} }
@include media( $tablet ) { @include media( $tablet ) {
header h1, $grid-columns: 8;
header p,
.headline,
.tagline,
.form-type { .form-type {
@include span-columns(6); @include span-columns(6);
@include shift(1); @include shift(1);
} }
.form-toggle {
margin-right: 5px;
}
} }
@include media( $desktop ) { @include media( $desktop ) {
header h1, $grid-columns: 12;
header p,
.headline,
.tagline,
.form-type { .form-type {
@include span-columns(6); @include span-columns(6);
@include shift(3); @include shift(3);
} }
.form-toggle {
margin-right: 10px;
}
} }
} }
......
<header class="js-login-register-header"> <header class="js-login-register-header header">
<h1 class="headline">Welcome!</h1> <h1 class="headline">Welcome!</h1>
<p class="tagline">Please log in to continue</p> <p class="tagline">Please log in to continue</p>
</header> </header>
......
<header> <header class="header">
<h1 class="headline">Password assistance</h1> <h1 class="headline">Password assistance</h1>
</header> </header>
<section class="form-type"> <section class="form-type">
<p class="action-label">Please enter your email address below and we will send you instructions for setting a new password.</p>
<div id="password-reset-form" class="form-wrapper"> <div id="password-reset-form" class="form-wrapper">
<p>Please enter your email address below and we will send you instructions for setting a new password.</p>
<form id="password-reset-form"> <form id="password-reset-form">
<div class="error-msg hidden"> <div class="error-msg hidden">
<h4>An error occured.</h4> <h4>An error occured.</h4>
......
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