Skip to content

Commit

Permalink
fixup! [Aberdeenshire] Added cobrand front-end
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucascumsille
lucascumsille committed Jan 8, 2025
1 parent 50ebc8f commit 52e9a4b
Show file tree
Hide file tree
Showing 7 changed files with 183 additions and 207 deletions.
78 changes: 18 additions & 60 deletions templates/web/aberdeenshire/footer_extra.html
View file
Original file line number Diff line number Diff line change
@@ -1,63 +1,21 @@
<footer class="pcg-footer-black">
<div class="container footer-grid">
<div class="pcg-footer-black__wrapper--contacts col-12 col-sm-6 col-lg-3">
<h3 class="pcg-footer-black__subtitle">Follow us</h3>
<ul class="pcg-footer-black__social">
<li class="pcg-footer-black__social-item">
<a href="https://www.facebook.com/GloucesterCityCouncil/" target="_blank" title="https://www.facebook.com/GloucesterCityCouncil/" class="pcg-sn-icon pcg-contrast__link-hovered icon icon-facebook" aria-label="Go to https://www.facebook.com/GloucesterCityCouncil/">
</a>
</li>

<li class="pcg-footer-black__social-item">
<a href="https://twitter.com/GloucesterCity" target="_blank" title="https://twitter.com/GloucesterCity" class="pcg-sn-icon pcg-contrast__link-hovered icon icon-twitter" aria-label="Go to https://twitter.com/GloucesterCity">
</a>
</li>
</ul>
</div>

<div class="pcg-footer-black__wrapper--nav col-12 col-sm-6 col-lg-3">
<h2 class="pcg-footer-black__title" id="footer-menu-title-2b7317">About Gloucester</h2>

<nav class="pcg-footer-navigation pcg-footer-black__navigation" aria-labelledby="footer-menu-title-2b7317">
<ul class="pcg-footer-navigation__list">
<li>
<a href="http://visitgloucester.co.uk/" target="_blank" class="pcg-footer-navigation__link" aria-label="Visit Gloucester - Opens new tab">Visit Gloucester</a>
<img src="/cobrands/gloucester/images/external-icon.svg" alt="" role="presentation" aria-hidden="true" width="16">
</li>
<li>
<a href="http://democracy.gloucester.gov.uk/mgFindMember.aspx" target="_blank" class="pcg-footer-navigation__link" aria-label="Find your councillor - Opens new tab">Find your councillor</a>
<img src="/cobrands/gloucester/images/external-icon.svg" alt="" role="presentation" aria-hidden="true" width="16">
</li>
<li>
<a href="https://www.gloucesterlottery.co.uk/" target="_blank" class="pcg-footer-navigation__link" aria-label="Gloucester Lottery - Opens new tab">Gloucester Lottery</a>
<img src="/cobrands/gloucester/images/external-icon.svg" alt="" role="presentation" aria-hidden="true" width="16">
</li>
</ul>
</nav>
</div>

