Browse Source

icons i butons afegits, falten fotos, i linkar bé, i textos

pull/1/head
idoctnef 8 years ago
parent
commit
10cb48b605
29 changed files with 85 additions and 81 deletions
  1. +14
    -34
      HTMLmenu.html
  2. +35
    -0
      HTMLmenuOLD.html
  3. BIN
      botons/b_enviar_negre.png
  4. BIN
      botons/b_enviar_taronja.png
  5. BIN
      botons/b_fletxa_d.png
  6. BIN
      botons/b_fletxa_e.png
  7. BIN
      botons/b_verkami.png
  8. BIN
      icones/i_articles.png
  9. BIN
      icones/i_articles_taronja.png
  10. BIN
      icones/i_campanyessuport.png
  11. BIN
      icones/i_capanyessuport_taronja.png
  12. BIN
      icones/i_facebook.png
  13. BIN
      icones/i_facebook_taronja.png
  14. BIN
      icones/i_mail.png
  15. BIN
      icones/i_mail_taronja.png
  16. BIN
      icones/i_play.png
  17. BIN
      icones/i_teaser.png
  18. BIN
      icones/i_teaser_taronja.png
  19. BIN
      icones/i_telefon.png
  20. BIN
      icones/i_twitter.png
  21. BIN
      icones/i_twitter_taronja.png
  22. BIN
      icones/i_vimeo.png
  23. BIN
      icones/i_vimeo_taronja.png
  24. BIN
      icones/i_vk.png
  25. +6
    -6
      index.html
  26. +7
    -3
      index.js
  27. +2
    -17
      nosaltres.html
  28. +13
    -3
      own.css
  29. +8
    -18
      projecte.html

+ 14
- 34
HTMLmenu.html

@ -1,35 +1,15 @@
<nav class="navbar navbar-default">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Brand</a>
<div class='own-container'>
<div class='own-lang'>
<a href="#" class='own-bold'>CAT</a>
<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>
<div class='own-menuButtons'>
<a href="index.html">Inici</a>
<a href='nosaltres.html'>Nosaltres</a>
<a href='#'>Contacte</a>
</div> </div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="active"><a href="#">Link <span class="sr-only">(current)</span></a></li>
<li><a href="#">Link</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="#">Link</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li role="separator" class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
</li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
</div>
</div>

+ 35
- 0
HTMLmenuOLD.html

@ -0,0 +1,35 @@
<nav class="navbar navbar-default">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Brand</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="active"><a href="#">Link <span class="sr-only">(current)</span></a></li>
<li><a href="#">Link</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="#">Link</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li role="separator" class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
</li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>

BIN
botons/b_enviar_negre.png

Before After
Width: 73  |  Height: 35  |  Size: 802 B

BIN
botons/b_enviar_taronja.png

Before After
Width: 49  |  Height: 24  |  Size: 667 B

BIN
botons/b_fletxa_d.png

Before After
Width: 100  |  Height: 101  |  Size: 1.8 KiB

BIN
botons/b_fletxa_e.png

Before After
Width: 100  |  Height: 101  |  Size: 1.7 KiB

BIN
botons/b_verkami.png

Before After
Width: 144  |  Height: 66  |  Size: 988 B

BIN
icones/i_articles.png

Before After
Width: 78  |  Height: 100  |  Size: 594 B

BIN
icones/i_articles_taronja.png

Before After
Width: 78  |  Height: 100  |  Size: 644 B

BIN
icones/i_campanyessuport.png

Before After
Width: 66  |  Height: 100  |  Size: 1.3 KiB

BIN
icones/i_capanyessuport_taronja.png

Before After
Width: 66  |  Height: 100  |  Size: 1.5 KiB

BIN
icones/i_facebook.png

Before After
Width: 47  |  Height: 101  |  Size: 507 B

BIN
icones/i_facebook_taronja.png

Before After
Width: 47  |  Height: 101  |  Size: 518 B

BIN
icones/i_mail.png

Before After
Width: 100  |  Height: 70  |  Size: 977 B

