Merge branch 'develop'

Conflicts: fonts/stampa-webfont/Stampa.svg
eadpucv · Aug 1, 2014 · 8728e0b · 8728e0b
2 parents 97551cc + 70b9457
commit 8728e0b
Show file tree

Hide file tree

Showing 16 changed files with 8,850 additions and 7,441 deletions.
diff --git a/fonts/stampa-webfont/Stampa.svg b/fonts/stampa-webfont/Stampa.svg
diff --git a/fonts/stampa-webfont/stampa.eot b/fonts/stampa-webfont/stampa.eot
diff --git a/fonts/stampa-webfont/stampa.ttf b/fonts/stampa-webfont/stampa.ttf
diff --git a/fonts/stampa-webfont/stampa.woff b/fonts/stampa-webfont/stampa.woff
diff --git a/iconos.html b/iconos.html
@@ -818,7 +818,7 @@ <h3 class="gris-oscuro">Íconos de aplicación web </h3>
 
     <li class="caja-icono"> 
         <i class="icn icn-marcador-lig icn-lg"></i>
-        <p>icn-marcador-lig</p>
+        <p>icn-marcador- lig</p>
     </li>
 
     <li class="caja-icono"> 
@@ -1139,7 +1139,7 @@ <h3 class="gris-oscuro">Íconos de aplicación E[ad] </h3>
 
     <li class="caja-icono"> 
         <i class="icn icn-biblioteca-lig icn-lg"></i>
-        <p>icn-biblioteca-lig</p>
+        <p>icn-biblioteca- lig</p>
     </li>
 
     <li class="caja-icono"> 
@@ -1159,7 +1159,7 @@ <h3 class="gris-oscuro">Íconos de aplicación E[ad] </h3>
 
     <li class="caja-icono"> 
         <i class="icn icn-estorninos-lig icn-lg"></i>
-        <p>icn-estorninos-lig</p>
+        <p>icn-estorninos- lig</p>
     </li>
 
     <li class="caja-icono"> 

diff --git a/src/Stampa/fonts/Stampa.eot b/src/Stampa/fonts/Stampa.eot
diff --git a/src/Stampa/fonts/Stampa.svg b/src/Stampa/fonts/Stampa.svg
diff --git a/src/Stampa/fonts/Stampa.ttf b/src/Stampa/fonts/Stampa.ttf
diff --git a/src/Stampa/fonts/Stampa.woff b/src/Stampa/fonts/Stampa.woff