diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/cobrands/borsetshire/base.scss | 52 | ||||
-rw-r--r-- | web/cobrands/borsetshire/js.js | 8 | ||||
-rw-r--r-- | web/cobrands/borsetshire/layout.scss | 48 | ||||
-rw-r--r-- | web/cobrands/fixmystreet-uk-councils/js.js | 2 | ||||
-rw-r--r-- | web/cobrands/oxfordshire/js.js | 8 |
5 files changed, 110 insertions, 8 deletions
diff --git a/web/cobrands/borsetshire/base.scss b/web/cobrands/borsetshire/base.scss index f5113e0be..a92d54427 100644 --- a/web/cobrands/borsetshire/base.scss +++ b/web/cobrands/borsetshire/base.scss @@ -63,3 +63,55 @@ text-decoration: underline; } } + +body.authpage { + .content { + max-width: 27em; + margin-#{$left}: auto; + margin-#{$right}: auto; + } +} + +#demo-user-list { + @include list-reset-soft(); + border-bottom: 1px solid #eee; + margin-bottom: 2em; + + li { + margin: 2em 0; + } + + button { + width: 100%; + } + + span { + color: #666; + font-size: (14em / 16); + display: block; + margin-top: 0.5em; + } +} + +.fms-pro-promo { + margin: 2em -1em; + padding: 1em; + background: $primary; + color: $primary_text; + + .lead { + font-weight: bold; + } + + & > :first-child { + margin-top: 0; + } + + & > :last-child { + margin-bottom: 0; + } +} + +.btn--borsetshire { + @include button-reset($text: #000, $hover-text: #000); +} diff --git a/web/cobrands/borsetshire/js.js b/web/cobrands/borsetshire/js.js index 9fdb3e31b..2888a9548 100644 --- a/web/cobrands/borsetshire/js.js +++ b/web/cobrands/borsetshire/js.js @@ -1,5 +1,9 @@ (function(){ + if (typeof jQuery === 'undefined') { + return; + } + function set_redirect(form) { var e = form.username.value; if (e == 'inspector@example.org') { @@ -11,9 +15,9 @@ } } - $('#demo-user-list dt').click(function(){ + $('#demo-user-list button').click(function(){ var form = document.forms.general_auth; - form.username.value = $(this).text(); + form.username.value = $(this).data('email'); form.password_sign_in.value = 'password'; set_redirect(form); form.submit(); diff --git a/web/cobrands/borsetshire/layout.scss b/web/cobrands/borsetshire/layout.scss index 6aa7f5801..66d1bb692 100644 --- a/web/cobrands/borsetshire/layout.scss +++ b/web/cobrands/borsetshire/layout.scss @@ -54,3 +54,51 @@ } } } + +body.authpage { + .content { + width: auto; + max-width: 30em; + } + + input { + max-width: none; + } +} + +#demo-user-list { + li { + @include clearfix(); + } + + button { + float: left; + width: 40%; + } + + span { + float: right; + width: 55%; + margin-top: 0; + } +} + +.fms-pro-promo { + margin: 1em 0 3em 0; + padding: 2em; + + p { + font-size: 1.2em; + max-width: 26em; + } + + h2 { + font-family: inherit; + font-weight: bold; + font-size: 2em; + } + + @media (min-width: 60em) { + padding: 3em; + } +} diff --git a/web/cobrands/fixmystreet-uk-councils/js.js b/web/cobrands/fixmystreet-uk-councils/js.js index 7c4f7a9ed..5c550f56f 100644 --- a/web/cobrands/fixmystreet-uk-councils/js.js +++ b/web/cobrands/fixmystreet-uk-councils/js.js @@ -1,5 +1,5 @@ (function(){ - if (!jQuery.validator) { + if (typeof jQuery === 'undefined' || !jQuery.validator) { return; } var validNamePat = /\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i; diff --git a/web/cobrands/oxfordshire/js.js b/web/cobrands/oxfordshire/js.js index 17cb0dd8f..ad9639383 100644 --- a/web/cobrands/oxfordshire/js.js +++ b/web/cobrands/oxfordshire/js.js @@ -1,7 +1,5 @@ fixmystreet.utils = fixmystreet.utils || {}; -$.extend(fixmystreet.utils, { - defect_type_format: function(data) { - return data.extra.defect_code + ' - ' + data.extra.activity_code + ' (' + data.name + ')'; - } -}); +fixmystreet.utils.defect_type_format = function(data) { + return data.extra.defect_code + ' - ' + data.extra.activity_code + ' (' + data.name + ')'; +}; |