Skip to content

Commit

Permalink
CCC: Add Carlisle City Council logo to footer
Browse files Browse the repository at this point in the history
  • Loading branch information
flavour committed Dec 19, 2019
1 parent 4aef01b commit cca2bc0
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 11 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b'2aa0fb366' (2019-12-18 17:51:01)
b'4aef01b23' (2019-12-19 10:35:42)
13 changes: 7 additions & 6 deletions modules/templates/CCC/views/footer.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<div class='row'>
<div class='medium-3 small-6 columns'>
<div class='medium-2 small-4 columns'>
{{=current.menu.about}}
</div>
<div class='medium-5 small-6 columns'>
<div class='medium-3 columns'><img src='/{{=appname}}/static/themes/CCC/img/BRC.png'></div>
<div class='medium-3 columns'><img src='/{{=appname}}/static/themes/CCC/img/CCC.png'></div>
<div class='medium-3 columns'><img src='/{{=appname}}/static/themes/CCC/img/CRF.png'></div>
<div class='medium-3 columns'><img src='/{{=appname}}/static/themes/CCC/img/LotteryFund.png'></div>
<div class='medium-6 small-8 columns'>
<div class='medium5 columns'><img src='/{{=appname}}/static/themes/CCC/img/BRC.png'></div>
<div class='medium5 columns padc'><img src='/{{=appname}}/static/themes/CCC/img/carlisle.png'></div>
<div class='medium5 columns'><img src='/{{=appname}}/static/themes/CCC/img/CCC.png'></div>
<div class='medium5 columns'><img src='/{{=appname}}/static/themes/CCC/img/CRF.png'></div>
<div class='medium5 columns'><img src='/{{=appname}}/static/themes/CCC/img/LotteryFund.png'></div>
</div>
<div class='medium-4 columns hide-for-small'>
<p id='strapline'>Making connections when they matter the most</p>
Expand Down
2 changes: 1 addition & 1 deletion static/themes/CCC/eden.min.css

Large diffs are not rendered by default.

Binary file added static/themes/CCC/img/carlisle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions static/themes/CCC/scss/theme/_page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,26 @@ body.rtl {
text-align: left;
}
}
// This simple custom grid doesn't become columns
.medium5 {
width: 20%;
}
// Carlisle logo includes no padding of it's own, so add in via CSS to stop it standing out from the rest so much
@media #{$small-up} {
.padc {
padding: 2px 5px 6px;
}
}
@media #{$medium-up} {
.padc {
padding: 5px 10px 12px;
}
}
@media #{$large-up} {
.padc {
padding: 10px 20px 25px;
}
}

// About Menu (in footer)
.sub-nav.about-menu {
Expand Down
29 changes: 26 additions & 3 deletions static/themes/CCC/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -253,19 +253,42 @@ body.rtl #poweredby {
text-align: left;
}

/* line 202, ../scss/theme/_page.scss */
/* line 201, ../scss/theme/_page.scss */
.medium5 {
width: 20%;
}

@media only screen {
/* line 205, ../scss/theme/_page.scss */
.padc {
padding: 2px 5px 6px;
}
}
@media only screen and (min-width: 40.0625em) {
/* line 211, ../scss/theme/_page.scss */
.padc {
padding: 5px 10px 12px;
}
}
@media only screen and (min-width: 64.0625em) {
/* line 217, ../scss/theme/_page.scss */
.padc {
padding: 10px 20px 25px;
}
}
/* line 223, ../scss/theme/_page.scss */
.sub-nav.about-menu {
color: #999;
text-align: left;
margin-left: 0;
margin-right: 0;
}
/* line 204, ../scss/theme/_page.scss */
/* line 225, ../scss/theme/_page.scss */
.sub-nav.about-menu a {
color: #999;
}

/* line 212, ../scss/theme/_page.scss */
/* line 233, ../scss/theme/_page.scss */
body.rtl .about-menu {
text-align: right;
}
Expand Down

0 comments on commit cca2bc0

Please sign in to comment.