Merge branch 'master' of ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

This commit is contained in:
Lorenzo Giacomelli
2016-03-29 19:52:13 +02:00
3 changed files with 13 additions and 10 deletions
Binary file not shown.
+13 -10
View File
@@ -1,7 +1,9 @@
@CHARSET "UTF-8";
@font-face {
font-family: bebas;
src: url(../fonts/bebas.woff);
font-family: 'Bebas Neue';
font-style: normal;
font-weight: normal;
src: local('Bebas Neue'), url('BebasNeue.woff') format('woff');
}
a{text-decoration:none;}
@@ -65,10 +67,10 @@ body{font-family:lato, arial;}
.categoryVoice > a {padding:10px 9px;display:block;color:white;font-weight:bold;}
.footer{background-color:#14477c;height:150px;margin-top:10px;font-size:10pt;}
.footer{background-color:#14477c;padding-bottom: 15px;margin-top:10px;font-size:10pt;}
.footerCategory{text-align:center;color:#2e91d4;padding:10px;}
.footerCategory > a{color:#2e91d4;margin:10px;}
.footer > div{text-align:center;color:white;margin-top:20px;}
.footer > div{text-align:center;color:white;margin-top:5px;}
.leftBarNews{
width: 610px;
@@ -189,12 +191,12 @@ display: inline-block;
.socialBarAnsa > a > div{display:inline-block;width:22px;height:22px;background-repeat:no-repeat;background-position:center;}
.categoryNews{width:610px;/* height:285px;*/ margin-bottom:29px;position:relative;}
.categoryBar{height:22px;}
.categoryTag{
.categoryBar{height:27px;}
.categoryTag{
padding-top:5px;
display: inline-block;
text-align: center;
color: white;
font-weight: bold;
font-size: 20px;
background-color: #339cd5;
vertical-align: middle;
@@ -202,7 +204,8 @@ display: inline-block;
margin: 0px;
z-index: 2;
position: relative;
letter-spacing:-1px;
font-family:"Bebas Neue";
padding-top:5px;
}
@@ -263,7 +266,7 @@ display: inline-block;
}
.culturaMainMedia > img{max-height: 100px;}
.culturaMainMedia.mediaContent > iframe{min-height:150px;max-height:180px;}
.ristorantiTitle, .culturaTitle{font-weight: bold;text-align: left;font-size: 12px;}
.culturaTitle{text-align: left;font-size: 12px;}
.ristorantiBlock .ristorantiLink > a, .culturaNews .culturaLink > a{color:#3498d4;font-size:13px;}
.middleBanner{height:115px; width:150px;}
.middleBanner > img{max-height:100px;max-width:220px;}
@@ -277,7 +280,7 @@ display: inline-block;
/* height:1380px; */
vertical-align:top;
padding:10px 5px;
border-left:solid #b3b3b3 1px;
box-shadow: 0px -10px 10px -3px;
}
.meteoTitle{font-size: 15px;font-weight: bold;border-bottom: 3px solid #339CD5;margin-bottom: 7px;text-align:center;}