Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement/footer update #481

Merged
merged 2 commits into from
Nov 26, 2024
Merged

Enhancement/footer update #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
472fcc5
Uptime root logo addition and logo corrections
peters-rebecca Nov 26, 2024
568e797
Tidying empty CSS rules
peters-rebecca Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions src/app/components/footer/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<footer class="p-60" style="padding-bottom: 10px">

<div layout="row" layout-xs="column" layout-sm="column" layout-wrap layout-align="space-between center" layout-align-xs="space-between stretch " style="color:white; margin:0 auto; max-width:1200px">
<div layout="row" layout-xs="column" layout-sm="column" layout-wrap layout-align="space-between center" layout-align-xs="space-between stretch " style="color:white; margin:0 auto; max-width:1050px">

<div>
<div class="footer-block">
<img style="height:80px" src="./assets/images/smartcitizen_logo2.svg" alt="logos" />
</div>

<div layout="row" layout-align="space-between center" class="border-white p-20 mb-10">
<!-- <div layout="row" layout-align="space-between center" class="border-white mb-10">
<div class="mr-10">Follow us</div>
<a class="mr-10" href="https://twitter.com/smartcitizenkit">
<img style="height:30px" src="./assets/images/tw.svg" alt="twitter" />
Expand All @@ -17,9 +17,9 @@
<a href="https://www.instagram.com/smartcitizenkit/">
<img style="height:30px" src="./assets/images/in.svg" alt="instagram" />
</a>
</div>
</div> -->

<div layout="row" layout-align="space-between center" class="border-white p-20 mb-10">
<div layout="row" layout-align="space-between center" class="border-white p-20 mb-10 footer-block">
<div class="mr-10">A project by</div>
<a class="mr-10" href="https://fablabbcn.org">
<img style="height:36px; margin-right: 7px" src="./assets/images/logo_fablab_bcn_small.png" alt="fablab" />
Expand All @@ -29,16 +29,17 @@
</a>
</div>


<div flex="25" flex-xs="100" layout="row" layout-xs="column" layout-sm="column" layout-align="start center">
<img style="height:48px; padding-right: 15px" src="./assets/images/eu_flag.png" alt="fablab" />
<p class="color-white text-funding"> Smart Citizen has received funding from the European Community’s H2020 Programme under Grant Agreement No. 689954. </p>
<div flex="25" flex-xs="100" layout="row" layout-xs="column" layout-sm="column" layout-align="start center" class="footer-block">
<img class="flag" style="height:48px" src="./assets/images/eu_flag.png" alt="fablab" />
<p class="color-white text-funding"> Smart Citizen has received funding from the European Community’s H2020 Programme under Grant Agreement No. 689954.</p>
</div>

<div flex="100" layout="row" layout-align="center center" style="margin-top:20px; padding-bottom:10px" >
<p class="color-white text-center">Except where otherwise noted, content on this site by Smart Citizen® is licensed under a <a class="footer-link" rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>. Check the <a class="footer-link" rel="policy" href="policy">Terms of use and Privacy Policy</a> </p>
<div layout="row" layout-align="space-between center" class="footer-block sponsor">
<div class="sponsor-text"><p>Monitoring sponsored by</p></div>
<div><img class="uptimerobot-logo" src="./assets/images/uptimerobot-logo.svg" alt="fablab" /></div>
</div>

</div>
<div flex="100" layout="row" layout-align="center center" style="margin-top:20px; padding-bottom:10px">
<p class="color-white text-center" style="max-width: 550px">Except where otherwise noted, content on this site by Smart Citizen® is licensed under a <a class="footer-link" rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>. Check the <a class="footer-link" rel="policy" href="policy">Terms of use and Privacy Policy</a>.</p>
</div>

</footer>
117 changes: 80 additions & 37 deletions src/app/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,11 @@ a.footer-link{
color:$blue;
}
}
a.md-button, a,
button.md-button, button{
// color here overwrites MAP and COMMUNITY in navbar
// color: $terciary_color;
}
// a.md-button, a,
// button.md-button, button{
// // color here overwrites MAP and COMMUNITY in navbar
// // color: $terciary_color;
// }