BIN
icones/i_mail_taronja.png

Before After
Width: 100  |  Height: 72  |  Size: 1.3 KiB

BIN
icones/i_play.png

Before After
Width: 87  |  Height: 101  |  Size: 947 B

BIN
icones/i_teaser.png

Before After
Width: 100  |  Height: 87  |  Size: 931 B

BIN
icones/i_teaser_taronja.png

Before After
Width: 100  |  Height: 87  |  Size: 951 B

BIN
icones/i_telefon.png

Before After
Width: 100  |  Height: 95  |  Size: 1.3 KiB

BIN
icones/i_twitter.png

Before After
Width: 100  |  Height: 76  |  Size: 1.3 KiB

BIN
icones/i_twitter_taronja.png

Before After
Width: 100  |  Height: 76  |  Size: 1.4 KiB

BIN
icones/i_vimeo.png

Before After
Width: 100  |  Height: 87  |  Size: 1.4 KiB

BIN
icones/i_vimeo_taronja.png

Before After
Width: 100  |  Height: 87  |  Size: 1.5 KiB

BIN
icones/i_vk.png

Before After
Width: 100  |  Height: 100  |  Size: 1.2 KiB

+ 6
- 6
index.html

@ -29,7 +29,7 @@
<a href='#'>ENG</a> <a href='#'>ENG</a>
</div> </div>
<div class='own-menu'> <div class='own-menu'>
<img class='own-overImage-logo' src='http://placehold.it/200x50' />
<a href='index.html'><img class='own-overImage-logo' src='http://placehold.it/200x50' /></a>
<div class='own-menuButtonsIndex'> <div class='own-menuButtonsIndex'>
<a href="#">Inici</a> <a href="#">Inici</a>
<a href='nosaltres.html'>Nosaltres</a> <a href='nosaltres.html'>Nosaltres</a>
@ -39,15 +39,15 @@
<div class='own-mainTitleBox'> <div class='own-mainTitleBox'>
<div class='own-mainTitle'>El Sol del Nord</div> <div class='own-mainTitle'>El Sol del Nord</div>
<div class='own-subTitle'>-construint l'autonomia a Bakur-</div> <div class='own-subTitle'>-construint l'autonomia a Bakur-</div>
<img class='own-verkami' src='http://placehold.it/200x50' />
<img class='own-verkami' src='botons/b_verkami.png' />
</div> </div>
<div class='own-socialNetworks'> <div class='own-socialNetworks'>
<img class='own-socialNetwork' src='http://placehold.it/40x40' />
<img class='own-socialNetwork' src='http://placehold.it/40x40' />
<img class='own-socialNetwork' src='http://placehold.it/40x40' />
<img class='own-socialNetwork' src='icones/i_facebook.png' />
<img class='own-socialNetwork' src='icones/i_twitter.png' />
<img class='own-socialNetwork' src='icones/i_vimeo.png' />
</div> </div>
<div class='own-teaser'> <div class='own-teaser'>
TEASER
<img class='own-socialNetwork' src='icones/i_play.png' />TEASER
</div> </div>
</div> </div>
<div class='temp-marge1'>-</div> <div class='temp-marge1'>-</div>

+ 7
- 3
index.js

@ -1,14 +1,18 @@
//http://placehold.it/1920x1080 //http://placehold.it/1920x1080
function OnLoadIndex(){
/*$(document).ready(function(e) {
function OnLoadDefault(){
$(document).ready(function(e) {
$('#HTMLmenu').load('HTMLmenu.html',function(){ $('#HTMLmenu').load('HTMLmenu.html',function(){
// //
}); });
});*/
});
$(document).ready(function(e) { $(document).ready(function(e) {
$('#HTMLfooter').load('HTMLfooter.html',function(){ $('#HTMLfooter').load('HTMLfooter.html',function(){
// //
}); });
}); });
} }
function OnLoadIndex(){
OnLoadDefault();
}

+ 2
- 17
nosaltres.html

