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.

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

Hotfix/jumbled text ie #2619

Merged
merged 4 commits into from
May 31, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 10 additions & 6 deletions core/client/footer/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@
<div class="container">
<div class="row">
<!-- icons -->
<div class="col-xs-12 col-sm-3 social-media-block">
{{# each network in branding.socialMedia }}
<a href="{{ network.url }}" target="_blank" class="social-media-link">
<img src="/img/social-media-icons/{{ network.name }}.png" alt="{{ network.name }} icon" class="social-media-icon">
</a>
{{/ each }}
<div class="col-xs-12 col-sm-3">
<ul class="list-inline social-media-block">
{{# each network in branding.socialMedia }}
<li>
<a href="{{ network.url }}" target="_blank" class="social-media-link">
<img src="/img/social-media-icons/{{ network.name }}.png" alt="{{ network.name }} icon" class="social-media-icon">
</a>
</li>
{{/ each }}
</ul>
</div>
<div class="col-xs-12 col-sm-3 footer-text">
<div class="row">
Expand Down
12 changes: 0 additions & 12 deletions core/client/footer/footer.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,6 @@
// https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11

footer {
.social-media-icon {
flex: 1;
}

.social-media-block {
display: flex;
flex-direction: row;
justify-content: space-around;
margin-bottom: 10px;
}

@media only screen and (max-width: 767px) {
.social-media-icon {
width: 3em;
Expand All @@ -29,4 +18,3 @@ footer {
cursor: pointer;
}
}

8 changes: 2 additions & 6 deletions core/client/layouts/master_layout/master_layout.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ You may obtain a copy of the licence at
https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11 */

.content-wrapper {
flex: 1;
display: flex;
flex-direction: column;

min-height: 100vh;

h1 {
margin-top: 1em;
}
Expand All @@ -18,7 +16,5 @@ https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence
}

.master-layout {
display: flex;
flex-direction: column;
min-height: 100%;
}
4 changes: 0 additions & 4 deletions home/client/body/homeBody.less
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,3 @@ https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence
#contact-us {
margin-bottom: 4.37em;
}

#features {
flex: 1;
}
1 change: 0 additions & 1 deletion organizations/client/card/organization_card.less
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence
padding: 1em;
width: 100%;
vertical-align: middle;
display: flex;
justify-content: space-between;
position: relative;
overflow: hidden;
Expand Down