Skip to content

Commit 02d6ba0

Browse files
MattiSGMattiSG
authored
Improve footer
2 parents 030d6c7 + 4b20361 commit 02d6ba0

File tree

11 files changed

+63
-65
lines changed

11 files changed

+63
-65
lines changed

‎app/styles/_commons.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
@import 'bootstrap-sass-official/assets/stylesheets/bootstrap';
44
@import 'font-open-sans';
55
@import 'theme';
6-
@import "font-awesome/scss/font-awesome";
76

87
.btn {
98
white-space: normal;

‎app/styles/_theme-variables.scss‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,12 +511,10 @@ $list-group-link-heading-color: #333;
511511
$panel-bg: #fff;
512512
$panel-body-padding: 15px;
513513
$panel-heading-padding: 10px 15px;
514-
$panel-footer-padding: $panel-heading-padding;
515514
$panel-border-radius: $border-radius-base;
516515

517516
//** Border color for elements within panels
518517
$panel-inner-border: #ddd;
519-
$panel-footer-bg: #f5f5f5;
520518

521519
$panel-default-text: $gray-dark;
522520
$panel-default-border: #ddd;

‎app/styles/_theme.scss‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,7 @@ label,
313313
}
314314

315315
.panel {
316-
&.panel-heading,
317-
&.panel-footer {
316+
&.panel-heading {
318317
border-top-right-radius: 0;
319318
border-top-left-radius: 0;
320319
}

‎app/styles/_variables.scss‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,3 @@ $font-size-h6: ceil(($font-size-base * 0.85));
1111

1212
$color-background: whitesmoke;
1313
$btn-default-bg: $color-background;
14-
15-
$fa-font-path: "/bower_components/font-awesome/fonts";

‎app/styles/footer.css‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
footer {
2+
background-color: #333;
3+
color: #FFF;
4+
width: 100%;
5+
6+
margin-top: 3em;
7+
padding-top: 2em;
8+
padding-bottom: 1.5em;
9+
}
10+
11+
footer ul {
12+
margin-bottom: 0;
13+
}
14+
15+
footer li {
16+
margin-bottom: .5em;
17+
}
18+
19+
footer a, footer a:hover, footer a:focus {
20+
color: inherit;
21+
}

‎app/styles/front.scss‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
@import 'commons';
22

3-
html {
4-
overflow-y: scroll;
5-
position: relative;
6-
min-height: 100%;
7-
}
8-
9-
$main-footer-height: 220px;
103
$body-front-base-padding: 45px; // .navbar's min-height
114

125
h1[tabindex="-1"] {
136
outline: none;
147
}
158

169
.body-front {
17-
margin-bottom: $main-footer-height;
1810
padding-top: $body-front-base-padding;
1911
background-color: $color-background;
2012
}
@@ -39,23 +31,6 @@ h1[tabindex="-1"] {
3931
vertical-align: middle;
4032
}
4133

42-
.main-footer {
43-
background-color: $navbar-default-bg;
44-
color: $navbar-default-color;
45-
position: absolute;
46-
bottom: 0;
47-
width: 100%;
48-
height: $main-footer-height;
49-
50-
padding-top: 30px;
51-
padding-bottom: 30px;
52-
53-
& ul li a {
54-
color: white;
55-
font-size: 12px;
56-
}
57-
}
58-
5934
.form-foyer {
6035
padding-bottom: 5px;
6136
}

‎app/styles/main.css‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
html, body {
2+
height: 100%;
3+
}
4+
5+
body {
6+
position: relative;
7+
padding: 0;
8+
display: flex;
9+
flex-direction: column;
10+
}
11+
12+
header, footer {
13+
flex: none;
14+
}
15+
16+
.content {
17+
flex: 1 0 auto;
18+
width: 100%;
19+
}

‎app/styles/text-container.css‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
font-size: 140%;
33
line-height: 1.6;
44
max-width: 40em;
5-
padding-bottom: 3em;
65

76
text-rendering: optimizeLegibility;
87
}

‎app/views/front.html‎

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@
2424

2525
<meta name="fragment" content="!" />
2626

27-
27+
<link rel="stylesheet" href="/styles/main.css">
2828
<link rel="stylesheet" href="/styles/header.css">
2929
<link rel="stylesheet" href="/styles/front.css">
30+
<link rel="stylesheet" href="/styles/footer.css">
3031
<link rel="stylesheet" href="/styles/homepage.css">
3132
<link rel="stylesheet" href="/styles/individu-form.css">
3233
<link rel="stylesheet" href="/styles/resources.css">
3334
<link rel="stylesheet" href="/styles/logement.css">
3435
<link rel="stylesheet" href="/styles/resultat.css">
36+
<link rel="stylesheet" href="/js/lib/font-awesome/css/font-awesome.min.css">
3537
<link rel="stylesheet" href="/styles/text-container.css">
3638

3739
<base href="/">
@@ -82,35 +84,23 @@
8284
</ui-view>
8385
</div>
8486

85-
<footer class="main-footer" role="contentinfo">
87+
<footer>
8688
<nav class="container">
87-
<div class="col-md-3">
88-
<h4>Mes aides</h4>
89-
<ul class="list-unstyled">
90-
<li><a ui-sref="a-propos">À propos</a></li>
91-
<li><a ui-sref="cgu">Conditions d'utilisation</a></li>
92-
<li><a ui-sref="sos">SOS</a></li>
93-
<li><a ui-sref="communication">Supports de communication</a></li>
94-
<li><a ui-sref="ameliorer">Améliorer ce site</a></li>
95-
<li><a href="mailto:[email protected] ">Contact</a></li>
96-
</ul>
97-
</div>
98-
<div class="col-md-2 hidden-sm hidden-xs">
99-
<h4>Partenaires</h4>
100-
<ul class="list-unstyled">
101-
<li><a target="_blank" rel="noopener" href="http://service-public.fr/" title="service-public.fr - nouvelle fenêtre">service-public.fr</a></li>
102-
<li><a target="_blank" rel="noopener" href="http://ameli.fr/" title="ameli.fr - nouvelle fenêtre">ameli.fr</a></li>
103-
<li><a target="_blank" rel="noopener" href="http://www.caf.fr/" title="caf.fr - nouvelle fenêtre">caf.fr</a></li>
104-
<li><a target="_blank" rel="noopener" href="https://www.lassuranceretraite.fr/" title="lassuranceretraite.fr - nouvelle fenêtre">lassuranceretraite.fr</a></li>
105-
<li><a target="_blank" rel="noopener" href="http://www.modernisation.gouv.fr/le-sgmap" title="SGMAP - nouvelle fenêtre">SGMAP</a></li>
106-
<li><a target="_blank" rel="noopener" href="http://www.openfisca.fr/" title="OpenFisca - nouvelle fenêtre">OpenFisca</a></li>
107-
</ul>
108-
</div>
109-
<div class="col-md-offset-4 col-md-3">
110-
<ul class="list-unstyled">
111-
<li><a target="_blank" rel="noopener" href="https://twitter.com/mesaides" title="Suivez nous sur Twitter - nouvelle fenêtre"><i class="fa fa-twitter" aria-hidden="true" role="presentation"></i> Suivez-nous sur Twitter</a></li>
112-
</ul>
113-
</div>
89+
<ul class="col-md-4 list-unstyled">
90+
<li><span class="fa fa-fw fa-life-ring" aria-hidden="true"></span>&nbsp;<a ui-sref="sos">SOS</a></li>
91+
<li><span class="fa fa-fw fa-paperclip" aria-hidden="true"></span>&nbsp;<a ui-sref="cgu">Conditions d'utilisation</a></li>
92+
<li><span class="fa fa-fw fa-envelope" aria-hidden="true"></span>&nbsp;<a href="mailto:[email protected] ">Contact</a></li>
93+
</ul>
94+
<ul class="col-md-4 list-unstyled">
95+
<li><span class="fa fa-fw fa-question-circle" aria-hidden="true"></span>&nbsp;<a ui-sref="a-propos">À propos</a></li>
96+
<li><span class="fa fa-fw fa-bullhorn" aria-hidden="true"></span>&nbsp;<a ui-sref="communication">Supports de communication</a></li>
97+
<li><span class="fa fa-fw fa-building-o" aria-hidden="true"></span>&nbsp;<a href="http://les-aides.fr">Les aides pour les entreprises</a></li>
98+
</ul>
99+
<ul class="col-md-4 list-unstyled">
100+
<li><span class="fa fa-fw fa-newspaper-o" aria-hidden="true"></span>&nbsp;<a target="_blank" rel="noopener" href="http://eepurl.com/bD9PNP">Abonnez-vous à nos informations</a></li>
101+
<li><span class="fa fa-fw fa-twitter" aria-hidden="true"></span>&nbsp;<a target="_blank" rel="noopener" href="https://twitter.com/mesaides">Suivez-nous sur Twitter</a></li>
102+
<li><span class="fa fa-fw fa-pencil" aria-hidden="true"></span>&nbsp;<a ui-sref="ameliorer">Améliorez ce site</a></li>
103+
</ul>
114104
</nav>
115105
</footer>
116106

‎bower.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
"bootstrap-sass-official": "~3.3.1",
3131
"ngstorage": "~0.3.0",
3232
"moment": "~2.7.0",
33-
"lodash": "~2.4.1",
34-
"font-awesome": "~4.2"
33+
"lodash": "~2.4.1"
3534
},
3635
"devDependencies": {
3736
"angular-mocks": "~1.4"

0 commit comments

Comments
 (0)