@ -20,23 +20,8 @@
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]--> <![endif]-->
</head> </head>
<body onload='OnLoadIndex();'>
<div class='own-container'>
<div class='own-lang'>
<a href="#">CAT</a>
<a href='#'>CAST</a>
<a href='#'>ENG</a>
</div>
<div class='own-menu'>
<img class='own-overImage-logo' src='http://placehold.it/200x50' />
<div class='own-menuButtons'>
<a href="index.html">Inici</a>
<a href='nosaltres.html'>Nosaltres</a>
<a href='#'>Contacte</a>
</div>
</div>
</div>
<body onload='OnLoadDefault();'>
<div id='HTMLmenu'></div>
<div class='own-nosaltresContent'> <div class='own-nosaltresContent'>
<img class='own-imgHeader' src='http://placehold.it/1080x150' /> <img class='own-imgHeader' src='http://placehold.it/1080x150' />

+ 13
- 3
own.css

@ -88,7 +88,8 @@ a:active {
font-size: 24px; font-size: 24px;
} }
.own-verkami{ .own-verkami{
border: 1px solid #000000;
/*border: 1px solid #000000;*/
cursor: pointer;
} }
.own-socialNetworks{ .own-socialNetworks{
margin-left: 2%; margin-left: 2%;
@ -97,12 +98,17 @@ a:active {
} }
.own-socialNetwork{ .own-socialNetwork{
display: inline-block; display: inline-block;
border: 1px solid #000000;
height: 20px;
margin-right: 5px;
cursor: pointer;
} }
.own-teaser{ .own-teaser{
float: right; float: right;
margin-right: 2%; margin-right: 2%;
margin-top: calc(6% + 10px); margin-top: calc(6% + 10px);
color: #ffffff;
font-weight: bold;
font-size: 18px;
} }
.temp-marge1{ .temp-marge1{
@ -167,13 +173,16 @@ a:active {
.own-lang a:link{ .own-lang a:link{
text-decoration: none; text-decoration: none;
color: #000000; color: #000000;
font-weight: bold;
/*font-weight: bold;*/
display: inline-block; display: inline-block;
margin: 10px; margin: 10px;
} }
.own-lang a:visited{ .own-lang a:visited{
color: #000000; color: #000000;
} }
.own-bold{
font-weight: bold;
}
.own-menuButtons{ .own-menuButtons{
float: right; float: right;
@ -233,6 +242,7 @@ a:active {
max-width: 600px; max-width: 600px;
text-align: left; text-align: left;
vertical-align: top; vertical-align: top;
padding: 10px;
} }
.own-rightBox{ .own-rightBox{

+ 8
- 18
projecte.html

@ -20,22 +20,8 @@
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]--> <![endif]-->
</head> </head>
<body onload='OnLoadIndex();'>
<div class='own-container'>
<div class='own-lang'>
<a href="#">CAT</a>
<a href='#'>CAST</a>
<a href='#'>ENG</a>
</div>
<div class='own-menu'>
<img class='own-overImage-logo' src='http://placehold.it/200x50' />
<div class='own-menuButtons'>
<a href="index.html">Inici</a>
<a href='nosaltres.html'>Nosaltres</a>
<a href='#'>Contacte</a>
</div>
</div>
</div>
<body onload='OnLoadDefault();'>
<div id='HTMLmenu'></div>
<img class='own-imgHeader' src='http://placehold.it/1080x300' /> <img class='own-imgHeader' src='http://placehold.it/1080x300' />
<div class='own-nosaltresContent'> <div class='own-nosaltresContent'>
@ -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. 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.
</div> </div>
<div class='own-rightBox'> <div class='own-rightBox'>
<a href="#">Verkami</a>
<a href='#'>Teaser</a>
<a href="#">
<img class='own-socialNetwork' src='icones/i_vk.png' />Verkami
</a>
<a href='#'>
<img class='own-socialNetwork' src='icones/i_teaser.png' />Teaser
</a>
</div> </div>
</div> </div>

Loading…
Cancel
Save