projects
/
YouAndWeb_TwoToc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f7c47c5
)
Home page fix
author
FSinnona
<fabio.sinnona@nextrek.net>
Tue, 1 Dec 2015 11:53:49 +0000
(12:53 +0100)
committer
FSinnona
<fabio.sinnona@nextrek.net>
Tue, 1 Dec 2015 11:53:49 +0000
(12:53 +0100)
client/app/app.scss
patch
|
blob
|
history
client/app/main/main.html
patch
|
blob
|
history
client/app/main/main.scss
patch
|
blob
|
history
client/components/footer/footer.html
patch
|
blob
|
history
client/components/footer/footer.scss
patch
|
blob
|
history
diff --git
a/client/app/app.scss
b/client/app/app.scss
index
3562115
..
3cf4ebd
100755
(executable)
--- 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 '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
@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
(executable)
--- a/
client/app/main/main.html
+++ b/
client/app/main/main.html
@@
-4,7
+4,7
@@
<div class="main-container">
<div class="main-container">
- <div id="homeSlider" resizewin ng-style="style(
26
0)">
+ <div id="homeSlider" resizewin ng-style="style(
1
0)">
<carousel interval="5000">
<slide ng-repeat="slide in slides" active="slide.active">
<img ng-src="/assets/images/{{ slide.image }}">
<carousel interval="5000">
<slide ng-repeat="slide in slides" active="slide.active">
<img ng-src="/assets/images/{{ slide.image }}">
diff --git
a/client/app/main/main.scss
b/client/app/main/main.scss
index
18d4a99
..
237baa2
100755
(executable)
--- a/
client/app/main/main.scss
+++ b/
client/app/main/main.scss
@@
-42,7
+42,7
@@
body {
#homeSlider {
width: 100%;
#homeSlider {
width: 100%;
- /*height:
3
00px;*/
+ /*height:
20
00px;*/
overflow: hidden;
position: relative;
.carousel, .carousel-inner, .carousel-inner > .item {
overflow: hidden;
position: relative;
.carousel, .carousel-inner, .carousel-inner > .item {
@@
-62,17
+62,20
@@
body {
}
.carousel-caption {
bottom: 50%;
}
.carousel-caption {
bottom: 50%;
+ width: 65%;
+ text-align: center;
h4 {
font-family: "Oswald", sans-serif;
h4 {
font-family: "Oswald", sans-serif;
- font-size:
50
px;
+ font-size:
45
px;
text-shadow: 0 0 20px #000;
text-shadow: 0 0 20px #000;
+ font-weight: bold;
}
}
}
#homesearch {
position: absolute;
}
}
}
#homesearch {
position: absolute;
- bottom:
2
0%;
+ bottom:
3
0%;
left: 50%;
margin-left: -250px;
width: 500px;
left: 50%;
margin-left: -250px;
width: 500px;
@@
-191,8
+194,7
@@
hr {
}
.main-container {
}
.main-container {
- margin-top: 130px;
- padding-bottom: 130px;
+ margin-top: 20px;
}
.main-container.container {
padding-bottom: 40px;
}
.main-container.container {
padding-bottom: 40px;
@@
-341,7
+343,7
@@
hr {
}
.navbar-default {
z-index: 1;
}
.navbar-default {
z-index: 1;
- position:
fixed
;
+ position:
relative
;
top: 0;
bottom: 0;
width: 100%;
top: 0;
bottom: 0;
width: 100%;
diff --git
a/client/components/footer/footer.html
b/client/components/footer/footer.html
index
d58b3e3
..
c47503a
100755
(executable)
--- a/
client/components/footer/footer.html
+++ b/
client/components/footer/footer.html
@@
-2,8
+2,10
@@
<ul class="navbar">
<li><a>Contatti</a></li>
<li><a>Iscriviti</a></li>
<ul class="navbar">
<li><a>Contatti</a></li>
<li><a>Iscriviti</a></li>
- <li><a>Seguici</a><br>F T</li>
+ <li><a>Seguici</a></li>
+ <li><a>Patner</a></li>
<li><a>FAQ</a></li>
<li><a>Termini e Condizioni</a></li>
<li><a>FAQ</a></li>
<li><a>Termini e Condizioni</a></li>
+ <li><a>F T</a></li>
</ul>
</div>
</ul>
</div>
diff --git
a/client/components/footer/footer.scss
b/client/components/footer/footer.scss
index
44debe2
..
be92116
100755
(executable)
--- a/
client/components/footer/footer.scss
+++ b/
client/components/footer/footer.scss
@@
-3,12
+3,12
@@
footer.footer {
bottom: 0;
left: 0;
right: 0;
bottom: 0;
left: 0;
right: 0;
- height:
13
0px;
+ height:
20
0px;
background: #EDEFED;
margin-top: 0 !important;
}
footer.homeFooter {
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;
float: left;
position: relative;
display: block;
- width:
33
%;
+ width:
25
%;
a {
font-family: "Oswald", sans-serif;
a {
font-family: "Oswald", sans-serif;
@@
-26,4
+26,4
@@
footer .navbar li {
color: #666;
text-decoration: none;
}
color: #666;
text-decoration: none;
}
-}
\ No newline at end of file
+}