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

8 years ago · 10cb48b605
29 changed files with 85 additions and 81 deletions
--- a/HTMLmenu.html
+++ b/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>

    <!-- 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>
--- a/HTMLmenuOLD.html
+++ b/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>
--- a/botons/b_enviar_negre.png
+++ b/botons/b_enviar_negre.png
--- a/botons/b_enviar_taronja.png
+++ b/botons/b_enviar_taronja.png
--- a/botons/b_fletxa_d.png
+++ b/botons/b_fletxa_d.png
--- a/botons/b_fletxa_e.png
+++ b/botons/b_fletxa_e.png
--- a/botons/b_verkami.png
+++ b/botons/b_verkami.png
--- a/icones/i_articles.png
+++ b/icones/i_articles.png
--- a/icones/i_articles_taronja.png
+++ b/icones/i_articles_taronja.png
--- a/icones/i_campanyessuport.png
+++ b/icones/i_campanyessuport.png
--- a/icones/i_capanyessuport_taronja.png
+++ b/icones/i_capanyessuport_taronja.png
--- a/icones/i_facebook.png
+++ b/icones/i_facebook.png
--- a/icones/i_facebook_taronja.png
+++ b/icones/i_facebook_taronja.png
--- a/icones/i_mail.png
+++ b/icones/i_mail.png
--- a/icones/i_mail_taronja.png
+++ b/icones/i_mail_taronja.png
--- a/icones/i_play.png
+++ b/icones/i_play.png
--- a/icones/i_teaser.png
+++ b/icones/i_teaser.png
--- a/icones/i_teaser_taronja.png
+++ b/icones/i_teaser_taronja.png
--- a/icones/i_telefon.png
+++ b/icones/i_telefon.png
--- a/icones/i_twitter.png
+++ b/icones/i_twitter.png
--- a/icones/i_twitter_taronja.png
+++ b/icones/i_twitter_taronja.png
--- a/icones/i_vimeo.png
+++ b/icones/i_vimeo.png
--- a/icones/i_vimeo_taronja.png
+++ b/icones/i_vimeo_taronja.png
--- a/icones/i_vk.png
+++ b/icones/i_vk.png
--- a/index.html
+++ b/index.html
@ -29,7 +29,7 @@
          <a href='#'>ENG</a>
        </div>
        <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'>
            <a href="#">Inici</a>
            <a href='nosaltres.html'>Nosaltres</a>
@ -39,15 +39,15 @@
        <div class='own-mainTitleBox'>
          <div class='own-mainTitle'>El Sol del Nord</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 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 class='own-teaser'>
          TEASER
          <img class='own-socialNetwork' src='icones/i_play.png' />TEASER
        </div>
      </div>
      <div class='temp-marge1'>-</div>
--- 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();
 }
--- a/nosaltres.html
+++ b/nosaltres.html
@ -20,23 +20,8 @@
      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </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'>

        <img class='own-imgHeader' src='http://placehold.it/1080x150' />
--- 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{
--- a/projecte.html
+++ b/projecte.html
@ -20,22 +20,8 @@
      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </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' />

      <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.
        </div>
        <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>