From e86e768a66d1367f873e3a66194451f52484f39f Mon Sep 17 00:00:00 2001 From: FSinnona Date: Tue, 1 Dec 2015 12:53:49 +0100 Subject: [PATCH] Home page fix --- client/app/app.scss | 1 - client/app/main/main.html | 2 +- client/app/main/main.scss | 14 ++++++++------ client/components/footer/footer.html | 4 +++- client/components/footer/footer.scss | 8 ++++---- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/client/app/app.scss b/client/app/app.scss index 3562115..3cf4ebd 100755 --- a/client/app/app.scss +++ b/client/app/app.scss @@ -37,7 +37,6 @@ $fa-font-path: "../bower_components/font-awesome/fonts"; @import 'main/main.scss'; @import 'organizza/organizza.scss'; @import 'partecipa/partecipa.scss'; -@import 'search/search.scss'; @import '../components/footer/footer.scss'; @import '../components/modal/modal.scss'; // endinjector diff --git a/client/app/main/main.html b/client/app/main/main.html index fae909e..8cba578 100755 --- a/client/app/main/main.html +++ b/client/app/main/main.html @@ -4,7 +4,7 @@
-
+
diff --git a/client/app/main/main.scss b/client/app/main/main.scss index 18d4a99..237baa2 100755 --- a/client/app/main/main.scss +++ b/client/app/main/main.scss @@ -42,7 +42,7 @@ body { #homeSlider { width: 100%; - /*height: 300px;*/ + /*height: 2000px;*/ overflow: hidden; position: relative; .carousel, .carousel-inner, .carousel-inner > .item { @@ -62,17 +62,20 @@ body { } .carousel-caption { bottom: 50%; + width: 65%; + text-align: center; h4 { font-family: "Oswald", sans-serif; - font-size: 50px; + font-size: 45px; text-shadow: 0 0 20px #000; + font-weight: bold; } } } #homesearch { position: absolute; - bottom: 20%; + bottom: 30%; left: 50%; margin-left: -250px; width: 500px; @@ -191,8 +194,7 @@ hr { } .main-container { - margin-top: 130px; - padding-bottom: 130px; + margin-top: 20px; } .main-container.container { padding-bottom: 40px; @@ -341,7 +343,7 @@ hr { } .navbar-default { z-index: 1; - position: fixed; + position: relative; top: 0; bottom: 0; width: 100%; diff --git a/client/components/footer/footer.html b/client/components/footer/footer.html index d58b3e3..c47503a 100755 --- a/client/components/footer/footer.html +++ b/client/components/footer/footer.html @@ -2,8 +2,10 @@
diff --git a/client/components/footer/footer.scss b/client/components/footer/footer.scss index 44debe2..be92116 100755 --- a/client/components/footer/footer.scss +++ b/client/components/footer/footer.scss @@ -3,12 +3,12 @@ footer.footer { bottom: 0; left: 0; right: 0; - height: 130px; + height: 200px; background: #EDEFED; margin-top: 0 !important; } footer.homeFooter { - position: fixed; + position: relative; } @@ -17,7 +17,7 @@ footer .navbar li { float: left; position: relative; display: block; - width: 33%; + width: 25%; a { font-family: "Oswald", sans-serif; @@ -26,4 +26,4 @@ footer .navbar li { color: #666; text-decoration: none; } -} \ No newline at end of file +} -- 2.20.1