Browse Source

Merge pull request #179 from deneuxa/master

Correct src & build files for previous pull-request

Former-commit-id: 753c56f2be
Former-commit-id: 4aa1934ddf
pull/258/head
Jack Lukic 11 years ago
parent
commit
8643763702
6 changed files with 46 additions and 2 deletions
  1. 15
      build/less/collections/form.less
  2. 5
      build/less/elements/basic.icon.less
  3. 4
      build/less/elements/icon.less
  4. 15
      src/collections/form.less
  5. 5
      src/elements/basic.icon.less
  6. 4
      src/elements/icon.less

15
build/less/collections/form.less

@ -65,6 +65,7 @@
.ui.form textarea, .ui.form textarea,
.ui.form input[type="text"], .ui.form input[type="text"],
.ui.form input[type="email"],
.ui.form input[type="date"], .ui.form input[type="date"],
.ui.form input[type="password"], .ui.form input[type="password"],
.ui.form .ui.input { .ui.form .ui.input {
@ -73,6 +74,7 @@
.ui.form textarea, .ui.form textarea,
.ui.form input[type="text"], .ui.form input[type="text"],
.ui.form input[type="email"],
.ui.form input[type="date"], .ui.form input[type="date"],
.ui.form input[type="password"] { .ui.form input[type="password"] {
@ -201,6 +203,8 @@
---------------------*/ ---------------------*/
.ui.form input[type="text"]:focus, .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 input[type="password"]:focus,
.ui.form textarea:focus { .ui.form textarea:focus {
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
@ -240,10 +244,12 @@
} }
.ui.form .fields.error .field textarea, .ui.form .fields.error .field textarea,
.ui.form .fields.error .field input[type="text"], .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="date"],
.ui.form .fields.error .field input[type="password"], .ui.form .fields.error .field input[type="password"],
.ui.form .field.error textarea, .ui.form .field.error textarea,
.ui.form .field.error input[type="text"], .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="date"],
.ui.form .field.error input[type="password"] { .ui.form .field.error input[type="password"] {
background-color: #FFFAFA; background-color: #FFFAFA;
@ -263,6 +269,8 @@
} }
.ui.form .field.error textarea:focus, .ui.form .field.error textarea:focus,
.ui.form .field.error input[type="text"]: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 { .ui.form .field.error input[type="password"]:focus {
border-color: rgba(255, 80, 80, 1); border-color: rgba(255, 80, 80, 1);
color: rgba(255, 80, 80, 1); color: rgba(255, 80, 80, 1);
@ -395,7 +403,10 @@
color: #FFFFFF; color: #FFFFFF;
} }
.ui.inverted.form .field.error textarea, .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; background-color: #FFCCCC;
} }
@ -527,6 +538,8 @@
} }
.ui.small.form textarea, .ui.small.form textarea,
.ui.small.form input[type="text"], .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 input[type="password"],
.ui.small.form label { .ui.small.form label {
font-size: 1em; font-size: 1em;

5
build/less/elements/basic.icon.less

@ -458,6 +458,11 @@ i.basic.icon {
font-size: 1em; font-size: 1em;
} }
i.large.basic.icon { i.large.basic.icon {
font-size: 1.5em;
margin-right: 0.2em;
vertical-align: middle;
}
i.big.basic.icon {
font-size: 2em; font-size: 2em;
margin-right: 0.5em; margin-right: 0.5em;
vertical-align: middle; vertical-align: middle;

4
build/less/elements/icon.less

@ -755,6 +755,10 @@ i.icon {
font-size: 1em; font-size: 1em;
} }
i.large.icon { i.large.icon {
font-size: 1.5em;
vertical-align: middle;
}
i.big.icon {
font-size: 2em; font-size: 2em;
vertical-align: middle; vertical-align: middle;
} }

15
src/collections/form.less

@ -65,6 +65,7 @@
.ui.form textarea, .ui.form textarea,
.ui.form input[type="text"], .ui.form input[type="text"],
.ui.form input[type="email"],
.ui.form input[type="date"], .ui.form input[type="date"],
.ui.form input[type="password"], .ui.form input[type="password"],
.ui.form .ui.input { .ui.form .ui.input {
@ -73,6 +74,7 @@
.ui.form textarea, .ui.form textarea,
.ui.form input[type="text"], .ui.form input[type="text"],
.ui.form input[type="email"],
.ui.form input[type="date"], .ui.form input[type="date"],
.ui.form input[type="password"] { .ui.form input[type="password"] {
@ -201,6 +203,8 @@
---------------------*/ ---------------------*/
.ui.form input[type="text"]:focus, .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 input[type="password"]:focus,
.ui.form textarea:focus { .ui.form textarea:focus {
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
@ -240,10 +244,12 @@
} }
.ui.form .fields.error .field textarea, .ui.form .fields.error .field textarea,
.ui.form .fields.error .field input[type="text"], .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="date"],
.ui.form .fields.error .field input[type="password"], .ui.form .fields.error .field input[type="password"],
.ui.form .field.error textarea, .ui.form .field.error textarea,
.ui.form .field.error input[type="text"], .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="date"],
.ui.form .field.error input[type="password"] { .ui.form .field.error input[type="password"] {
background-color: #FFFAFA; background-color: #FFFAFA;
@ -263,6 +269,8 @@
} }
.ui.form .field.error textarea:focus, .ui.form .field.error textarea:focus,
.ui.form .field.error input[type="text"]: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 { .ui.form .field.error input[type="password"]:focus {
border-color: rgba(255, 80, 80, 1); border-color: rgba(255, 80, 80, 1);
color: rgba(255, 80, 80, 1); color: rgba(255, 80, 80, 1);
@ -395,7 +403,10 @@
color: #FFFFFF; color: #FFFFFF;
} }
.ui.inverted.form .field.error textarea, .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; background-color: #FFCCCC;
} }
@ -527,6 +538,8 @@
} }
.ui.small.form textarea, .ui.small.form textarea,
.ui.small.form input[type="text"], .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 input[type="password"],
.ui.small.form label { .ui.small.form label {
font-size: 1em; font-size: 1em;

5
src/elements/basic.icon.less

@ -458,6 +458,11 @@ i.basic.icon {
font-size: 1em; font-size: 1em;
} }
i.large.basic.icon { i.large.basic.icon {
font-size: 1.5em;
margin-right: 0.2em;
vertical-align: middle;
}
i.big.basic.icon {
font-size: 2em; font-size: 2em;
margin-right: 0.5em; margin-right: 0.5em;
vertical-align: middle; vertical-align: middle;

4
src/elements/icon.less

@ -755,6 +755,10 @@ i.icon {
font-size: 1em; font-size: 1em;
} }
i.large.icon { i.large.icon {
font-size: 1.5em;
vertical-align: middle;
}
i.big.icon {
font-size: 2em; font-size: 2em;
vertical-align: middle; vertical-align: middle;
} }

Loading…
Cancel
Save