diff --git a/edivorce/apps/core/static/css/main.css b/edivorce/apps/core/static/css/main.css index 1e157ee6..304e4823 100644 --- a/edivorce/apps/core/static/css/main.css +++ b/edivorce/apps/core/static/css/main.css @@ -1 +1 @@ -@font-face{font-family:'Myriad-Pro';src:url("../fonts/MyriadWebPro.ttf");font-weight:normal;font-style:normal}body{font-family:Myriad-Pro,Calibri,Arial,Sans Serif;font-size:16px;line-height:24px;color:#494949;background:#ffffff;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}h1,h2,h3,h4{margin-top:0px;margin-bottom:10px}h1{font-weight:600;line-height:54px;color:#042553;margin-bottom:20px}h1 small{font-size:14px;font-weight:700;text-transform:uppercase;color:#042553;display:block;letter-spacing:.1em}h2{font-weight:600;font-size:24px;line-height:36px;color:#494949;margin-bottom:20px}h3{font-weight:400;font-size:28px;line-height:42px;color:#062652;margin-top:15px}h4{font-weight:600;font-size:18px;line-height:27px;color:#062652;text-transform:uppercase}a{color:#2b5580;text-decoration:none}a:hover,a:focus{color:#1e3c5a;text-decoration:underline;transition:color 0.1s ease}.intro{font-size:18px;line-height:28px}.footer{height:50px;background-color:#042553;color:#ffffff}.container-wrapper{padding:40px 0}.container-wrapper:nth-child(odd){background:#fdfdfd}.container-wrapper:nth-child(odd) input{background:#ffffff}.bg-danger{padding:30px;border-radius:10px;margin-bottom:20px}@media (max-width: 991px){.container{width:100%;min-width:750px}}.tooltip-arrow{border-top-color:#062652}.tooltip.in{opacity:1}.tooltip-inner{text-align:left;background-color:#062652;padding:30px;font-size:16px;line-height:24px;max-width:400px;border-radius:10px}.tooltip-innerb{font-size:18px}.tooltip-inner a{color:#ffffff;text-decoration:underline}.tooltip-inner a:hover,.tooltip-inner a:focus{color:#d5d5d5}.tooltip-link{color:#062652;border-bottom:dotted 1px #062652;cursor:pointer}.collapse-trigger{margin-bottom:20px}.collapse-trigger>div{color:#062652;border-bottom:solid 1px #062652;display:inline;cursor:pointer}.collapse-trigger>div:after{font-family:FontAwesome;font-weight:normal;font-style:normal;display:inline-block;text-decoration:inherit;padding-left:10px;content:"\f077";transform-origin:65% 50%;transition:transform 0.2s linear}.collapse-trigger>div:hover,.collapse-trigger>div:focus{color:#1e3c5a;border-bottom:solid 1px #1e3c5a;transition:all 0.1s ease}.collapse-trigger.collapsed div:after{transform:rotate(-180deg);transform-style:preserve-3D;transform-origin:65% 50%}.collapse>div,.collapsing>div{margin-bottom:25px}i.fa{color:#2b5580}i.fa.circle{border-radius:50%;padding:10px;border:solid 1px #2b5580}i.fa.fa-question-circle{margin-left:5px}.btn-primary{font-size:18px;line-height:32px;border:none;border-radius:10px;line-height:32px;padding:6px 18px;background-color:#365ebe;color:#062652}.btn-primary:hover{background-color:#062652;color:#ffffff}a.btn+a.btn{margin-right:20px}a.btn>i.fa{padding-right:5px}a.btn:hover>i.fa{color:#ffffff}.btn-radio{color:#062652;background-color:#365ebe;border-color:#365ebe;font-size:18px;text-transform:uppercase;font-weight:600;line-height:45px;width:60px;height:60px;border-radius:30px;border:3px solid #365ebe}.btn-radio:hover,.btn-radio:focus,.btn-radio:active,.btn-radio.active,.open .dropdown-toggle.btn-radio{color:#FFFFFF;background-color:#2b5580;border:3px solid #365ebe}.btn-radio:active,.btn-radio.active,.open .dropdown-toggle.btn-radio{background-image:none}.btn-radio.disabled,.btn-radio[disabled],fieldset[disabled] .btn-radio,.btn-radio.disabled:hover,.btn-radio[disabled]:hover,fieldset[disabled] .btn-radio:hover,.btn-radio.disabled:focus,.btn-radio[disabled]:focus,fieldset[disabled] .btn-radio:focus,.btn-radio.disabled:active,.btn-radio[disabled]:active,fieldset[disabled] .btn-radio:active,.btn-radio.disabled.active,.btn-radio[disabled].active,fieldset[disabled] .btn-radio.active{background-color:#365ebe;border-color:#365ebe}.btn-radio+.btn-radio{margin-left:15px}.btn-radio-group{margin-bottom:20px}.btn-radio-group .btn.active.focus,.btn-radio-group .btn.active:focus,.btn-radio-group .btn.focus,.btn-radio-group .btn:active.focus,.btn-radio-group .btn:active:focus,.btn-radio-group .btn:focus{outline:none}.btn-radio-group .btn-radio-long{width:auto;white-space:normal;text-transform:none;align-items:center;line-height:1em;max-width:500px;display:inline-flex;text-align:left;padding:0 20px}input{border-radius:10px;color:#494949;padding:12px 15px;border:solid 1px #d5d5d5;line-height:1em}input:focus{outline:0;box-shadow:inset 0 1px 1px rgba(73,73,73,0.075),0 0 4px rgba(157,157,157,0.5)}input+i.fa{margin-left:10px}input.form-block{display:block;margin-bottom:10px}input.input-wide{width:50%}input.input-narrow{max-width:100px}input.input-inline{padding:5px 20px;border-radius:5px;margin-left:5px}textarea{width:100%;border-radius:10px;color:#494949;padding:12px 15px;border:solid 1px #d5d5d5;line-height:1em}#top_banner{background-color:#042553;border-bottom:2px solid #dea61b;padding:5px 20px 10px}#top_banner .top_banner-logo img{width:148px;height:auto;float:left}#top_banner p{color:#ffffff;font-size:16px;line-height:1em;margin-top:20px;margin-left:35px;float:left}#top_banner p .beta{border:solid 1px #ffffff;padding:4px 8px 3px;margin-left:10px;font-size:12px;text-transform:uppercase}#top_banner .top_banner-user{color:#fff;font-size:14px;float:right;margin-top:9px}#top_banner .top_banner-user a{color:#ffffff}#top_banner .top_banner-user a:hover,#top_banner .top_banner-user a:active{color:#fcfcfc}#mid_banner{background-color:#2b5580;font-size:14px;font-weight:600}#mid_banner .mid_banner-dash{float:left;margin-left:-20px}#mid_banner .mid_banner-dash a,#mid_banner .mid_banner-link a,#mid_banner .more_information-link a{padding:10px 20px;float:right;margin-left:20px}#mid_banner .mid_banner-dash a:hover,#mid_banner .mid_banner-dash a.active,#mid_banner .mid_banner-link a:hover,#mid_banner .mid_banner-link a.active,#mid_banner .more_information-link a:hover,#mid_banner .more_information-link a.active{color:#042553;background-color:#efefef;text-decoration:none}#mid_banner .mid_banner-dash a:hover i,#mid_banner .mid_banner-dash a.active i,#mid_banner .mid_banner-link a:hover i,#mid_banner .mid_banner-link a.active i,#mid_banner .more_information-link a:hover i,#mid_banner .more_information-link a.active i{color:#042553}#mid_banner i{color:#ffffff;padding:0 10px 0 0}#mid_banner a{color:#ffffff;text-decoration:none}#form_navigation{display:flex}#form_navigation form{margin-right:10px}.question-well{min-height:20px;padding:25px;margin-bottom:25px;border:1px solid #d5d5d5;border-radius:10px}.question-well.hasFocus{border:1px solid #042553}.row-flex{display:flex;flex-direction:row;flex-wrap:wrap;height:100%}.row-flex .col{flex:1;box-sizing:border-box}.row-flex .content-column{flex-basis:100%;max-width:800px;padding:35px 50px 50px 50px}.row-flex .progress-column{flex:0 0 262px;background-color:#efefef}.row-flex .dashnav-column{flex:0 0 262px;background-color:#042553}.row-flex .more_information-column{flex:0 0 306px;background-color:#efefef;box-shadow:inset 0px 0px 10px 0px rgba(0,0,0,0.1);padding:45px 20px;font-size:14px;line-height:21px}.row-flex .more_information-column .more_information-close{float:right;font-size:24px;margin-top:3px;color:#042553}.row-flex .more_information-column h2{color:#042553;padding-right:25px}.progress-column h4,.dashnav-column h4{color:#494949;padding:0 18px;margin-top:36px}.progress-column .progress-question,.dashnav-column .progress-question{display:flex;align-items:center;height:60px;margin-bottom:12px;padding:0 12px 0 18px}.progress-column .progress-question .progress-icon,.dashnav-column .progress-question .progress-icon{width:46px}.progress-column .progress-question .progress-icon i,.dashnav-column .progress-question .progress-icon i{font-size:20px;border:solid 1px #494949;padding:8px;border-radius:36px}.progress-column .progress-question .progress-icon i.fa:before,.dashnav-column .progress-question .progress-icon i.fa:before{width:20px;text-align:center;display:block;height:20px}.progress-column .progress-question .progress-content,.dashnav-column .progress-question .progress-content{width:158px;font-size:14px;line-height:16px;color:#494949}.progress-column .progress-question .progress-content small,.dashnav-column .progress-question .progress-content small{font-size:11px;text-transform:uppercase;font-weight:700;letter-spacing:.1em}.progress-column .progress-question .progress-status,.dashnav-column .progress-question .progress-status{width:28px}.progress-column .progress-question .progress-status i,.dashnav-column .progress-question .progress-status i{float:right}.progress-column .progress-question i,.dashnav-column .progress-question i{color:#494949}.progress-column .progress-question.complete span,.progress-column .progress-question.complete i,.dashnav-column .progress-question.complete span,.dashnav-column .progress-question.complete i{color:#57b26a;border-color:#57b26a}.progress-column .progress-question:hover,.progress-column .progress-question:focus,.dashnav-column .progress-question:hover,.dashnav-column .progress-question:focus{background-color:#e6ca85;text-decoration:none}.progress-column .progress-question:hover span,.progress-column .progress-question:hover i,.progress-column .progress-question:focus span,.progress-column .progress-question:focus i,.dashnav-column .progress-question:hover span,.dashnav-column .progress-question:hover i,.dashnav-column .progress-question:focus span,.dashnav-column .progress-question:focus i{color:#ffffff;border-color:#ffffff}.progress-column .progress-question.active,.dashnav-column .progress-question.active{background-color:#dea61b;text-decoration:none}.progress-column .progress-question.active span,.progress-column .progress-question.active i,.dashnav-column .progress-question.active span,.dashnav-column .progress-question.active i{color:#ffffff;border-color:#ffffff}.dashnav-column h4{color:#ffffff}.dashnav-column .progress-question .progress-icon{width:36px}.dashnav-column .progress-question .progress-icon i{font-size:20px;border:none;padding:0}.dashnav-column .progress-question .progress-content{width:180px;color:#ffffff;font-weight:600}.dashnav-column .progress-question i{color:#ffffff} +@font-face{font-family:'Myriad-Pro';src:url("../fonts/MyriadWebPro.ttf");font-weight:normal;font-style:normal}body{font-family:Myriad-Pro,Calibri,Arial,Sans Serif;font-size:16px;line-height:24px;color:#494949;background:#ffffff;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}h1,h2,h3,h4{margin-top:0px;margin-bottom:10px}h1{font-weight:600;line-height:54px;color:#042553;margin-bottom:20px}h1 small{font-size:14px;font-weight:700;text-transform:uppercase;color:#042553;display:block;letter-spacing:.1em}h2{font-weight:600;font-size:24px;line-height:36px;color:#494949;margin-bottom:20px}h3{font-weight:400;font-size:28px;line-height:42px;color:#19355b;margin-top:15px}h4{font-weight:600;font-size:18px;line-height:27px;color:#19355b;text-transform:uppercase}a{color:#2b5580;text-decoration:none}a:hover,a:focus{color:#1e3c5a;text-decoration:underline;transition:color 0.1s ease}.intro{font-size:18px;line-height:28px}.container-wrapper{padding:40px 0}.container-wrapper:nth-child(odd){background:#fdfdfd}.container-wrapper:nth-child(odd) input{background:#ffffff}.bg-danger{padding:30px;border-radius:10px;margin-bottom:20px}@media (max-width: 991px){.container{width:100%;min-width:750px}}.tooltip-arrow{border-top-color:#19355b}.tooltip.in{opacity:1}.tooltip-inner{text-align:left;background-color:#19355b;padding:30px;font-size:16px;line-height:24px;max-width:400px;border-radius:10px}.tooltip-innerb{font-size:18px}.tooltip-inner a{color:#ffffff;text-decoration:underline}.tooltip-inner a:hover,.tooltip-inner a:focus{color:#d5d5d5}.tooltip-link{color:#19355b;border-bottom:dotted 1px #19355b;cursor:pointer}.collapse-trigger{margin-bottom:20px}.collapse-trigger>div{color:#19355b;border-bottom:solid 1px #19355b;display:inline;cursor:pointer}.collapse-trigger>div:after{font-family:FontAwesome;font-weight:normal;font-style:normal;display:inline-block;text-decoration:inherit;padding-left:10px;content:"\f077";transform-origin:65% 50%;transition:transform 0.2s linear}.collapse-trigger>div:hover,.collapse-trigger>div:focus{color:#1e3c5a;border-bottom:solid 1px #1e3c5a;transition:all 0.1s ease}.collapse-trigger.collapsed div:after{transform:rotate(-180deg);transform-style:preserve-3D;transform-origin:65% 50%}.collapse>div,.collapsing>div{margin-bottom:25px}i.fa{color:#2b5580}i.fa.circle{border-radius:50%;padding:10px;border:solid 1px #2b5580}i.fa.fa-question-circle{margin-left:5px}.form-buttons{margin:30px 0}.form-buttons .btn{font-size:18px;line-height:32px;border:none;border-radius:10px;line-height:32px;padding:6px 18px;background-color:#365ebe;color:#ffffff}.form-buttons .btn:hover{background-color:#1f376f}.form-buttons .btn i.fa{color:#ffffff}.form-buttons .btn.btn-success{background-color:#57b26a;margin-left:12px}.form-buttons .btn.btn-success:hover{background-color:#337040}.btn-radio{color:#19355b;background-color:#d4dce5;font-size:18px;text-transform:uppercase;font-weight:600;line-height:45px;width:60px;height:60px;border-radius:30px;border:3px solid #d4dce5}.btn-radio:hover,.btn-radio:focus,.btn-radio:active,.btn-radio.active,.open .dropdown-toggle.btn-radio{color:#FFFFFF;background-color:#2b5580;border:3px solid #365ebe}.btn-radio:active,.btn-radio.active,.open .dropdown-toggle.btn-radio{background-image:none}.btn-radio.disabled,.btn-radio[disabled],fieldset[disabled] .btn-radio,.btn-radio.disabled:hover,.btn-radio[disabled]:hover,fieldset[disabled] .btn-radio:hover,.btn-radio.disabled:focus,.btn-radio[disabled]:focus,fieldset[disabled] .btn-radio:focus,.btn-radio.disabled:active,.btn-radio[disabled]:active,fieldset[disabled] .btn-radio:active,.btn-radio.disabled.active,.btn-radio[disabled].active,fieldset[disabled] .btn-radio.active{background-color:#365ebe;border-color:#365ebe}.btn-radio+.btn-radio{margin-left:15px}.btn-radio-group{margin-bottom:20px}.btn-radio-group .btn.active.focus,.btn-radio-group .btn.active:focus,.btn-radio-group .btn.focus,.btn-radio-group .btn:active.focus,.btn-radio-group .btn:active:focus,.btn-radio-group .btn:focus{outline:none}.btn-radio-group .btn-radio-long{width:auto;white-space:normal;text-transform:none;align-items:center;line-height:1em;max-width:500px;display:inline-flex;text-align:left;padding:0 20px}input{border-radius:10px;color:#494949;padding:12px 15px;border:solid 1px #d5d5d5;line-height:1em}input:focus{outline:0;box-shadow:inset 0 1px 1px rgba(73,73,73,0.075),0 0 4px rgba(157,157,157,0.5)}input+i.fa{margin-left:10px}input.form-block{display:block;margin-bottom:10px}input.input-wide{width:50%}input.input-narrow{max-width:100px}input.input-inline{padding:5px 20px;border-radius:5px;margin-left:5px}textarea{width:100%;border-radius:10px;color:#494949;padding:12px 15px;border:solid 1px #d5d5d5;line-height:1em}#top_banner{background-color:#042553;border-bottom:2px solid #dea61b;padding:5px 20px 10px}#top_banner .top_banner-logo img{width:148px;height:auto;float:left}#top_banner p{color:#ffffff;font-size:16px;line-height:1em;margin-top:20px;margin-left:35px;float:left}#top_banner p .beta{border:solid 1px #ffffff;padding:4px 8px 3px;margin-left:10px;font-size:12px;text-transform:uppercase}#top_banner .top_banner-user{color:#fff;font-size:14px;float:right;margin-top:9px}#top_banner .top_banner-user a{color:#ffffff}#top_banner .top_banner-user a:hover,#top_banner .top_banner-user a:active{color:#fcfcfc}#mid_banner{background-color:#2b5580;font-size:14px;font-weight:600}#mid_banner .mid_banner-dash{float:left;margin-left:-20px}#mid_banner .mid_banner-dash a,#mid_banner .mid_banner-link a,#mid_banner .more_information-link a{padding:10px 20px;float:right;margin-left:20px}#mid_banner .mid_banner-dash a:hover,#mid_banner .mid_banner-dash a.active,#mid_banner .mid_banner-link a:hover,#mid_banner .mid_banner-link a.active,#mid_banner .more_information-link a:hover,#mid_banner .more_information-link a.active{color:#042553;background-color:#efefef;text-decoration:none}#mid_banner .mid_banner-dash a:hover i,#mid_banner .mid_banner-dash a.active i,#mid_banner .mid_banner-link a:hover i,#mid_banner .mid_banner-link a.active i,#mid_banner .more_information-link a:hover i,#mid_banner .more_information-link a.active i{color:#042553}#mid_banner i{color:#ffffff;padding:0 10px 0 0}#mid_banner a{color:#ffffff;text-decoration:none}#form_navigation{display:flex}#form_navigation form{margin-right:10px}.footer{height:50px;background-color:#042553;border-top:2px solid #dea61b;color:#ffffff}.question-well{min-height:20px;padding:25px;margin-bottom:25px;border:1px solid #d5d5d5;border-radius:10px}.question-well.hasFocus{border:1px solid #042553}.row-flex{display:flex;flex-direction:row;flex-wrap:wrap;height:100%}.row-flex .col{flex:1;box-sizing:border-box}.row-flex .content-column{flex-basis:100%;max-width:800px;padding:35px 50px 50px 50px}.row-flex .progress-column{flex:0 0 262px;background-color:#efefef}.row-flex .dashnav-column{flex:0 0 262px;background-color:#19355b}.row-flex .more_information-column{flex:0 0 306px;background-color:#efefef;box-shadow:inset 0px 0px 10px 0px rgba(0,0,0,0.1);padding:45px 20px;font-size:14px;line-height:21px}.row-flex .more_information-column .more_information-close{float:right;font-size:24px;margin-top:3px;color:#042553}.row-flex .more_information-column h2{color:#042553;padding-right:25px}.progress-column h4,.dashnav-column h4{color:#494949;padding:0 18px;margin-top:36px}.progress-column .progress-question,.dashnav-column .progress-question{display:flex;align-items:center;height:60px;margin-bottom:12px;padding:0 12px 0 18px}.progress-column .progress-question .progress-icon,.dashnav-column .progress-question .progress-icon{width:46px}.progress-column .progress-question .progress-icon i,.dashnav-column .progress-question .progress-icon i{font-size:20px;border:solid 1px #494949;padding:8px;border-radius:36px}.progress-column .progress-question .progress-icon i.fa:before,.dashnav-column .progress-question .progress-icon i.fa:before{width:20px;text-align:center;display:block;height:20px}.progress-column .progress-question .progress-content,.dashnav-column .progress-question .progress-content{width:158px;font-size:14px;line-height:16px;color:#494949}.progress-column .progress-question .progress-content small,.dashnav-column .progress-question .progress-content small{font-size:11px;text-transform:uppercase;font-weight:700;letter-spacing:.1em}.progress-column .progress-question .progress-status,.dashnav-column .progress-question .progress-status{width:28px}.progress-column .progress-question .progress-status i,.dashnav-column .progress-question .progress-status i{float:right}.progress-column .progress-question i,.dashnav-column .progress-question i{color:#494949}.progress-column .progress-question.complete span,.progress-column .progress-question.complete i,.dashnav-column .progress-question.complete span,.dashnav-column .progress-question.complete i{color:#57b26a;border-color:#57b26a}.progress-column .progress-question:hover,.progress-column .progress-question:focus,.dashnav-column .progress-question:hover,.dashnav-column .progress-question:focus{background-color:#e6ca85;text-decoration:none}.progress-column .progress-question:hover span,.progress-column .progress-question:hover i,.progress-column .progress-question:focus span,.progress-column .progress-question:focus i,.dashnav-column .progress-question:hover span,.dashnav-column .progress-question:hover i,.dashnav-column .progress-question:focus span,.dashnav-column .progress-question:focus i{color:#ffffff;border-color:#ffffff}.progress-column .progress-question.active,.dashnav-column .progress-question.active{background-color:#dea61b;text-decoration:none}.progress-column .progress-question.active span,.progress-column .progress-question.active i,.dashnav-column .progress-question.active span,.dashnav-column .progress-question.active i{color:#ffffff;border-color:#ffffff}.dashnav-column h4{color:#ffffff}.dashnav-column .progress-question .progress-icon{width:36px}.dashnav-column .progress-question .progress-icon i{font-size:20px;border:none;padding:0}.dashnav-column .progress-question .progress-content{width:180px;color:#ffffff;font-weight:600}.dashnav-column .progress-question i{color:#ffffff}.dashnav-column .progress-question:hover,.dashnav-column .progress-question:focus{background-color:#dea61b} diff --git a/edivorce/apps/core/static/css/main.scss b/edivorce/apps/core/static/css/main.scss index 2c4c3d9b..80de7ec8 100644 --- a/edivorce/apps/core/static/css/main.scss +++ b/edivorce/apps/core/static/css/main.scss @@ -5,7 +5,7 @@ $body-copy: #494949; $brand-blue: #042553; $brand-gold: #dea61b; -$brand-titles: #062652; +$brand-titles: #19355b; $brand-links: #2b5580; $brand-buttons: #365ebe; @@ -104,11 +104,7 @@ a { line-height: 28px; } -.footer { - height: 50px; - background-color: $brand-blue; - color: #ffffff; -} + // Bootstrap Overrides @@ -215,35 +211,36 @@ i.fa { i.fa.fa-question-circle {margin-left: 5px;} -.btn-primary { - font-size: 18px; - line-height: 32px; - border: none; - border-radius: 10px; - line-height: 32px; - padding: 6px 18px; - background-color: $brand-buttons; - color: $brand-titles; - &:hover { - background-color: $brand-titles; - color: #ffffff; - } -} - -a.btn+a.btn {margin-right: 20px;} - -a.btn > i.fa { - padding-right: 5px; -} - -a.btn:hover > i.fa { - color: #ffffff; +.form-buttons { + margin: 30px 0; + .btn { + font-size: 18px; + line-height: 32px; + border: none; + border-radius: 10px; + line-height: 32px; + padding: 6px 18px; + background-color: $brand-buttons; + color: #ffffff; + &:hover { + background-color: darken($brand-buttons, 20%); + } + i.fa { + color: #ffffff; + } + &.btn-success { + background-color: $color-green; + margin-left: 12px; + &:hover { + background-color: darken($color-green, 20%); + } + } + } } .btn-radio { color: $brand-titles; - background-color: $brand-buttons; - border-color: $brand-buttons; + background-color: $color-blue-lighter; font-size: 18px; text-transform: uppercase; font-weight: 600; @@ -251,7 +248,7 @@ a.btn:hover > i.fa { width: 60px; height: 60px; border-radius: 30px; - border: 3px solid $brand-buttons; + border: 3px solid $color-blue-lighter; } .btn-radio:hover, @@ -431,6 +428,13 @@ textarea { } } +.footer { + height: 50px; + background-color: $brand-blue; + border-top: 2px solid $brand-gold; + color: #ffffff; +} + .question-well { min-height: 20px; padding: 25px; @@ -462,7 +466,7 @@ textarea { } .dashnav-column { flex: 0 0 262px; - background-color: $brand-blue; + background-color: $brand-titles; } .more_information-column { flex: 0 0 306px; @@ -581,6 +585,9 @@ textarea { i { color: #ffffff; } + &:hover, &:focus { + background-color: $brand-gold; + } } } @@ -588,4 +595,3 @@ textarea { - diff --git a/edivorce/apps/core/templates/base.html b/edivorce/apps/core/templates/base.html index c489530d..0a245f0a 100644 --- a/edivorce/apps/core/templates/base.html +++ b/edivorce/apps/core/templates/base.html @@ -78,11 +78,20 @@
Yes. If you've been living in B.C. for at least one year and continue to live in B.C., you can apply for - divorce in BC Supreme Court. The Canada Divorce Act states that a provincial court can deal with a - divorce proceedings when either spouse has been living in the province for at least one year immediately - before applying.
-Yes. If you've been living in B.C. for at least one year and continue to live in B.C., you can apply for + divorce in BC Supreme Court. The Canada Divorce Act states that a provincial court can deal with a + divorce proceedings when either spouse has been living in the province for at least one year immediately + before applying.
+diff --git a/edivorce/apps/core/templates/prequalification/step_03.html b/edivorce/apps/core/templates/prequalification/step_03.html index a4bc1a23..1cb7a367 100644 --- a/edivorce/apps/core/templates/prequalification/step_03.html +++ b/edivorce/apps/core/templates/prequalification/step_03.html @@ -130,11 +130,14 @@ -
+{% endblock %} +{% block formbuttons %} + {% endblock %} + {% block sidebarText%}When two people who have been living together in a marriage, or a marriage-like relationship (sometimes called a common-law relationship), decide not to live together any more, they are separated.
There is no such thing as a "legal" separation. If you are living apart, you are separated.
diff --git a/edivorce/apps/core/templates/prequalification/step_04.html b/edivorce/apps/core/templates/prequalification/step_04.html index 6e874df3..55eabaac 100644 --- a/edivorce/apps/core/templates/prequalification/step_04.html +++ b/edivorce/apps/core/templates/prequalification/step_04.html @@ -79,11 +79,14 @@ - +{% endblock %} +{% block formbuttons %} + {% endblock %} + {% block sidebar %} {% endblock %} \ No newline at end of file diff --git a/edivorce/apps/core/templates/prequalification/step_05.html b/edivorce/apps/core/templates/prequalification/step_05.html index 5f76d019..838f9724 100644 --- a/edivorce/apps/core/templates/prequalification/step_05.html +++ b/edivorce/apps/core/templates/prequalification/step_05.html @@ -159,13 +159,14 @@ -An 11½-minute video excerpted from "Helping Clients Prepare Divorce Documents That Don't Bounce," a workshop by lawyer J.P. Boyd at the October 2006 LSS Provincial Training Conference for Legal Advocates.
diff --git a/edivorce/apps/core/templates/prequalification/step_06.html b/edivorce/apps/core/templates/prequalification/step_06.html index 88a56d31..9163e008 100644 --- a/edivorce/apps/core/templates/prequalification/step_06.html +++ b/edivorce/apps/core/templates/prequalification/step_06.html @@ -103,13 +103,12 @@ +{% endblock %} - - - - +{% block formbuttons %} + {% endblock %} {% block sidebarText %} diff --git a/edivorce/apps/core/templates/question/01_orders.html b/edivorce/apps/core/templates/question/01_orders.html index ee7aef9e..a4210c30 100644 --- a/edivorce/apps/core/templates/question/01_orders.html +++ b/edivorce/apps/core/templates/question/01_orders.html @@ -119,21 +119,12 @@ -An order is the record of the judge's decision. It is filed at the court registry. The parties involved in a case (or their lawyers) are responsible for writing out the order. diff --git a/edivorce/apps/core/templates/question/02_claimant.html b/edivorce/apps/core/templates/question/02_claimant.html index d93debf2..f1103390 100644 --- a/edivorce/apps/core/templates/question/02_claimant.html +++ b/edivorce/apps/core/templates/question/02_claimant.html @@ -137,17 +137,11 @@ -
The Meaning of "Ordinary Residence" and "Habitual Residence" in the Common Law Provinces in a Family Law Context: http://www.justice.gc.ca/eng/rp-pr/fl-lf/divorce/rhro_cl/p4.html
{% endblock %} \ No newline at end of file diff --git a/edivorce/apps/core/templates/question/03_respondent.html b/edivorce/apps/core/templates/question/03_respondent.html index 11b7570b..2560ed63 100644 --- a/edivorce/apps/core/templates/question/03_respondent.html +++ b/edivorce/apps/core/templates/question/03_respondent.html @@ -151,19 +151,9 @@ +{% endblock %} -Most divorces use the one-year separation ground. But you can also apply for a divorce earlier on the basis of adultery or physical or mental cruelty. If you ask for a divorce for one of these reasons, you have to present evidence to the court to prove the facts of the adultery or physical or mental cruelty.
diff --git a/edivorce/apps/core/templates/question/06_support.html b/edivorce/apps/core/templates/question/06_support.html index 433571b2..b91b9233 100644 --- a/edivorce/apps/core/templates/question/06_support.html +++ b/edivorce/apps/core/templates/question/06_support.html @@ -121,22 +121,11 @@This section is about excluded property - e.g. property owned by the respondent at the time you moved in together, and gifts or inheritances the respondent received. Compensation is cash instead of ownership of your share of the property.
{% input_field type="textarea" name="other_property_claims" rows="8" cols="65" class="response-textarea" %}For more information about dealing with Property and Debt, please visit:
diff --git a/edivorce/apps/core/templates/question/08_other_orders.html b/edivorce/apps/core/templates/question/08_other_orders.html index c97a2310..1c84651f 100644 --- a/edivorce/apps/core/templates/question/08_other_orders.html +++ b/edivorce/apps/core/templates/question/08_other_orders.html @@ -8,16 +8,8 @@diff --git a/edivorce/apps/core/templates/question/11_review.html b/edivorce/apps/core/templates/question/11_review.html index a203fb54..c0224346 100644 --- a/edivorce/apps/core/templates/question/11_review.html +++ b/edivorce/apps/core/templates/question/11_review.html @@ -58,3 +58,7 @@ {% endblock %} + +{% block formbuttons %} + +{% endblock %} diff --git a/edivorce/apps/core/templates/question/12_uncategorized.html b/edivorce/apps/core/templates/question/12_uncategorized.html index 2c4aab0c..51636072 100644 --- a/edivorce/apps/core/templates/question/12_uncategorized.html +++ b/edivorce/apps/core/templates/question/12_uncategorized.html @@ -97,4 +97,8 @@