<div class="pcg-footer-black__wrapper pcg-footer-black__wrapper--nav col-12 col-sm-6 col-lg-3">
<h2 class="pcg-footer-black__title" id="footer-menu-title-77cd40">Using our site</h2>
<nav class="pcg-footer-navigation pcg-footer-black__navigation" aria-labelledby="footer-menu-title-77cd40">
<ul class="pcg-footer-navigation__list">
<li>
<a href="https://www.gloucester.gov.uk/about-the-council/data-protection-and-freedom-of-information/data-protection/" target="_self" class="pcg-footer-navigation__link pcg-contrast__link">How we use your information</a>
</li>
<li>
<a href="https://www.gloucester.gov.uk/sitemap/" target="_self" class="pcg-footer-navigation__link pcg-contrast__link">Sitemap</a>
</li>
<li>
<a href="https://www.gloucester.gov.uk/accessibility/" target="_self" class="pcg-footer-navigation__link pcg-contrast__link">Accessibility</a>
</li>
<li>
<a href="https://www.gloucester.gov.uk/cookies/" target="_self" class="pcg-footer-navigation__link pcg-contrast__link">Cookies</a>
</li>
<li>
<a href="https://www.gloucester.gov.uk/about-the-council/consultations-and-feedback/compliments-comments-and-complaints/" target="" class="pcg-footer-navigation__link pcg-contrast__link">Make a comment, complaint or compliment</a>
</li>
</ul>
</nav>
</div>
<footer class="aberdeenshire-footer">
<div class="container pt-3 primary-links-container">
<ul class="footer-list">
<li><a href="https://www.aberdeenshire.gov.uk/" class="footer-link">Home</a></li>
<li><a href="https://www.aberdeenshire.gov.uk/accessibility-translations" class="footer-link">Help with this website</a></li>
<li><a href="https://www.aberdeenshire.gov.uk/data/accessibility" class="footer-link">Accessibility</a></li>
<li><a href="https://www.aberdeenshire.gov.uk/data/site-information" class="footer-link">Cookies</a></li>
<li><a href="https://www.aberdeenshire.gov.uk/data/data-protection" class="footer-link">Privacy</a></li>
<li><a href="https://www.aberdeenshire.gov.uk/news" class="footer-link">News</a></li>
<li><a href="https://www.aberdeenshire.gov.uk/contact-us" class="footer-link">Contact the council</a></li>
</ul>
<ul class="footer-list">
<li><a href="https://www.facebook.com/pages/Aberdeenshire/430917186975751" target="_blank" class="footer-link external-link">Facebook <span class="screen-reader-only">opens in a new tab</span></a></li>
<li><a href="https://twitter.com/aberdeenshire" target="_blank" class="footer-link external-link">X <span class="screen-reader-only">opens in a new tab</span></a></li>
<li><a href="https://www.linkedin.com/company/aberdeenshire-council" target="_blank" class="footer-link external-link">LinkedIn <span class="screen-reader-only">opens in a new tab</span></a></li>
<li><a href="https://www.youtube.com/user/aberdeenshirecouncil" target="_blank" class="footer-link external-link">YouTube <span class="screen-reader-only">opens in a new tab</span></a></li>
</ul>
<p class="strapline">from mountain to sea... the very best of Scotland!</p>
</div>
</footer>
[% PROCESS '_footer_main_nav.html' %]
Expand Down
5 changes: 1 addition & 4 deletions templates/web/aberdeenshire/header_extra.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
<link rel="icon" type="image/png" sizes="32x32" href="/cobrands/gloucester/images/favicon.ico">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet">
<link rel="icon" type="image/png" sizes="32x32" href="/cobrands/aberdeenshire/images/favicon.ico">
[% INCLUDE 'tracking_code.html' %]
2 changes: 1 addition & 1 deletion templates/web/aberdeenshire/header_logo.html
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<a href="https://www.gloucester.gov.uk/" id="site-logo">Gloucester City council</a>
<a href="https://www.aberdeenshire.gov.uk/" id="site-logo">Aberdeenshire council</a>
<a href="/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a>
2 changes: 1 addition & 1 deletion web/cobrands/aberdeenshire/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ $meta-font: Verdana,Geneva,Tahoma,sans-serif;

$nav_colour: $primary;
$nav_background_colour: $cobrand_white;
$nav_hover_background_colour: $cobrand_white;
$nav_hover_background_colour: transparent;

$mappage-header-height: 5.625rem;
$header-top-border: false;
Expand Down
235 changes: 101 additions & 134 deletions web/cobrands/aberdeenshire/base.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,185 +14,152 @@ h3, .h3,

/* BUTTONS */
a#geolocate_link {
@include button-variant($bg-top: $button-primary-bg-top, $bg-bottom: $button-primary-bg-bottom, $border: $button-primary-border, $text: $button-primary-text, $hover-bg-bottom: $button-primary-hover-bg-bottom, $hover-bg-top: $button-primary-hover-bg-top, $hover-border: $button-primary-hover-border, $hover-text: $button-primary-hover-text);
@include button-variant($bg-top: $button-primary-bg-top, $bg-bottom: $button-primary-bg-bottom, $border: $button-primary-border, $text: $button-primary-text, $hover-bg-bottom: $button-primary-hover-bg-bottom, $hover-bg-top: $button-primary-hover-bg-top, $hover-border: $button-primary-hover-border, $hover-text: $button-primary-hover-text);
}

#report-cta {
padding: 0.75em;
border-color: $primary_text;
padding: 0.75em;
border-color: $primary_text;
}

a {
&:focus {
text-decoration: none;
color: $link-hover-color;
}
&:focus {
text-decoration: none;
color: $link-hover-color;
}
}

/* NAVBAR */
#site-logo {
background-image: url("/cobrands/aberdeenshire/images/aberdeenshire-logo.svg");
background-size: auto 3rem;
background-image: url("/cobrands/aberdeenshire/images/aberdeenshire-logo.svg");
background-size: auto 3rem;
}

#main-nav-btn:checked ~ #main-nav {
margin: 0 1em;
margin: 0 1em;
}

