Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@creyesnav
creyesnav committed Aug 5, 2014
2 parents 1ed8451 + 13c72e7 commit 0a605f0
Show file tree
Hide file tree
Showing 26 changed files with 16,604 additions and 20,795 deletions.
536 changes: 528 additions & 8 deletions cheatsheet.html
View file

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions css/simple.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,11 +273,6 @@ border-bottom: none !important;

/* Otros */

.gigante {
font-size: 170px;
text-align: center;
}

.caja-icono {
width:80px;
height: 80px;
Expand Down Expand Up @@ -307,6 +302,10 @@ border-bottom: none !important;
-webkit-column-gap: 20px;
}

.lista-icono{
font-size: 18px;
}

.ejemplo {
font-size: 15px;
line-height: 20px;
Expand Down
2 changes: 1 addition & 1 deletion css/stampa.css
View file

Large diffs are not rendered by default.

Binary file modified favicon.ico
View file
Binary file not shown.
28 changes: 13 additions & 15 deletions fonts/stampa-webfont/Stampa.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fonts/stampa-webfont/stampa.eot
View file
Binary file not shown.
Binary file modified fonts/stampa-webfont/stampa.ttf
View file
Binary file not shown.
Binary file modified fonts/stampa-webfont/stampa.woff
View file
Binary file not shown.
6 changes: 2 additions & 4 deletions less/icons.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@
.@{icn-css-prefix}-noticias:before { content: @icn-var-noticias }
.@{icn-css-prefix}-facebook:before { content: @icn-var-facebook }
.@{icn-css-prefix}-twitter:before { content: @icn-var-twitter }
.@{icn-css-prefix}-cuadro-lleno:before { content: @icn-var-cuadro-lleno }
.@{icn-css-prefix}-cuadro:before { content: @icn-var-cuadro }
.@{icn-css-prefix}-cuadro-l:before { content: @icn-var-cuadro-l }
.@{icn-css-prefix}-circulo-lleno:before { content: @icn-var-circulo-lleno }
.@{icn-css-prefix}-circulo:before { content: @icn-var-circulo }
.@{icn-css-prefix}-circulo-l:before { content: @icn-var-circulo-l }
.@{icn-css-prefix}-prohibir:before { content: @icn-var-prohibir }
.@{icn-css-prefix}-subir:before { content: @icn-var-subir }
.@{icn-css-prefix}-camara:before { content: @icn-var-camara }
Expand Down Expand Up @@ -169,9 +169,7 @@
.@{icn-css-prefix}-facebook-lig:before { content: @icn-var-facebook-lig }
.@{icn-css-prefix}-twitter-lig:before { content: @icn-var-twitter-lig }
.@{icn-css-prefix}-cuadro-lig:before { content: @icn-var-cuadro-lig }
.@{icn-css-prefix}-cuadro-l-lig:before { content: @icn-var-cuadro-l-lig }
.@{icn-css-prefix}-circulo-lig:before { content: @icn-var-circulo-lig }
.@{icn-css-prefix}-circulo-l-lig:before { content: @icn-var-circulo-l-lig }
.@{icn-css-prefix}-prohibir-lig:before { content: @icn-var-prohibir-lig }
.@{icn-css-prefix}-subir-lig:before { content: @icn-var-subir-lig }
.@{icn-css-prefix}-camara-lig:before { content: @icn-var-camara-lig }
Expand Down
14 changes: 6 additions & 8 deletions less/variables.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@
@icn-var-email: "\e658";
@icn-var-documento: "\e659";
@icn-var-descargar: "\e65a";
@icn-var-cuadro: "\e65b";
@icn-var-cuadro-l: "\e612";
@icn-var-circulo: "\e618";
@icn-var-circulo-l: "\e614";
@icn-var-cuadro-lleno: "\e65b";
@icn-var-cuadro: "\e612";
@icn-var-circulo-lleno: "\e618";
@icn-var-circulo: "\e614";
@icn-var-prohibir: "\e671";
@icn-var-mas: "\e65c";
@icn-var-menos: "\e61a";
Expand Down Expand Up @@ -211,10 +211,8 @@
@icn-var-email-lig: "\e67b";
@icn-var-documento-lig: "\e67a";
@icn-var-descargar-lig: "\e645";
@icn-var-cuadro-lig: "\e644";
@icn-var-cuadro-l-lig: "\e634";
@icn-var-circulo-lig: "\e617";
@icn-var-circulo-l-lig: "\e61d";
@icn-var-cuadro-lig: "\e634";
@icn-var-circulo-lig: "\e61d";
@icn-var-prohibir-lig: "\e6a7";
@icn-var-mas-lig: "\e699";
@icn-var-menos-lig: "\e69a";
Expand Down
56 changes: 53 additions & 3 deletions prueba.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,23 @@ <h1>Stampa
<i class="icn icn-usuario"></i> texto texto

<span class="icn-stack">
<i class="icn icn-cuadro-l icn-stack-2x"></i>
<i class="icn icn-circulo-l-lig icn-stack-2x"></i>
<i class="icn icn-usuario icn-stack-1x"></i>
</span>

<span class="icn-stack">
<i class="icn icn-circulo-l icn-stack-2x"></i>
<i class="icn icn-corazon icn-stack-1x icn-inverse"></i>
</span>

<span class="icn-stack">
<i class="icn icn-cuadro icn-stack-2x"></i>
<i class="icn icn-usuario icn-stack-1x icn-inverse"></i>
</span>

<span class="icn-stack icn-lg">
<i class="icn icn-cuadro icn-stack-2x gris-oscuro"></i>
<i class="icn icn-imagen icn-stack-1x icn-inverse"></i>
<i class="icn icn-imagen-lig icn-stack-1x icn-inverse"></i>
</span>


Expand All @@ -60,7 +65,7 @@ <h1>Stampa
</span>

<span class="icn-stack icn-lg">
<i class="icn icn-cuadro-l icn-stack-2x"></i>
<i class="icn icn-cuadro-l-lig icn-stack-2x"></i>
<i class="icn icn-estorninos icn-stack-1x"></i>
</span>

Expand Down Expand Up @@ -99,6 +104,51 @@ <h1>Stampa
<i class="icn icn-ampolleta icn-stack-1x rojo"></i>
</span>

<span class="icn-stack icn-lg">
<i class="icn icn-cuadro-l icn-stack-2x gris-claro"></i>
<i class="icn icn-caron icn-stack-1x rojo"></i>
</span>

<span class="icn-stack icn-lg">
<i class="icn icn-cuadro-l-lig icn-stack-2x gris-claro"></i>
<i class="icn icn-caron-lig icn-stack-1x rojo"></i>
</span>

<span class="icn-stack icn-lg">
<i class="icn icn-cuadro icn-stack-2x gris-claro"></i>
<i class="icn icn-caron-lig icn-stack-1x rojo"></i>
</span>

<span class="icn-stack">
<i class="icn icn-cuadro icn-stack-2x gris-claro"></i>
<i class="icn icn-calendario-lig icn-stack-1x rojo"></i>
</span>

<span class="icn-stack">
<i class="icn icn-cuadro icn-stack-2x gris-claro"></i>
<i class="icn icn-calendario icn-stack-1x rojo"></i>
</span>

<span class="icn-stack">
<i class="icn icn-cuadro-lig icn-stack-2x gris-claro"></i>
<i class="icn icn-calendario icn-stack-1x rojo"></i>
</span>

<span class="icn-stack icn-lg">
<i class="icn icn-cuadro icn-stack-2x gris-claro"></i>
<i class="icn icn-calendario icn-stack-1x rojo"></i>
</span>

<span class="icn-stack icn-lg">
<i class="icn icn-cuadro-lig icn-stack-2x gris-claro"></i>
<i class="icn icn-calendario icn-stack-1x rojo"></i>
</span>

<span class="icn-stack icn-lg">
<i class="icn icn-cuadro-lig icn-stack-2x gris-claro"></i>
<i class="icn icn-calendario-lig icn-stack-1x rojo"></i>
</span>

Texto de prueba
<br>

Expand Down
28 changes: 1 addition & 27 deletions src/Stampa/demo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" href="style.css"></head>
<body>
<div class="bgc1 clearfix">
<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> Stampa <small class="fgc1">(Glyphs:&nbsp;190)</small></h1>
<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> Stampa <small class="fgc1">(Glyphs:&nbsp;188)</small></h1>
</div>
<div class="clearfix mhl ptl">
<h1 class="mvm mtn bshadow fgc1">Grid Size: 21</h1>
Expand Down Expand Up @@ -208,19 +208,6 @@ <h1 class="mvm mtn bshadow fgc1">Grid Size: 21</h1>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icn-circulo-lig"></span><span class="mls"> icn-circulo-lig</span>
</div>
<fieldset class="fs0 size1of1 clearfix hidden-false">
<input type="text" readonly value="e617" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe617;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix hidden-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icn-circulo-l-lig"></span><span class="mls"> icn-circulo-l-lig</span>
Expand Down Expand Up @@ -325,19 +312,6 @@ <h1 class="mvm mtn bshadow fgc1">Grid Size: 21</h1>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icn-cuadro-lig"></span><span class="mls"> icn-cuadro-lig</span>
</div>
<fieldset class="fs0 size1of1 clearfix hidden-false">
<input type="text" readonly value="e644" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe644;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix hidden-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icn-descargar-lig"></span><span class="mls"> icn-descargar-lig</span>
Expand Down
Binary file modified src/Stampa/fonts/Stampa.eot
View file
Binary file not shown.
Loading

0 comments on commit 0a605f0

Please sign in to comment.