diff --git a/HTMLmenu.html b/HTMLmenu.html index 3871edb..22cb204 100644 --- a/HTMLmenu.html +++ b/HTMLmenu.html @@ -1,35 +1,15 @@ - + + diff --git a/HTMLmenuOLD.html b/HTMLmenuOLD.html new file mode 100644 index 0000000..3871edb --- /dev/null +++ b/HTMLmenuOLD.html @@ -0,0 +1,35 @@ + diff --git a/botons/b_enviar_negre.png b/botons/b_enviar_negre.png new file mode 100644 index 0000000..4a5503c Binary files /dev/null and b/botons/b_enviar_negre.png differ diff --git a/botons/b_enviar_taronja.png b/botons/b_enviar_taronja.png new file mode 100644 index 0000000..fb2a2ea Binary files /dev/null and b/botons/b_enviar_taronja.png differ diff --git a/botons/b_fletxa_d.png b/botons/b_fletxa_d.png new file mode 100644 index 0000000..7ad8cc3 Binary files /dev/null and b/botons/b_fletxa_d.png differ diff --git a/botons/b_fletxa_e.png b/botons/b_fletxa_e.png new file mode 100644 index 0000000..f110bbe Binary files /dev/null and b/botons/b_fletxa_e.png differ diff --git a/botons/b_verkami.png b/botons/b_verkami.png new file mode 100644 index 0000000..3990450 Binary files /dev/null and b/botons/b_verkami.png differ diff --git a/icones/i_articles.png b/icones/i_articles.png new file mode 100644 index 0000000..02c4aad Binary files /dev/null and b/icones/i_articles.png differ diff --git a/icones/i_articles_taronja.png b/icones/i_articles_taronja.png new file mode 100644 index 0000000..1fa8f0c Binary files /dev/null and b/icones/i_articles_taronja.png differ diff --git a/icones/i_campanyessuport.png b/icones/i_campanyessuport.png new file mode 100644 index 0000000..2d64530 Binary files /dev/null and b/icones/i_campanyessuport.png differ diff --git a/icones/i_capanyessuport_taronja.png b/icones/i_capanyessuport_taronja.png new file mode 100644 index 0000000..eba0678 Binary files /dev/null and b/icones/i_capanyessuport_taronja.png differ diff --git a/icones/i_facebook.png b/icones/i_facebook.png new file mode 100644 index 0000000..7bb1fe8 Binary files /dev/null and b/icones/i_facebook.png differ diff --git a/icones/i_facebook_taronja.png b/icones/i_facebook_taronja.png new file mode 100644 index 0000000..6b92d27 Binary files /dev/null and b/icones/i_facebook_taronja.png differ diff --git a/icones/i_mail.png b/icones/i_mail.png new file mode 100644 index 0000000..2113013 Binary files /dev/null and b/icones/i_mail.png differ diff --git a/icones/i_mail_taronja.png b/icones/i_mail_taronja.png new file mode 100644 index 0000000..8dd9aa8 Binary files /dev/null and b/icones/i_mail_taronja.png differ diff --git a/icones/i_play.png b/icones/i_play.png new file mode 100644 index 0000000..0f299c8 Binary files /dev/null and b/icones/i_play.png differ diff --git a/icones/i_teaser.png b/icones/i_teaser.png new file mode 100644 index 0000000..9403c61 Binary files /dev/null and b/icones/i_teaser.png differ diff --git a/icones/i_teaser_taronja.png b/icones/i_teaser_taronja.png new file mode 100644 index 0000000..6a1fd95 Binary files /dev/null and b/icones/i_teaser_taronja.png differ diff --git a/icones/i_telefon.png b/icones/i_telefon.png new file mode 100644 index 0000000..7665f85 Binary files /dev/null and b/icones/i_telefon.png differ diff --git a/icones/i_twitter.png b/icones/i_twitter.png new file mode 100644 index 0000000..94d644c Binary files /dev/null and b/icones/i_twitter.png differ diff --git a/icones/i_twitter_taronja.png b/icones/i_twitter_taronja.png new file mode 100644 index 0000000..4349628 Binary files /dev/null and b/icones/i_twitter_taronja.png differ diff --git a/icones/i_vimeo.png b/icones/i_vimeo.png new file mode 100644 index 0000000..ba5aeb6 Binary files /dev/null and b/icones/i_vimeo.png differ diff --git a/icones/i_vimeo_taronja.png b/icones/i_vimeo_taronja.png new file mode 100644 index 0000000..743936b Binary files /dev/null and b/icones/i_vimeo_taronja.png differ diff --git a/icones/i_vk.png b/icones/i_vk.png new file mode 100644 index 0000000..914c658 Binary files /dev/null and b/icones/i_vk.png differ diff --git a/index.html b/index.html index baa944b..6af4bd4 100644 --- a/index.html +++ b/index.html @@ -29,7 +29,7 @@ ENG
- +
Inici Nosaltres @@ -39,15 +39,15 @@
El Sol del Nord
-construint l'autonomia a Bakur-
- +
- - - + + +
- TEASER + TEASER
-
diff --git a/index.js b/index.js index 2796891..848a362 100644 --- a/index.js +++ b/index.js @@ -1,14 +1,18 @@ //http://placehold.it/1920x1080 -function OnLoadIndex(){ - /*$(document).ready(function(e) { +function OnLoadDefault(){ + $(document).ready(function(e) { $('#HTMLmenu').load('HTMLmenu.html',function(){ // }); - });*/ + }); $(document).ready(function(e) { $('#HTMLfooter').load('HTMLfooter.html',function(){ // }); }); } + +function OnLoadIndex(){ + OnLoadDefault(); +} diff --git a/nosaltres.html b/nosaltres.html index adf05f4..aafa146 100644 --- a/nosaltres.html +++ b/nosaltres.html @@ -20,23 +20,8 @@ - -
-
- CAT - CAST - ENG -
-
- -
- Inici - Nosaltres - Contacte -
-
-
- + +
diff --git a/own.css b/own.css index 10aeb36..2aa5910 100644 --- a/own.css +++ b/own.css @@ -88,7 +88,8 @@ a:active { font-size: 24px; } .own-verkami{ - border: 1px solid #000000; + /*border: 1px solid #000000;*/ + cursor: pointer; } .own-socialNetworks{ margin-left: 2%; @@ -97,12 +98,17 @@ a:active { } .own-socialNetwork{ display: inline-block; - border: 1px solid #000000; + height: 20px; + margin-right: 5px; + cursor: pointer; } .own-teaser{ float: right; margin-right: 2%; margin-top: calc(6% + 10px); + color: #ffffff; + font-weight: bold; + font-size: 18px; } .temp-marge1{ @@ -167,13 +173,16 @@ a:active { .own-lang a:link{ text-decoration: none; color: #000000; - font-weight: bold; + /*font-weight: bold;*/ display: inline-block; margin: 10px; } .own-lang a:visited{ color: #000000; } +.own-bold{ + font-weight: bold; +} .own-menuButtons{ float: right; @@ -233,6 +242,7 @@ a:active { max-width: 600px; text-align: left; vertical-align: top; + padding: 10px; } .own-rightBox{ diff --git a/projecte.html b/projecte.html index 8bbb78f..dc52e6a 100644 --- a/projecte.html +++ b/projecte.html @@ -20,22 +20,8 @@ - -
-
- CAT - CAST - ENG -
-
- -
- Inici - Nosaltres - Contacte -
-
-
+ +
@@ -57,8 +43,12 @@ Cookie chocolate gummies lollipop sugar plum cake jelly-o cookie cupcake. Toffee jelly-o jujubes sweet topping marshmallow pie donut cookie. Chocolate bar soufflé sugar plum chocolate jelly beans powder biscuit liquorice. Marzipan ice cream tootsie roll chocolate cake cake sesame snaps lollipop. Ice cream chocolate bar carrot cake cookie. Jelly-o chocolate cake tiramisu danish cookie topping jelly-o icing. Powder muffin candy powder pie. Apple pie sesame snaps sweet. Oat cake ice cream sweet roll gummi bears. Cake ice cream pastry donut cheesecake muffin macaroon oat cake cotton candy. Fruitcake tiramisu chocolate sweet powder dragée croissant. Danish candy gingerbread liquorice oat cake toffee. Topping halvah tootsie roll.
- Verkami - Teaser + + Verkami + + + Teaser +