diff --git a/app/styles/_commons.scss b/app/styles/_commons.scss
index 07d696b2b7..342e4a4dd5 100644
--- a/app/styles/_commons.scss
+++ b/app/styles/_commons.scss
@@ -3,7 +3,6 @@
@import 'bootstrap-sass-official/assets/stylesheets/bootstrap';
@import 'font-open-sans';
@import 'theme';
-@import "font-awesome/scss/font-awesome";
.btn {
white-space: normal;
diff --git a/app/styles/_theme-variables.scss b/app/styles/_theme-variables.scss
index 1999df8703..e26e62f249 100644
--- a/app/styles/_theme-variables.scss
+++ b/app/styles/_theme-variables.scss
@@ -511,12 +511,10 @@ $list-group-link-heading-color: #333;
$panel-bg: #fff;
$panel-body-padding: 15px;
$panel-heading-padding: 10px 15px;
-$panel-footer-padding: $panel-heading-padding;
$panel-border-radius: $border-radius-base;
//** Border color for elements within panels
$panel-inner-border: #ddd;
-$panel-footer-bg: #f5f5f5;
$panel-default-text: $gray-dark;
$panel-default-border: #ddd;
diff --git a/app/styles/_theme.scss b/app/styles/_theme.scss
index 8b4780889c..af92519985 100644
--- a/app/styles/_theme.scss
+++ b/app/styles/_theme.scss
@@ -313,8 +313,7 @@ label,
}
.panel {
- &.panel-heading,
- &.panel-footer {
+ &.panel-heading {
border-top-right-radius: 0;
border-top-left-radius: 0;
}
diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss
index 6e2378dd3a..fd0cea519b 100644
--- a/app/styles/_variables.scss
+++ b/app/styles/_variables.scss
@@ -11,5 +11,3 @@ $font-size-h6: ceil(($font-size-base * 0.85));
$color-background: whitesmoke;
$btn-default-bg: $color-background;
-
-$fa-font-path: "/bower_components/font-awesome/fonts";
diff --git a/app/styles/footer.css b/app/styles/footer.css
new file mode 100644
index 0000000000..5b0bc3e75c
--- /dev/null
+++ b/app/styles/footer.css
@@ -0,0 +1,21 @@
+footer {
+ background-color: #333;
+ color: #FFF;
+ width: 100%;
+
+ margin-top: 3em;
+ padding-top: 2em;
+ padding-bottom: 1.5em;
+}
+
+footer ul {
+ margin-bottom: 0;
+}
+
+footer li {
+ margin-bottom: .5em;
+}
+
+footer a, footer a:hover, footer a:focus {
+ color: inherit;
+}
diff --git a/app/styles/front.scss b/app/styles/front.scss
index d044da8afc..8af08e1b1b 100644
--- a/app/styles/front.scss
+++ b/app/styles/front.scss
@@ -1,12 +1,5 @@
@import 'commons';
-html {
- overflow-y: scroll;
- position: relative;
- min-height: 100%;
-}
-
-$main-footer-height: 220px;
$body-front-base-padding: 45px; // .navbar's min-height
h1[tabindex="-1"] {
@@ -14,7 +7,6 @@ h1[tabindex="-1"] {
}
.body-front {
- margin-bottom: $main-footer-height;
padding-top: $body-front-base-padding;
background-color: $color-background;
}
@@ -39,23 +31,6 @@ h1[tabindex="-1"] {
vertical-align: middle;
}
-.main-footer {
- background-color: $navbar-default-bg;
- color: $navbar-default-color;
- position: absolute;
- bottom: 0;
- width: 100%;
- height: $main-footer-height;
-
- padding-top: 30px;
- padding-bottom: 30px;
-
- & ul li a {
- color: white;
- font-size: 12px;
- }
-}
-
.form-foyer {
padding-bottom: 5px;
}
diff --git a/app/styles/main.css b/app/styles/main.css
new file mode 100644
index 0000000000..bcf190fa53
--- /dev/null
+++ b/app/styles/main.css
@@ -0,0 +1,19 @@
+html, body {
+ height: 100%;
+}
+
+body {
+ position: relative;
+ padding: 0;
+ display: flex;
+ flex-direction: column;
+}
+
+header, footer {
+ flex: none;
+}
+
+.content {
+ flex: 1 0 auto;
+ width: 100%;
+}
diff --git a/app/styles/text-container.css b/app/styles/text-container.css
index 4f4ce3b05d..4e8d2b1a70 100644
--- a/app/styles/text-container.css
+++ b/app/styles/text-container.css
@@ -2,7 +2,6 @@
font-size: 140%;
line-height: 1.6;
max-width: 40em;
- padding-bottom: 3em;
text-rendering: optimizeLegibility;
}
diff --git a/app/views/front.html b/app/views/front.html
index 78c79948be..d34cac4632 100644
--- a/app/views/front.html
+++ b/app/views/front.html
@@ -24,14 +24,16 @@
-
+
+
+
@@ -82,35 +84,23 @@
-