Skip to content

Commit 8643763

Browse files
committed
Merge pull request #179 from deneuxa/master
Correct src & build files for previous pull-request Former-commit-id: 753c56f Former-commit-id: 4aa1934ddf536e97eee818cd343a6fc994c8d13e
2 parents 2c84f38 + 9770b3c commit 8643763

File tree

6 files changed

+46
-2
lines changed

6 files changed

+46
-2
lines changed

build/less/collections/form.less

+14-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565

6666
.ui.form textarea,
6767
.ui.form input[type="text"],
68+
.ui.form input[type="email"],
6869
.ui.form input[type="date"],
6970
.ui.form input[type="password"],
7071
.ui.form .ui.input {
@@ -73,6 +74,7 @@
7374

7475
.ui.form textarea,
7576
.ui.form input[type="text"],
77+
.ui.form input[type="email"],
7678
.ui.form input[type="date"],
7779
.ui.form input[type="password"] {
7880

@@ -201,6 +203,8 @@
201203
---------------------*/
202204

203205
.ui.form input[type="text"]:focus,
206+
.ui.form input[type="date"]:focus,
207+
.ui.form input[type="email"]:focus,
204208
.ui.form input[type="password"]:focus,
205209
.ui.form textarea:focus {
206210
color: rgba(0, 0, 0, 0.85);
@@ -240,10 +244,12 @@
240244
}
241245
.ui.form .fields.error .field textarea,
242246
.ui.form .fields.error .field input[type="text"],
247+
.ui.form .fields.error .field input[type="email"],
243248
.ui.form .fields.error .field input[type="date"],
244249
.ui.form .fields.error .field input[type="password"],
245250
.ui.form .field.error textarea,
246251
.ui.form .field.error input[type="text"],
252+
.ui.form .field.error input[type="email"],
247253
.ui.form .field.error input[type="date"],
248254
.ui.form .field.error input[type="password"] {
249255
background-color: #FFFAFA;
@@ -263,6 +269,8 @@
263269
}
264270
.ui.form .field.error textarea:focus,
265271
.ui.form .field.error input[type="text"]:focus,
272+
.ui.form .field.error input[type="email"]:focus,
273+
.ui.form .field.error input[type="date"]:focus,
266274
.ui.form .field.error input[type="password"]:focus {
267275
border-color: rgba(255, 80, 80, 1);
268276
color: rgba(255, 80, 80, 1);
@@ -395,7 +403,10 @@
395403
color: #FFFFFF;
396404
}
397405
.ui.inverted.form .field.error textarea,
398-
.ui.inverted.form .field.error input[type="text"] {
406+
.ui.inverted.form .field.error input[type="text"],
407+
.ui.inverted.form .field.error input[type="date"],
408+
.ui.inverted.form .field.error input[type="email"],
409+
.ui.inverted.form .field.error input[type="password"]{
399410
background-color: #FFCCCC;
400411
}
401412

@@ -527,6 +538,8 @@
527538
}
528539
.ui.small.form textarea,
529540
.ui.small.form input[type="text"],
541+
.ui.small.form input[type="email"],
542+
.ui.small.form input[type="date"],
530543
.ui.small.form input[type="password"],
531544
.ui.small.form label {
532545
font-size: 1em;

build/less/elements/basic.icon.less

+5
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,11 @@ i.basic.icon {
458458
font-size: 1em;
459459
}
460460
i.large.basic.icon {
461+
font-size: 1.5em;
462+
margin-right: 0.2em;
463+
vertical-align: middle;
464+
}
465+
i.big.basic.icon {
461466
font-size: 2em;
462467
margin-right: 0.5em;
463468
vertical-align: middle;

build/less/elements/icon.less

+4
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,10 @@ i.icon {
755755
font-size: 1em;
756756
}
757757
i.large.icon {
758+
font-size: 1.5em;
759+
vertical-align: middle;
760+
}
761+
i.big.icon {
758762
font-size: 2em;
759763
vertical-align: middle;
760764
}

src/collections/form.less

+14-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565

6666
.ui.form textarea,
6767
.ui.form input[type="text"],
68+
.ui.form input[type="email"],
6869
.ui.form input[type="date"],
6970
.ui.form input[type="password"],
7071
.ui.form .ui.input {
@@ -73,6 +74,7 @@
7374

7475
.ui.form textarea,
7576
.ui.form input[type="text"],
77+
.ui.form input[type="email"],
7678
.ui.form input[type="date"],
7779
.ui.form input[type="password"] {
7880

@@ -201,6 +203,8 @@
201203
---------------------*/
202204

203205
.ui.form input[type="text"]:focus,
206+
.ui.form input[type="email"]:focus,
207+
.ui.form input[type="date"]:focus,
204208
.ui.form input[type="password"]:focus,
205209
.ui.form textarea:focus {
206210
color: rgba(0, 0, 0, 0.85);
@@ -240,10 +244,12 @@
240244
}
241245
.ui.form .fields.error .field textarea,
242246
.ui.form .fields.error .field input[type="text"],
247+
.ui.form .fields.error .field input[type="email"],
243248
.ui.form .fields.error .field input[type="date"],
244249
.ui.form .fields.error .field input[type="password"],
245250
.ui.form .field.error textarea,
246251
.ui.form .field.error input[type="text"],
252+
.ui.form .field.error input[type="email"],
247253
.ui.form .field.error input[type="date"],
248254
.ui.form .field.error input[type="password"] {
249255
background-color: #FFFAFA;
@@ -263,6 +269,8 @@
263269
}
264270
.ui.form .field.error textarea:focus,
265271
.ui.form .field.error input[type="text"]:focus,
272+
.ui.form .field.error input[type="email"]:focus,
273+
.ui.form .field.error input[type="date"]:focus,
266274
.ui.form .field.error input[type="password"]:focus {
267275
border-color: rgba(255, 80, 80, 1);
268276
color: rgba(255, 80, 80, 1);
@@ -395,7 +403,10 @@
395403
color: #FFFFFF;
396404
}
397405
.ui.inverted.form .field.error textarea,
398-
.ui.inverted.form .field.error input[type="text"] {
406+
.ui.inverted.form .field.error input[type="text"],
407+
.ui.inverted.form .field.error input[type="email"],
408+
.ui.inverted.form .field.error input[type="date"],
409+
.ui.inverted.form .field.error input[type="password"]{
399410
background-color: #FFCCCC;
400411
}
401412

@@ -527,6 +538,8 @@
527538
}
528539
.ui.small.form textarea,
529540
.ui.small.form input[type="text"],
541+
.ui.small.form input[type="email"],
542+
.ui.small.form input[type="date"],
530543
.ui.small.form input[type="password"],
531544
.ui.small.form label {
532545
font-size: 1em;

src/elements/basic.icon.less

+5
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,11 @@ i.basic.icon {
458458
font-size: 1em;
459459
}
460460
i.large.basic.icon {
461+
font-size: 1.5em;
462+
margin-right: 0.2em;
463+
vertical-align: middle;
464+
}
465+
i.big.basic.icon {
461466
font-size: 2em;
462467
margin-right: 0.5em;
463468
vertical-align: middle;

src/elements/icon.less

+4
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,10 @@ i.icon {
755755
font-size: 1em;
756756
}
757757
i.large.icon {
758+
font-size: 1.5em;
759+
vertical-align: middle;
760+
}
761+
i.big.icon {
758762
font-size: 2em;
759763
vertical-align: middle;
760764
}

0 commit comments

Comments
 (0)