arnaucube
arnaucube/ivardiawebPublic Self-hosted repository
avançant
idoctnef idoctnef@openmailbox.org
Sat, 04 Jun 2016 20:12:58 +0200
commit

266fc733e0a8551a40deb3bc64dfd66eb8b69f6a

parent

cc9d7a151c2094a5464a6d32035bf2e32b6ae523

5 files changed, 65 insertions(+), 24 deletions(-)

jump to
M HTMLmenu.html → HTMLmenu.html

@@ -5,10 +5,10 @@ <a href='#'>CAST</a>

<a href='#'>ENG</a> </div> <div class='own-menu'> - <a href='index.html'><img class='own-overImage-logo' src='http://placehold.it/200x50' /></a> + <a href='index.html'><img class='own-overImage-logo' src='imatges/ivardialogo_invert_transparent.png' /></a> <div class='own-menuButtons'> <a href="index.html">Inici</a> - <a href='nosaltres.html'>Nosaltres</a> + <a id='a-nosaltres' href='nosaltres.html'>Nosaltres</a> <a href='#'>Contacte</a> </div> </div>
M index.js → index.js

@@ -16,3 +16,7 @@

function OnLoadIndex(){ OnLoadDefault(); } +function OnLoadNosaltres(){ + OnLoadDefault(); + //document.getElementById("a-nosaltres").className+=" own-currentPageMenu"; +}
M nosaltres.html → nosaltres.html

@@ -20,7 +20,8 @@ <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>

<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> </head> - <body onload='OnLoadDefault();'> + <body onload='OnLoadNosaltres();'> + <div class='container'> <div id='HTMLmenu'></div> <br> <div class='own-nosaltresContent'>

@@ -53,7 +54,7 @@ </a>

</div> </div> </div> - +</div><!-- /container --> <div id='HTMLfooter'></div>
M own.css → own.css

@@ -26,13 +26,27 @@ .own-container{

} /* index */ -.own-indexBackgroundImage{ - width: 100%; - /*height: 100%;*/ - z-index: -1; - position: fixed; - left: 0px; - top: 0px; + +@media (min-width:550px) { + .own-indexBackgroundImage{ + width: 100%; + /*height: 100%;*/ + z-index: -1; + position: fixed; + left: 0px; + top: 0px; + } +} + +@media (max-width:550px) { + .own-indexBackgroundImage{ + /*width: 100%;*/ + height: 100%; + z-index: -1; + position: fixed; + left: 0px; + top: 0px; + } } .own-langIndex{ text-align: right;

@@ -235,7 +249,9 @@ }

.own-menuButtons a:hover{ color: #C85127; } - +.own-currentPageMenu{ + color: #C85127; +} .own-imgHeader{ width: 100%; margin-top: 50px;

@@ -249,7 +265,7 @@ .own-linksLeft{

display: inline-block; vertical-align: top; margin-top: 20px; - margin-right: 20px; + margin-right: 40px; margin-bottom: 40px; max-width: 100px; }

@@ -261,6 +277,9 @@ display: block;

margin: 10px; margin-bottom: 30px; text-align: center; + border-top: 1px solid #000000; + padding-top: 20px; + width: 120px; } .own-linksLeft a:visited{ color: #000000;

@@ -277,6 +296,7 @@ max-width: 600px;

text-align: left; vertical-align: top; padding: 10px; + padding-bottom: 40px; } .own-rightBox{

@@ -298,16 +318,31 @@ .own-rightBox a:hover{

color: #C85127; } -.own-textBoxLeft{ - display: inline-block; - vertical-align: top; - margin-top: 20px; - margin-right: 20px; - margin-bottom: 40px; - max-width: 100px; - text-align: left; - font-weight: bold; +@media (max-width:960px) { + .own-textBoxLeft{ + display: inline-block; + vertical-align: top; + margin-top: 20px; + margin-right: 20px; + margin-bottom: 40px; + max-width: 600px; + text-align: left; + font-weight: bold; + } +} +@media (min-width:960px) { + .own-textBoxLeft{ + display: inline-block; + vertical-align: top; + margin-top: 20px; + margin-right: 20px; + margin-bottom: 40px; + max-width: 100px; + text-align: left; + font-weight: bold; + } } + .own-nosaltresCenterRight{ display: inline-block; max-width: 800px;

@@ -322,7 +357,7 @@

.own-nosaltresTitle{ font-size: 45px; font-weight: bold; - padding-left: 15%; + padding-left: 7%; text-align: left; } .own-nosaltresText{
M projecte.html → projecte.html

@@ -21,6 +21,7 @@ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>

<![endif]--> </head> <body onload='OnLoadDefault();'> + <div class='container'> <div id='HTMLmenu'></div> <img class='own-imgHeader' src='imatges/header1.png' />

@@ -51,7 +52,7 @@ <img class='own-socialNetwork' src='icones/i_teaser.png' />Teaser

</a> </div> </div> - +</div><!-- /container --> <div id='HTMLfooter'></div>