Skip to content

Commit fcd673a

Browse files
alfredobarronalfredobarron
committed
Merge pull request #33 from alfredobarron/dev
Se actualizo a la version 2.1.2
2 parents dc1f0d5 + 0bfeb38 commit fcd673a

15 files changed

+2326
-2230
lines changed

‎Gruntfile.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ module.exports = function(grunt){
77
uglify: {
88
js: {
99
files: {
10-
'docs/dist/js/smoke.min.js': ['docs/dist/js/smoke.js']
10+
'docs/dist/js/smoke.min.js': ['docs/dist/js/smoke.js'],
11+
'docs/dist/lang/smoke.en.min.js': ['docs/dist/lang/smoke.en.js']
1112
}
1213
}
1314
},
@@ -29,7 +30,7 @@ module.exports = function(grunt){
2930
compress: {
3031
main: {
3132
options: {
32-
archive: 'smoke-v2.1.1.zip'
33+
archive: 'smoke-v2.1.2.zip'
3334
},
3435
files: [
3536
//{src: ['path/*'], dest: 'internal_folder/', filter: 'isFile'}, // includes files in path

‎dist/css/smoke.css

Lines changed: 96 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818

1919
/*
2020
|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
21-
| Validate
21+
| Validate
2222
|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
2323
*/
2424
.smk-error-text{
25-
position: absolute;
26-
right: 0;
27-
font-size: 12px;
28-
color: #EE4124;
29-
/*float: right;*/
25+
position: absolute;
26+
right: 0;
27+
font-size: 12px;
28+
color: #EE4124;
29+
/*float: right;*/
3030

3131
}
3232
.smk-select .smk-error-icon{
33-
right: 10px;
33+
right: 10px;
3434
}
3535
.smk-checkbox .smk-error-text, .smk-radio .smk-error-text{
36-
margin-top: -12px
36+
margin-top: -12px
3737
}
3838

3939

@@ -43,27 +43,27 @@
4343

4444
/*
4545
|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
46-
| Alerts
46+
| Alerts
4747
|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
4848
*/
4949
.smk-alert-content{
50-
position: fixed;
51-
width: 360px;
52-
top: 0;
53-
right: 20px;
54-
z-index: 2060;
50+
position: fixed;
51+
width: 360px;
52+
top: 0;
53+
right: 20px;
54+
z-index: 2060;
5555
}
5656
.smk-alert {
57-
opacity: 0;
58-
filter: alpha(opacity=0);
57+
opacity: 0;
58+
filter: alpha(opacity=0);
5959
}
6060
.smk-alert .glyphicon {
61-
font-size: 20px;
62-
float: left;
63-
margin-right: 14px;
61+
font-size: 20px;
62+
float: left;
63+
margin-right: 14px;
6464
}
6565
.smk-alert p{
66-
display: table;
66+
display: table;
6767
}
6868

6969

@@ -73,30 +73,30 @@
7373

7474
/*
7575
|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
76-
| Confirmation
76+
| Confirmation
7777
|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
7878
*/
7979
.smk-confirm-back {
80-
position: fixed;
81-
top: 0;
82-
right: 0;
83-
bottom: 0;
84-
left: 0;
85-
z-index: 1030;
80+
position: fixed;
81+
top: 0;
82+
right: 0;
83+
bottom: 0;
84+
left: 0;
85+
z-index: 1030;
8686
}
8787
.smk-confirm {
88-
position: absolute;
89-
opacity: 0;
90-
filter: alpha(opacity=0);
91-
top: -500px;
92-
right: 0;
93-
left: 0;
94-
margin: auto;
95-
max-width: 440px;
96-
z-index: 2060;
97-
box-shadow: 0 5px 25px -1px #333;
98-
-webkit-box-shadow: 0 5px 25px -1px #333; /* Chrome & Safari */
99-
-moz-box-shadow: 0 5px 25px -1px #333; /* Firefox */
88+
position: absolute;
89+
opacity: 0;
90+
filter: alpha(opacity=0);
91+
top: -500px;
92+
right: 0;
93+
left: 0;
94+
margin: auto;
95+
max-width: 440px;
96+
z-index: 2060;
97+
box-shadow: 0 5px 25px -1px #333;
98+
-webkit-box-shadow: 0 5px 25px -1px #333; /* Chrome & Safari */
99+
-moz-box-shadow: 0 5px 25px -1px #333; /* Firefox */
100100
}
101101

102102

@@ -110,35 +110,35 @@
110110
|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
111111
*/
112112
.smk-progressbar{
113-
/*position: fixed;*/
114-
left: 0;
115-
top: 0;
116-
right: 0;
117-
bottom: 0;
118-
background: rgba(255,255,255,0.4);
119-
z-index: 10000;
113+
/*position: fixed;*/
114+
left: 0;
115+
top: 0;
116+
right: 0;
117+
bottom: 0;
118+
background: rgba(255,255,255,0.4);
119+
z-index: 10000;
120120
}
121121
.smk-progressbar .progress {
122-
width: 100%;
123-
height: 4px;
124-
background-color: transparent;
125-
border-radius: 0;
126-
margin-bottom: 0;
122+
width: 100%;
123+
height: 4px;
124+
background-color: transparent;
125+
border-radius: 0;
126+
margin-bottom: 0;
127127
}
128128
.smk-progressbar .progress-bar{
129-
background: #28A8E0;
129+
background: #28A8E0;
130130
}
131131
/*.progress-bar{
132-
-webkit-animation: myfirst 1s;
133-
animation: myfirst 1s;
132+
-webkit-animation: myfirst 1s;
133+
animation: myfirst 1s;
134134
}
135135
@-webkit-keyframes myfirst {
136-
from {width: 0;}
137-
to {width: 95%;}
136+
from {width: 0;}
137+
to {width: 95%;}
138138
}
139139
@keyframes myfirst {
140-
from {width: 0;}
141-
to {width: 95%;}
140+
from {width: 0;}
141+
to {width: 95%;}
142142
}*/
143143

144144

@@ -159,12 +159,12 @@
159159
z-index: 9999;
160160
}
161161
.smk-btn-group-panel-title{
162-
top:-22px;
163-
right: -4px
162+
top:-22px;
163+
right: -4px
164164
}
165165
.smk-btn-group-panel{
166-
top:-4px;
167-
right: -4px
166+
top:-4px;
167+
right: -4px
168168
}
169169

170170

@@ -173,79 +173,79 @@
173173

174174
/*
175175
|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
176-
| Helper Styles
176+
| Helper Styles
177177
|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
178178
*/
179179

180180

181181
/*
182182
|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
183-
| Elimina los spin del input number
183+
| Elimina los spin del input number
184184
|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
185185
*/
186186
input[type=number]::-webkit-inner-spin-button,
187187
input[type=number]::-webkit-outer-spin-button {
188-
-webkit-appearance: none;
189-
margin: 0;
188+
-webkit-appearance: none;
189+
margin: 0;
190190
}
191191

192192

193193
/*
194194
|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
195-
| Al agregar padding a un div evita que su tamaño crezca
195+
| Al agregar padding a un div evita que su tamaño crezca
196196
|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
197197
*/
198198
.smk-sizing{
199-
box-sizing: border-box;
199+
box-sizing: border-box;
200200
}
201201

202202

203203
/* Transition */
204204
.smk-transition1 {
205-
transition: all .2s ease-in-out;
206-
-webkit-transition: all .2s ease-in-out; /* Chrome & Safari */
207-
-moz-transition: all .2s ease-in-out; /* Firefox */
208-
-o-transition: all .2s ease-in-out; /* Opera */
209-
-ms-transition: all .2s ease-in-out; /* IE 9 */
205+
transition: all .2s ease-in-out;
206+
-webkit-transition: all .2s ease-in-out; /* Chrome & Safari */
207+
-moz-transition: all .2s ease-in-out; /* Firefox */
208+
-o-transition: all .2s ease-in-out; /* Opera */
209+
-ms-transition: all .2s ease-in-out; /* IE 9 */
210210
}
211211
.smk-transition2 {
212-
transition: all .5s ease-in-out;
213-
-webkit-transition: all .5s ease-in-out; /* Chrome & Safari */
214-
-moz-transition: all .5s ease-in-out; /* Firefox */
215-
-o-transition: all .5s ease-in-out; /* Opera */
216-
-ms-transition: all .5s ease-in-out; /* IE 9 */
212+
transition: all .5s ease-in-out;
213+
-webkit-transition: all .5s ease-in-out; /* Chrome & Safari */
214+
-moz-transition: all .5s ease-in-out; /* Firefox */
215+
-o-transition: all .5s ease-in-out; /* Opera */
216+
-ms-transition: all .5s ease-in-out; /* IE 9 */
217217
}
218218

219219
/* Shadow */
220220
.smk-shadow {
221-
box-shadow: 3px 3px 5px 6px #ccc;
222-
-webkit-box-shadow: 3px 3px 5px 6px #ccc; /* Chrome & Safari */
223-
-moz-box-shadow: 3px 3px 5px 6px #ccc; /* Firefox */
221+
box-shadow: 3px 3px 5px 6px #ccc;
222+
-webkit-box-shadow: 3px 3px 5px 6px #ccc; /* Chrome & Safari */
223+
-moz-box-shadow: 3px 3px 5px 6px #ccc; /* Firefox */
224224
}
225225

226226
/* Animations */
227227
.smk-animation {
228-
animation: fadeOut 3.5s;
229-
-webkit-animation: fadeOut 3.5s; /* Chrome & Safari */
230-
-moz-animation: fadeOut 3.5s; /* Firefox */
231-
-o-animation: fadeOut 3.5s; /* Opera */
232-
-ms-animation: fadeOut 3.5s; /* IE 9 */
228+
animation: fadeOut 3.5s;
229+
-webkit-animation: fadeOut 3.5s; /* Chrome & Safari */
230+
-moz-animation: fadeOut 3.5s; /* Firefox */
231+
-o-animation: fadeOut 3.5s; /* Opera */
232+
-ms-animation: fadeOut 3.5s; /* IE 9 */
233233
}
234234

235235
/* Translate */
236236
.smk-translate {
237-
transform: translate(50px,100px);
238-
-webkit-transform: translate(50px,100px); /* Chrome & Safari */
239-
-moz-transform: translate(50px,100px); /* Firefox */
240-
-o-transform: translate(50px,100px); /* Opera */
241-
-ms-transform: translate(50px,100px); /* IE 9 */
237+
transform: translate(50px,100px);
238+
-webkit-transform: translate(50px,100px); /* Chrome & Safari */
239+
-moz-transform: translate(50px,100px); /* Firefox */
240+
-o-transform: translate(50px,100px); /* Opera */
241+
-ms-transform: translate(50px,100px); /* IE 9 */
242242
}
243243

244244
/* Rotate */
245245
.smk-rotate {
246-
transform: rotate(7deg);
247-
-webkit-transform: rotate(7deg); /* Chrome & Safari */
248-
-moz-transition: rotate(7deg); /* Firefox */
249-
-o-transition: rotate(7deg); /* Opera */
250-
-ms-transform: rotate(7deg); /* IE 9 */
246+
transform: rotate(7deg);
247+
-webkit-transform: rotate(7deg); /* Chrome & Safari */
248+
-moz-transition: rotate(7deg); /* Firefox */
249+
-o-transition: rotate(7deg); /* Opera */
250+
-ms-transform: rotate(7deg); /* IE 9 */
251251
}

0 commit comments

Comments
 (0)