1
0
mirror of https://github.com/jenil/chota.git synced 2023-08-10 21:13:07 +03:00

Merge branch 'master' of github.com:jenil/chota

# Conflicts:
#	dist/chota.min.css
This commit is contained in:
Jenil Gogari 2019-05-12 12:52:18 -04:00
commit d58ae30e42
3 changed files with 16 additions and 0 deletions

7
dist/chota.css vendored
View File

@ -524,12 +524,16 @@ button {
display: flex; display: flex;
} }
.grouped > input:not(:last-child), .grouped > input:not(:last-child),
.grouped > select:not(:last-child),
.grouped > .button:not(:last-child) { .grouped > .button:not(:last-child) {
margin-right: 16px; margin-right: 16px;
} }
.button + .button { .button + .button {
margin-left: 1rem; margin-left: 1rem;
} }
.buttons > .button + .button {
margin-left: 0;
}
.button:hover, .button:hover,
[type="button"]:hover, [type="button"]:hover,
[type="reset"]:hover, [type="reset"]:hover,
@ -612,6 +616,9 @@ button:disabled:hover {
::-webkit-input-placeholder { ::-webkit-input-placeholder {
color: #bdbfc4; color: #bdbfc4;
} }
::-moz-placeholder {
color: #bdbfc4;
}
:-ms-input-placeholder { :-ms-input-placeholder {
color: #bdbfc4; color: #bdbfc4;
} }

View File

@ -65,6 +65,10 @@ hr {
margin: .5rem; margin: .5rem;
} }
.buttons > .button + .button {
margin-left: .5rem;
}
.highlight, code { background-color: #f1f5f5; } .highlight, code { background-color: #f1f5f5; }
.highlight .c { color: #93a1a1 } /* Comment */ .highlight .c { color: #93a1a1 } /* Comment */
.highlight .err { color: #586e75 } /* Error */ .highlight .err { color: #586e75 } /* Error */

View File

@ -88,6 +88,7 @@ button {
} }
.grouped > input:not(:last-child), .grouped > input:not(:last-child),
.grouped > select:not(:last-child),
.grouped > .button:not(:last-child) { .grouped > .button:not(:last-child) {
margin-right: 16px; margin-right: 16px;
} }
@ -96,6 +97,10 @@ button {
margin-left: 1rem; margin-left: 1rem;
} }
.buttons > .button + .button {
margin-left: 0;
}
.button:hover, .button:hover,
[type="button"]:hover, [type="button"]:hover,
[type="reset"]:hover, [type="reset"]:hover,