Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
doggo4242 committed Dec 7, 2022
2 parents 9c236df + 1f716cc commit 807f554
Show file tree
Hide file tree
Showing 6 changed files with 191 additions and 117 deletions.
92 changes: 91 additions & 1 deletion assets/styles/leaderboard.css
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,94 @@
body, html {
--Gray1: rgba(95, 95, 95, 1);
--Gray2: rgba(63, 63, 63, 1);
--White1: rgba(217, 217, 217, 1);
--White2: rgba(239, 238, 238, 1);
--Aqua1: rgba(16, 185, 129, 1);

--Text-Header: rgb(8, 133, 102);

background-color: var(--Gray2);
}

#table td {
text-align: center;
vertical-align: middle;
}
}

.logout {
float: right;
color: var(--Aqua1);
height: auto;
font-size: 24px;
align-self: auto;
text-align: right;
font-family: Noto Sans;
font-weight: 700;
line-height: normal;
font-stretch: normal;
margin-right: 20px;
margin-bottom: 0;
text-decoration: none;
}

.logout a {
color: var(--Aqua1);
text-decoration: none;
}

.logout-span {
color: var(--White2)
}

.navLinks {
display: inline-block;
text-align: center;
color: var(--Aqua1);
height: auto;
font-size: 24px;
align-self: auto;
font-family: Noto Sans;
font-weight: 700;
line-height: normal;
font-stretch: normal;
margin: 5px 5px 0;
text-decoration: none;
background-color: var(--White2);
border-radius: 30px;
padding: 5px 40px;
}

.navContain1 {
margin-left: calc(50% - 155.98px);
}

h2 {
text-align: center;
font-weight: 1000;
font-size: 3rem;
color: var(--White2);
}

table {
margin-left: auto;
margin-right: auto;
background-color: var(--White2);
border-radius: 60px;
width: 95vw;
height: auto;
font-family: Noto Sans;
}

table th {
color: var(--Text-Header);
font-size: 2rem;
font-weight: 1000;
padding: 10px;
}

table td {
color: var(--Gray1);
font-size: 1.2rem;
font-weight: 1000;
padding: 10px;
}
73 changes: 23 additions & 50 deletions assets/styles/login.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
html, body {
margin: 0;
padding: 0;
--Standard-Element-Width: 284px;
--Standard-Element-Height: 28px;
--Input-Offset: 24px;

--Gray1: rgba(95, 95, 95, 1);
--White1: rgba(217, 217, 217, 1);
--Aqua1: rgba(16, 185, 129, 1);
}

