From 128e2f5a13dc5eb821cdf73981debd63ce374ba1 Mon Sep 17 00:00:00 2001 From: deneuxa Date: Sun, 6 Oct 2013 16:19:43 +0200 Subject: [PATCH 1/4] lost pull-requests Former-commit-id: 5895a74ccdd1384c13f9cee0652c6f764be45008 Former-commit-id: 67b501f42c6422c8030214885d883250d5b4c2ac --- build/less/collections/form.less | 15 ++++++++++++++- build/less/elements/basic.icon.less | 5 +++++ build/less/elements/icon.less | 4 ++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/build/less/collections/form.less b/build/less/collections/form.less index 5a592ce67..0d471f339 100644 --- a/build/less/collections/form.less +++ b/build/less/collections/form.less @@ -65,6 +65,7 @@ .ui.form textarea, .ui.form input[type="text"], +.ui.form input[type="email"], .ui.form input[type="date"], .ui.form input[type="password"], .ui.form .ui.input { @@ -73,6 +74,7 @@ .ui.form textarea, .ui.form input[type="text"], +.ui.form input[type="email"], .ui.form input[type="date"], .ui.form input[type="password"] { @@ -201,6 +203,8 @@ ---------------------*/ .ui.form input[type="text"]:focus, +.ui.form input[type="date"]:focus, +.ui.form input[type="email"]:focus, .ui.form input[type="password"]:focus, .ui.form textarea:focus { color: rgba(0, 0, 0, 0.85); @@ -240,10 +244,12 @@ } .ui.form .fields.error .field textarea, .ui.form .fields.error .field input[type="text"], +.ui.form .fields.error .field input[type="email"], .ui.form .fields.error .field input[type="date"], .ui.form .fields.error .field input[type="password"], .ui.form .field.error textarea, .ui.form .field.error input[type="text"], +.ui.form .field.error input[type="email"], .ui.form .field.error input[type="date"], .ui.form .field.error input[type="password"] { background-color: #FFFAFA; @@ -263,6 +269,8 @@ } .ui.form .field.error textarea:focus, .ui.form .field.error input[type="text"]:focus, +.ui.form .field.error input[type="email"]:focus, +.ui.form .field.error input[type="date"]:focus, .ui.form .field.error input[type="password"]:focus { border-color: rgba(255, 80, 80, 1); color: rgba(255, 80, 80, 1); @@ -395,7 +403,10 @@ color: #FFFFFF; } .ui.inverted.form .field.error textarea, -.ui.inverted.form .field.error input[type="text"] { +.ui.inverted.form .field.error input[type="text"], +.ui.inverted.form .field.error input[type="date"], +.ui.inverted.form .field.error input[type="email"], +.ui.inverted.form .field.error input[type="password"]{ background-color: #FFCCCC; } @@ -527,6 +538,8 @@ } .ui.small.form textarea, .ui.small.form input[type="text"], +.ui.small.form input[type="email"], +.ui.small.form input[type="date"], .ui.small.form input[type="password"], .ui.small.form label { font-size: 1em; diff --git a/build/less/elements/basic.icon.less b/build/less/elements/basic.icon.less index 6b133ee83..6a6db2a84 100644 --- a/build/less/elements/basic.icon.less +++ b/build/less/elements/basic.icon.less @@ -458,6 +458,11 @@ i.basic.icon { font-size: 1em; } i.large.basic.icon { + font-size: 1.5em; + margin-right: 0.2em; + vertical-align: middle; +} +i.big.basic.icon { font-size: 2em; margin-right: 0.5em; vertical-align: middle; diff --git a/build/less/elements/icon.less b/build/less/elements/icon.less index a30d82dfe..f3a9aca4f 100644 --- a/build/less/elements/icon.less +++ b/build/less/elements/icon.less @@ -755,6 +755,10 @@ i.icon { font-size: 1em; } i.large.icon { + font-size: 1.5em; + vertical-align: middle; +} +i.big.icon { font-size: 2em; vertical-align: middle; } From 3df5f046c54d6ca7fb22cac1d338adec9748fb53 Mon Sep 17 00:00:00 2001 From: deneuxa Date: Sun, 6 Oct 2013 17:33:47 +0200 Subject: [PATCH 2/4] add date&email types for inputs Former-commit-id: 3054289be940e034619254398f3737c87b150ac0 Former-commit-id: 1219372a9971d749e345adb141f42603605ee71b --- src/collections/form.less | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/collections/form.less b/src/collections/form.less index 5a592ce67..8b631e476 100755 --- a/src/collections/form.less +++ b/src/collections/form.less @@ -65,6 +65,7 @@ .ui.form textarea, .ui.form input[type="text"], +.ui.form input[type="email"], .ui.form input[type="date"], .ui.form input[type="password"], .ui.form .ui.input { @@ -73,6 +74,7 @@ .ui.form textarea, .ui.form input[type="text"], +.ui.form input[type="email"], .ui.form input[type="date"], .ui.form input[type="password"] { @@ -201,6 +203,8 @@ ---------------------*/ .ui.form input[type="text"]:focus, +.ui.form input[type="email"]:focus, +.ui.form input[type="date"]:focus, .ui.form input[type="password"]:focus, .ui.form textarea:focus { color: rgba(0, 0, 0, 0.85); @@ -240,10 +244,12 @@ } .ui.form .fields.error .field textarea, .ui.form .fields.error .field input[type="text"], +.ui.form .fields.error .field input[type="email"], .ui.form .fields.error .field input[type="date"], .ui.form .fields.error .field input[type="password"], .ui.form .field.error textarea, .ui.form .field.error input[type="text"], +.ui.form .field.error input[type="email"], .ui.form .field.error input[type="date"], .ui.form .field.error input[type="password"] { background-color: #FFFAFA; @@ -263,6 +269,8 @@ } .ui.form .field.error textarea:focus, .ui.form .field.error input[type="text"]:focus, +.ui.form .field.error input[type="email"]:focus, +.ui.form .field.error input[type="date"]:focus, .ui.form .field.error input[type="password"]:focus { border-color: rgba(255, 80, 80, 1); color: rgba(255, 80, 80, 1); @@ -395,7 +403,10 @@ color: #FFFFFF; } .ui.inverted.form .field.error textarea, -.ui.inverted.form .field.error input[type="text"] { +.ui.inverted.form .field.error input[type="text"], +.ui.inverted.form .field.error input[type="email"] +.ui.inverted.form .field.error input[type="date"] +.ui.inverted.form .field.error input[type="password"]{ background-color: #FFCCCC; } @@ -527,6 +538,8 @@ } .ui.small.form textarea, .ui.small.form input[type="text"], +.ui.small.form input[type="email"], +.ui.small.form input[type="date"], .ui.small.form input[type="password"], .ui.small.form label { font-size: 1em; From cca12232cc8edde8e6b7f72026b65aea2e46337f Mon Sep 17 00:00:00 2001 From: deneuxa Date: Sun, 6 Oct 2013 17:37:52 +0200 Subject: [PATCH 3/4] Reduce large icon size and add big size Former-commit-id: 6cd42da01722e30ed234d93b95b2b8fa006259ad Former-commit-id: eb53294ffb57031795d5740b1f345405a1b9a908 --- src/elements/basic.icon.less | 5 +++++ src/elements/icon.less | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/elements/basic.icon.less b/src/elements/basic.icon.less index 6b133ee83..6a6db2a84 100755 --- a/src/elements/basic.icon.less +++ b/src/elements/basic.icon.less @@ -458,6 +458,11 @@ i.basic.icon { font-size: 1em; } i.large.basic.icon { + font-size: 1.5em; + margin-right: 0.2em; + vertical-align: middle; +} +i.big.basic.icon { font-size: 2em; margin-right: 0.5em; vertical-align: middle; diff --git a/src/elements/icon.less b/src/elements/icon.less index a30d82dfe..f3a9aca4f 100755 --- a/src/elements/icon.less +++ b/src/elements/icon.less @@ -755,6 +755,10 @@ i.icon { font-size: 1em; } i.large.icon { + font-size: 1.5em; + vertical-align: middle; +} +i.big.icon { font-size: 2em; vertical-align: middle; } From 9770b3c86a6717e4fa15a162f312cd00b6d272dc Mon Sep 17 00:00:00 2001 From: deneuxa Date: Sun, 6 Oct 2013 18:21:39 +0200 Subject: [PATCH 4/4] fix typo Former-commit-id: 24654c3375950fe11b940178c953611122dc313d Former-commit-id: 56b6e0ea7fde091ea5c4f338b18681e356c79f59 --- src/collections/form.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/collections/form.less b/src/collections/form.less index 8b631e476..33ad5d792 100755 --- a/src/collections/form.less +++ b/src/collections/form.less @@ -404,8 +404,8 @@ } .ui.inverted.form .field.error textarea, .ui.inverted.form .field.error input[type="text"], -.ui.inverted.form .field.error input[type="email"] -.ui.inverted.form .field.error input[type="date"] +.ui.inverted.form .field.error input[type="email"], +.ui.inverted.form .field.error input[type="date"], .ui.inverted.form .field.error input[type="password"]{ background-color: #FFCCCC; }