fix merge conflicts

Signed-off-by: Arthur Lu <learthurgo@gmail.com>
This commit is contained in:
Arthur Lu
2022-11-13 21:47:27 +00:00
parent 1819f5042c
commit 37ea4d7e6d
6 changed files with 12 additions and 134 deletions

View File

@@ -58,25 +58,25 @@ table {
}
input, select {
vertical-align :middle;
vertical-align: middle;
}
img, fieldset, object {
border:none;
border: none;
}
*, *:after, *:before {
box-sizing:border-box;
box-sizing: border-box;
}
button, label {
cursor:pointer;
cursor: pointer;
}
html, body {
height:100%;
height: 100%;
}
form {
border
border: solid;
}