.login-login {
Expand All @@ -10,7 +17,6 @@ html, body {
position: relative;
align-items: center;
flex-shrink: 0;
border-color: var(--dl-color-gray-black);
border-width: 0;
margin: 0;
flex-direction: column;
Expand Down Expand Up @@ -38,10 +44,9 @@ html, body {
height: auto;
font-size: 40px;
align-self: stretch;
font-style: Display Bold;
text-align: center;
font-family: Noto Sans;
font-weight: 700;
font-weight: 1000;
line-height: normal;
font-stretch: normal;
margin-right: 0;
Expand All @@ -51,9 +56,9 @@ html, body {

.login-textinput {
flex: initial;
color: rgba(95, 95, 95, 1);
width: 284px;
height: 28px;
color: var(--Gray1);
width: calc(var(--Standard-Element-Width) - var(--Input-Offset));
height: var(--Standard-Element-Height);
font-size: 12px;
margin-top: 0;
text-align: left;
Expand All @@ -63,30 +68,12 @@ html, body {
border-radius: 10px;
margin-bottom: 10px;
padding: 15px 15px 15px 9px;
background-color: rgba(217, 217, 217, 1);
}

.login-textinput1 {
flex: initial;
color: rgba(95, 95, 95, 1);
width: 284px;
height: 28px;
font-size: 12px;
margin-top: 0;
text-align: left;
font-family: Noto Sans;
border-style: hidden;
border-width: 0px;
border-radius: 10px;
margin-bottom: 10px;
padding: 15px 15px 15px 9px;
text-transform: capitalize;
background-color: rgba(217, 217, 217, 1);
background-color: var(--White1);
}

.login-login-button {
width: 284px;
height: 28px;
width: var(--Standard-Element-Width);
height: var(--Standard-Element-Height);
display: flex;
overflow: hidden;
position: relative;
Expand All @@ -95,7 +82,7 @@ html, body {
border-color: transparent;
border-radius: 10px;
margin-bottom: 10px;
background-color: rgba(16, 185, 129, 1);
background-color: var(--Aqua1);
}

.login-text2 {
Expand All @@ -107,45 +94,31 @@ html, body {
position: absolute;
font-size: 12px;
align-self: auto;
font-style: SemiBold;
text-align: center;
font-family: Noto Sans;
font-weight: 600;
font-weight: 700;
line-height: normal;
font-stretch: normal;
margin-right: 0;
margin-bottom: 0;
text-decoration: none;
}

.login-text4 {
color: rgba(16, 185, 129, 1);
.login-text3 {
color: var(--Aqua1);
height: auto;
font-size: 12px;
align-self: auto;
font-style: SemiBold;
text-align: center;
font-family: Noto Sans;
font-weight: 600;
font-weight: 700;
line-height: normal;
font-stretch: normal;
margin-right: 0;
margin-bottom: 10px;
margin-bottom: 0;
text-decoration: none;
}

.login-text6 {
color: rgba(16, 185, 129, 1);
height: auto;
font-size: 12px;
align-self: auto;
font-style: SemiBold;
text-align: center;
font-family: Noto Sans;
font-weight: 600;
line-height: normal;
font-stretch: normal;
margin-right: 0;
margin-bottom: 0;
text-decoration: none;
}
.login-margin {
margin-bottom: 10px;
}
58 changes: 32 additions & 26 deletions assets/styles/register.css
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
html, body {
margin: 0;
padding: 0;

--Standard-Element-Width: 284px;
--Standard-Element-Height: 28px;
--Input-Offset: 24px;

--Gray1: rgba(95, 95, 95, 1);
--White1: rgba(217, 217, 217, 1);
--Aqua1: rgba(16, 185, 129, 1);
}

.register-register {
width: 100%;
height: 100vh;
Expand Down Expand Up @@ -34,10 +43,9 @@ html, body {
height: auto;
font-size: 40px;
align-self: stretch;
font-style: Display Bold;
text-align: center;
font-family: Noto Sans;
font-weight: 700;
font-weight: 1000;
line-height: normal;
font-stretch: normal;
margin-right: 0;
Expand All @@ -55,9 +63,9 @@ html, body {
}

.register-textinput {
color: rgba(95, 95, 95, 1);
width: 284px;
height: 28px;
color: var(--Gray1);
width: var(--Standard-Element-Width);
height: var(--Standard-Element-Height);
font-size: 12px;
align-self: center;
text-align: left;
Expand All @@ -70,13 +78,13 @@ html, body {
margin-bottom: 10px;
padding-right: 15px;
padding-bottom: 15px;
background-color: rgba(217, 217, 217, 1);
background-color: var(--White1);
}

.register-textinput1 {
color: rgba(95, 95, 95, 1);
width: 284px;
height: 28px;
color: var(--Gray1);
width: var(--Standard-Element-Width);
height: var(--Standard-Element-Height);
font-size: 12px;
align-self: center;
text-align: left;
Expand All @@ -89,13 +97,13 @@ html, body {
margin-bottom: 10px;
padding-right: 15px;
padding-bottom: 15px;
background-color: rgba(217, 217, 217, 1);
background-color: var(--White1);
}

.register-textinput2 {
color: rgba(95, 95, 95, 1);
width: 284px;
height: 28px;
color: var(--Gray1);
width: var(--Standard-Element-Width);
height: var(--Standard-Element-Height);
font-size: 12px;
align-self: center;
text-align: left;
Expand All @@ -108,13 +116,13 @@ html, body {
margin-bottom: 10px;
padding-right: 15px;
padding-bottom: 15px;
background-color: rgba(217, 217, 217, 1);
background-color: var(--White1);
}

.register-textinput3 {
color: rgba(95, 95, 95, 1);
width: 284px;
height: 28px;
color: var(--Gray1);
width: var(--Standard-Element-Width);
height: var(--Standard-Element-Height);
font-size: 12px;
align-self: center;
text-align: left;
Expand All @@ -127,12 +135,12 @@ html, body {
margin-bottom: 10px;
padding-right: 15px;
padding-bottom: 15px;
background-color: rgba(217, 217, 217, 1);
background-color: var(--White1);
}

.register-login-button {
width: 284px;
height: 28px;
width: calc(var(--Standard-Element-Width) + var(--Input-Offset));
height: var(--Standard-Element-Height);
display: flex;
overflow: hidden;
position: relative;
Expand All @@ -141,7 +149,7 @@ html, body {
flex-shrink: 0;
border-color: transparent;
border-radius: 10px;
background-color: rgba(16, 185, 129, 1);
background-color: var(--Aqua1);
}

.register-text2 {
Expand All @@ -150,24 +158,22 @@ html, body {
height: auto;
font-size: 12px;
align-self: center;
font-style: SemiBold;
text-align: center;
font-family: Noto Sans;
font-weight: 600;
font-weight: 700;
line-height: normal;
font-stretch: normal;
text-decoration: none;
}

.register-text4 {
color: rgba(16, 185, 129, 1);
color: var(--Aqua1);
height: auto;
font-size: 12px;
align-self: center;
font-style: SemiBold;
text-align: center;
font-family: Noto Sans;
font-weight: 600;
font-weight: 700;
line-height: normal;
font-stretch: normal;
margin-right: 0;
Expand Down
Loading

0 comments on commit 807f554

Please sign in to comment.