cato447/AbizeitungVotingSystem
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed damage done by false git usage

Browse Source
This commit is contained in:
Simon
2020-11-14 17:08:10 +01:00
parent 7713b1d3ec
commit 264bfa8bf0
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/resources/static/styles/start.css
View File

@@ -1,11 +1,8 @@
<<<<<<< Updated upstream
=======
<<<<<<< Updated upstream
body { body {
background-color: rgb(44, 49, 54); background-color: rgb(44, 49, 54);
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
======= }
>>>>>>> Stashed changes
input { input {
position: fixed; position: fixed;
top: 50%; top: 50%;
@@ -38,10 +35,7 @@ input::selection {
.signup-button { .signup-button {
padding: .25em 0; padding: .25em 0;
border: 0; border: 0;
<<<<<<< Updated upstream
=======
border-radius: 12px; border-radius: 12px;
>>>>>>> Stashed changes
outline: 0; outline: 0;
background: #bb1515; background: #bb1515;
color: #fff; color: #fff;
@@ -149,10 +143,6 @@ input:focus+label .nav-dot:before {
margin: 0; margin: 0;
padding: 0; padding: 0;
box-sizing: border-box; box-sizing: border-box;
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
>>>>>>> Stashed changes
} }
html, html,