From 266fc733e0a8551a40deb3bc64dfd66eb8b69f6a Mon Sep 17 00:00:00 2001 From: idoctnef Date: Sat, 4 Jun 2016 20:12:58 +0200 Subject: [PATCH] =?UTF-8?q?avan=C3=A7ant?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HTMLmenu.html | 4 +-- index.js | 4 +++ nosaltres.html | 5 ++-- own.css | 73 +++++++++++++++++++++++++++++++++++++------------- projecte.html | 3 ++- 5 files changed, 65 insertions(+), 24 deletions(-) diff --git a/HTMLmenu.html b/HTMLmenu.html index 22cb204..008b48a 100644 --- a/HTMLmenu.html +++ b/HTMLmenu.html @@ -5,10 +5,10 @@ ENG
- +
Inici - Nosaltres + Nosaltres Contacte
diff --git a/index.js b/index.js index 848a362..6ff5cb0 100644 --- a/index.js +++ b/index.js @@ -16,3 +16,7 @@ function OnLoadDefault(){ function OnLoadIndex(){ OnLoadDefault(); } +function OnLoadNosaltres(){ + OnLoadDefault(); + //document.getElementById("a-nosaltres").className+=" own-currentPageMenu"; +} diff --git a/nosaltres.html b/nosaltres.html index 889d3b6..0198ba5 100644 --- a/nosaltres.html +++ b/nosaltres.html @@ -20,7 +20,8 @@ - + +

@@ -53,7 +54,7 @@
- +
diff --git a/own.css b/own.css index 8d6fd56..0a8250d 100644 --- a/own.css +++ b/own.css @@ -26,13 +26,27 @@ a:active { } /* 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 @@ a:active { .own-menuButtons a:hover{ color: #C85127; } - +.own-currentPageMenu{ + color: #C85127; +} .own-imgHeader{ width: 100%; margin-top: 50px; @@ -249,7 +265,7 @@ a:active { 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 @@ a:active { 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 @@ a:active { text-align: left; vertical-align: top; padding: 10px; + padding-bottom: 40px; } .own-rightBox{ @@ -298,16 +318,31 @@ a:active { 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 @@ a:active { .own-nosaltresTitle{ font-size: 45px; font-weight: bold; - padding-left: 15%; + padding-left: 7%; text-align: left; } .own-nosaltresText{ diff --git a/projecte.html b/projecte.html index 0708876..bc1b97d 100644 --- a/projecte.html +++ b/projecte.html @@ -21,6 +21,7 @@ +
@@ -51,7 +52,7 @@
- +