.nav-menu--main {
a {
background-color: $cobrand_white;
color: $primary;
text-decoration: none;

&:visited {
color: $primary;
}
}
a {
background-color: $cobrand_white;
color: $primary;
text-decoration: none;

span {
background-color: $primary;
color: $primary_text;
&:visited {
color: $primary;
}
}

span {
background-color: $primary;
color: $primary_text;
}
}

/* FRONTPAGE */
.postcode-form-box {
input#sub {
font-family: $body-font;
font-weight: 600;
background-color: $button-primary-bg-top;

&:hover {
background-color: $button-primary-hover-bg-top;
color: $button-primary-text;
}
input#sub {
font-family: $body-font;
font-weight: 600;
background-color: $button-primary-bg-top;

&:hover {
background-color: $button-primary-hover-bg-top;
color: $button-primary-text;
}
}
}

/* OTHERS */
.item-list__item {
a {
text-decoration: none;
a {
text-decoration: none;

&:hover {
background-color: lighten($button-primary-bg-top, 40%);
}

&:focus {
background-color: $cobrand_yellow;
h3 {
color: $primary_b;
}
}
}
}

/* SITE MESSAGE */
.site-message {
color: $primary;
padding: 1.5rem;
background-color: $cobrand_white;
border: none;
border-top: 4px solid $primary;
word-wrap: break-word;
color: $primary;
padding: 1.5rem;
background-color: $cobrand_white;
border: none;
border-top: 4px solid $primary;
word-wrap: break-word;
}

/* FOOTER */
.pcg-footer-black {
background-color: $primary;
padding: 2rem 0;
border-top: 8px solid #0000b4;
margin-top: 4em;
}

.footer-grid {
.aberdeenshire-footer {
color: $primary_text;
font-weight: bold;
border-top: 2rem solid #00b2e2;
background-color: $primary;
padding: 2.5rem 0;
text-align: center;

.primary-links-container {
display: flex;
flex-wrap: wrap;
row-gap: 1.5em;
column-gap: 8rem;
color: $primary_text;

.pcg-footer-black__title {
margin-bottom: 1.5rem;
font-size: 1.25rem;
font-weight: 700;
color: $primary_text;
margin-top: 0;
}
flex-direction: column;
align-items: center;
}

.pcg-footer-black__subtitle {
margin-bottom: 4px;
font-size: 1rem;
font-weight: normal;
margin-top: 0;
}
a {
color: $primary_text;

.pcg-footer-black__social {
list-style: none;
display: flex;
flex-direction: row;
margin-left: 0;
}
&.external-link {
background-position: center right 0;
background-repeat: no-repeat;
background-size: 1.1rem;
background-image: url("/cobrands/aberdeenshire/images/external-icon.svg");

&:after {
content: " ";
white-space: pre;
position: relative;
margin: auto 0 auto 0;
}
}
}

.strapline {
font-weight: bold;
font-size: .95rem;
font-style: italic;
margin-top: 5rem;
}

.footer-list {
display: flex;
flex-direction: column;
justify-content: center;
width: fit-content;
flex-wrap: wrap;
padding-bottom: 1.5rem;
margin-left: 0;

.pcg-sn-icon {
display: block;
width: 45px;
height: 45px;

&.icon {
background-repeat: no-repeat;
background-position: center;
background-size: 26px;
border-radius: 3px;

&.icon-facebook {
background-image: url("/cobrands/aberdeenshire/images/facebook.svg");
}
&.icon-twitter {
background-image: url("/cobrands/aberdeenshire/images/twitter.svg");
}

&:hover {
background-color: $button-primary-hover-bg-bottom;
}
}
&:first-child {
border-bottom: 1px solid transparentize(white, 0.5);
}

a {
color: $primary_text;
&:hover {
text-decoration: underline;
}
&:last-of-type {
padding-bottom: 0;
margin-bottom: 0;
}

li {
list-style: none;
}

.pcg-footer-navigation__link {
font-size: 1em;
color: $primary_text;
text-decoration: none;
}

.col-12 {
flex: 0 0 auto;
width: 100%;
}

@media (min-width: 576px) {
.col-sm-6 {
flex: 0 0 auto;
width: 50%;
}
}

@media (min-width: 992px) {
.col-lg-3 {
flex: 0 0 auto;
width: 25%;
}
}

@media (min-width: 1400px) {
.pcg-footer-black__wrapper--contacts {
width: 30%;
}

.pcg-footer-black__wrapper--nav {
width: 25%;
}
list-style: none;
}
}
}

@import "../fixmystreet-uk-councils/societyworks-footer";
Binary file modified web/cobrands/aberdeenshire/images/favicon.ico
View file
Binary file not shown.
Loading

0 comments on commit 52e9a4b

Please sign in to comment.