/*
Overwrite global material design, allow icons to be smaller
Expand Down Expand Up @@ -248,9 +248,9 @@ a.md-button h4, a.md-button .h4{
a.warn,
button.warn{
color: $alert_red;
svg {
// fill: $alert_red;
}
// svg {
// // fill: $alert_red;
// }
}

.bold{
Expand Down Expand Up @@ -319,17 +319,17 @@ md-select:not([disabled]):focus .md-select-value {
border-bottom-color: #6B868D;
}

button.md-primary{
// Get new kit popup, button color
// Also interferes with kits/edit save button
// color:$terciary_color !important;
// font-size:18px;
}
.md-button.md-flat.md-primary {
//margin: 0px;
//background-color: $terciary_color;
//color: white !important;
}
// button.md-primary{
// // Get new kit popup, button color
// // Also interferes with kits/edit save button
// // color:$terciary_color !important;
// // font-size:18px;
// }
// .md-button.md-flat.md-primary {
// //margin: 0px;
// //background-color: $terciary_color;
// //color: white !important;
// }

.md-button.md-primary.md-flat:not([disabled]):hover {
background-color: $terciary_color;
Expand Down Expand Up @@ -529,10 +529,10 @@ md-progress-linear.md-hue-3 .md-bar {
z-index: 1;
}

@media only screen and (max-device-width: 1024px) {
.map_state {
}
}
// @media only screen and (max-device-width: 1024px) {
// .map_state {
// }
// }

section.map {
background-color: white;
Expand Down Expand Up @@ -1065,12 +1065,12 @@ KIT TAGS MODULE
padding: 8px 0 0 8px;
font-size: 12px;

span {
// Make balloons on map smaller
//border-radius: 20px;
//margin-right: 10px;
//padding: 3px 8px;
}
// span {
// // Make balloons on map smaller
// //border-radius: 20px;
// //margin-right: 10px;
// //padding: 3px 8px;
// }

tag, span {
margin-bottom: 8px;
Expand Down Expand Up @@ -1491,8 +1491,8 @@ md-tabs-canvas {
background-color: $background_blue_dark_menu;
}
}
.myProfile_tabs {
}
// .myProfile_tabs {
// }
.myProfile_tab_icon {
width: 16px;
height: 16px;
Expand Down Expand Up @@ -1640,6 +1640,49 @@ footer {
width: 32px;
height: 32px;
}
.flag {
padding-right: 15px;
}
.border-white.footer-block{
border: 2px white solid;
}
.uptimerobot-logo {
width: 150px;
justify-self: right;
vertical-align: center;
padding-top: 10px;
}
.sponsor {
display: flex;
flex-direction: column;
justify-content: start;
align-items: flex-start;
}
.sponsor-text p {
font-size: 15px !important;
margin: 0px;
}
@media only screen and (max-width: 950px) {
.color-white{
text-align: center;
}
.flag {
padding-right: 0px;
}
.footer-block {
margin-bottom: 20px !important;
}
.sponsor {
justify-content: center;
align-items: center;
}
}
@media (max-width: 599px) {
.layout-align-xs-start-stretch, .layout-align-xs-center-stretch, .layout-align-xs-end-stretch, .layout-align-xs-space-between-stretch, .layout-align-xs-space-around-stretch{
align-items: center;
}
}


/*
RECOVERY PASSWORD STATE
Expand Down Expand Up @@ -1802,12 +1845,12 @@ section.relaxed-layout {
&.isEven {
background-color: #F9F9FB;
}
&.form_blockNormal {
// min-height: 250px;
}
&.form_blockMap {
//height: 290px;
}
// &.form_blockNormal {
// // min-height: 250px;
// }
// &.form_blockMap {
// //height: 290px;
// }
}
.form_blockInput {
height: inherit;
Expand Down
32 changes: 32 additions & 0 deletions src/assets/images/uptimerobot-logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.