diff --git a/cms/static/sass/_account.scss b/cms/static/sass/_account.scss new file mode 100644 index 0000000000..b04f4fb13d --- /dev/null +++ b/cms/static/sass/_account.scss @@ -0,0 +1,223 @@ +// login and sign up UI +.signup, .signin { + + .wrapper-content { + margin: 0; + padding: 0 $baseline; + position: relative; + width: 100%; + } + + .content { + @include clearfix(); + @include font-size(16); + max-width: $fg-max-width; + min-width: $fg-min-width; + width: flex-grid(12); + margin: 0 auto; + color: $gray-d2; + + header { + position: relative; + margin-bottom: ($baseline/2); + border-bottom: 1px solid $gray-l4; + padding-bottom: ($baseline/2); + + h1 { + @include font-size(32); + float: none; + margin: 0; + padding: 0; + font-weight: 600; + } + + .action { + @include font-size(13); + position: absolute; + right: 0; + top: 40%; + } + } + + .introduction { + @include font-size(14); + margin: 0 0 $baseline 0; + } + } + + .content-primary, .content-supplementary { + @include box-sizing(border-box); + float: left; + } + + .content-primary { + width: flex-grid(7, 12); + margin-right: flex-gutter(); + + form { + @include box-sizing(border-box); + @include box-shadow(0 1px 2px $shadow-l1); + @include border-radius(2px); + width: 100%; + border: 1px solid $gray-l2; + padding: $baseline ($baseline*1.5); + background: $white; + + .form-actions { + margin-top: $baseline; + + .action-primary { + @include blue-button; + @include transition(all .15s); + @include font-size(15); + display:block; + width: 100%; + padding: ($baseline*0.75) ($baseline/2); + font-weight: 600 !important; + text-transform: uppercase; + } + } + + .list-input { + margin: 0; + padding: 0; + list-style: none; + + .field { + margin: 0 0 ($baseline*0.75) 0; + + &:last-child { + margin-bottom: 0; + } + + &.required { + + label { + font-weight: 600; + } + + label:after { + margin-left: ($baseline/4); + content: "*"; + } + } + + label, input, textarea { + display: block; + } + + label { + @include font-size(14); + @include transition(color, 0.15s, ease-in-out); + margin: 0 0 ($baseline/4) 0; + + &.is-focused { + color: $blue; + } + } + + input, textarea { + @include font-size(16); + height: 100%; + width: 100%; + padding: ($baseline/2); + + &.long { + width: 100%; + } + + &.short { + width: 25%; + } + } + + textarea.long { + height: ($baseline*5); + } + + input[type="checkbox"] { + display: inline-block; + margin-right: ($baseline/4); + width: auto; + height: auto; + + & + label { + display: inline-block; + } + } + + .tip { + @include font-size(13); + display: block; + margin-top: ($baseline/4); + color: $gray-l3; + } + } + + .field-group { + @include clearfix(); + margin: 0 0 ($baseline/2) 0; + + .field { + display: block; + width: 47%; + border-bottom: none; + margin: 0 $baseline 0 0; + padding-bottom: 0; + + &:nth-child(odd) { + float: left; + } + + &:nth-child(even) { + float: right; + margin-right: 0; + } + + input, textarea { + width: 100%; + } + } + } + } + } + } + + .content-supplementary { + width: flex-grid(4, 12); + + .bit { + @include font-size(13); + margin: 0 0 $baseline 0; + border-bottom: 1px solid $gray-l4; + padding: 0 0 $baseline 0; + color: $gray-l1; + + &:last-child { + margin-bottom: 0; + border: none; + padding-bottom: 0; + } + + h3 { + @include font-size(14); + margin: 0 0 ($baseline/4) 0; + color: $gray-d2; + font-weight: 600; + } + + } + } +} + +.signup { + + +} + +.signin { + + +} + +// @include transition(all 1s ease-in-out); \ No newline at end of file diff --git a/cms/static/sass/_footer.scss b/cms/static/sass/_footer.scss index 888959bc59..f15eb1c54a 100644 --- a/cms/static/sass/_footer.scss +++ b/cms/static/sass/_footer.scss @@ -1,46 +1,48 @@ -// footer +//studio global footer .wrapper-footer { margin: ($baseline*1.5) 0 $baseline 0; padding: $baseline; position: relative; width: 100%; -} -footer { - @include clearfix(); - @include font-size(13); - width: flex-grid(12); - margin: 0 auto; - padding-top: $baseline; - border-top: 1px solid $gray-l4; - color: $gray; + footer { + @include clearfix(); + @include font-size(13); + max-width: $fg-max-width; + min-width: $fg-min-width; + width: flex-grid(12); + margin: 0 auto; + padding-top: $baseline; + border-top: 1px solid $gray-l4; + color: $gray-l2; - .colophon { - width: flex-grid(4, 12); - float: left; - margin-right: flex-gutter(2); - } + .colophon { + width: flex-grid(4, 12); + float: left; + margin-right: flex-gutter(2); + } - .nav-peripheral { - width: flex-grid(6, 12); - float: right; - text-align: right; + .nav-peripheral { + width: flex-grid(6, 12); + float: right; + text-align: right; - .nav-item { - display: inline-block; - margin-right: $baseline; + .nav-item { + display: inline-block; + margin-right: ($baseline/2); - &:last-child { - margin-right: 0; + &:last-child { + margin-right: 0; + } + } + } + + a { + color: $gray-l1; + + &:hover, &:active { + color: $blue; } } } - - a { - color: $gray; - - &:hover, &:active { - color: $blue; - } - } } \ No newline at end of file diff --git a/cms/static/sass/_header.scss b/cms/static/sass/_header.scss index b4bae2c629..b7a02d5256 100644 --- a/cms/static/sass/_header.scss +++ b/cms/static/sass/_header.scss @@ -1,4 +1,4 @@ -// header +//studio global header and navigation .wrapper-header { margin: 0 0 ($baseline*1.5) 0; padding: $baseline; @@ -18,13 +18,15 @@ color: $blue; } } -} -.header { - @include clearfix(); - max-width: 1280px; - margin: 0 auto; - color: $lightGrey; + .header { + @include clearfix(); + max-width: $fg-max-width; + min-width: $fg-min-width; + width: flex-grid(12); + margin: 0 auto; + color: $lightGrey; + } } .branding, .info-course, .nav-course, .nav-account, .nav-unauth, .nav-pitch { @@ -91,7 +93,7 @@ white-space: nowrap; text-overflow: ellipsis; @include font-size(16); - font-weight: 550; + font-weight: 600; } } @@ -116,7 +118,7 @@ display: block; padding: 5px; text-transform: uppercase; - font-weight: 550; + font-weight: 600; &:hover, &:active { color: $blue; @@ -343,7 +345,7 @@ display: inline-block; vertical-align: middle; margin: 0 $baseline 0 0; - font-weight: 550; + font-weight: 600; &:last-child { margin-right: 0; @@ -353,7 +355,6 @@ margin-top: -($baseline/4); display: inline-block; padding: ($baseline/4) ($baseline/2); - font-weight: 550; } } @@ -363,10 +364,14 @@ } .nav-not-signedin-signup { + margin-right: ($baseline/2); .action-signup { @include blue-button; @include transition(all .15s); + @include font-size(14); + text-transform: uppercase; + font-weight: 600 !important; } } @@ -375,6 +380,9 @@ .action-signin { @include white-button; @include transition(all .15s); + @include font-size(14); + text-transform: uppercase; + font-weight: 600 !important; } } } diff --git a/cms/static/sass/_variables.scss b/cms/static/sass/_variables.scss index 6489b271a4..4d8e26b2f9 100644 --- a/cms/static/sass/_variables.scss +++ b/cms/static/sass/_variables.scss @@ -1,13 +1,13 @@ $baseline: 20px; // grid -$gw-column: 80px; -$gw-gutter: 20px; +$gw-column: ($baseline*3); +$gw-gutter: $baseline; $fg-column: $gw-column; $fg-gutter: $gw-gutter; $fg-max-columns: 12; $fg-max-width: 1280px; -$fg-min-width: 980px; +$fg-min-width: 900px; // type $sans-serif: 'Open Sans', $verdana; diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss index 0ba5aa6321..f77b5ca15b 100644 --- a/cms/static/sass/base-style.scss +++ b/cms/static/sass/base-style.scss @@ -29,6 +29,7 @@ @import "modal"; @import "alerts"; @import "login"; +@import "account"; @import 'jquery-ui-calendar'; @import 'content-types'; diff --git a/cms/templates/signup.html b/cms/templates/signup.html index 50f0f53e2c..1c542fb437 100644 --- a/cms/templates/signup.html +++ b/cms/templates/signup.html @@ -6,89 +6,133 @@ <%block name="content"> -
+