Skip to content

Commit

Permalink
Allthecolors!
Browse files Browse the repository at this point in the history
Split CSS into baseStyle. Update sitemap.xml
  • Loading branch information
ALEEF02 committed Nov 2, 2022
1 parent 01201ed commit d4824e5
Show file tree
Hide file tree
Showing 8 changed files with 180 additions and 188 deletions.
96 changes: 96 additions & 0 deletions MavenBack/src/main/webapp/baseStyle.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 400;
font-display: swap;
src: url("https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7lujVj9w.woff2") format("woff2");
} /* Change font if wanted */

:root {
--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;user-select: none;scrollbar-color: dark;-webkit-tap-highlight-color: transparent;
}

*,::after,::before {
box-sizing: border-box
}

/* Scrollbar info */
::-webkit-scrollbar {
width: 14px;
background: transparent;
}

::-webkit-scrollbar-thumb {
width: 10px;
border-radius: 10px;
border: 4px solid rgba(0, 0, 0, 0);
background-color: hsl(116, 7%, 30%);
background-clip: padding-box;
}

::-webkit-scrollbar-thumb:hover {
background: #8c463d;
}

html, body {
height: auto;
margin: 0px;
padding: 0px;
}

body {
font: normal 20px/1.4 'Source Sans Pro', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif;
margin: 0 auto;
background-color: #121113;
}

.navBar{
overflow: hidden;
background-color: #5A5A5A;
width: 100%;
}
.navBar a{
display: block;
text-align: center;
padding: 14px 16px;
color: white;
float: right;
text-decoration: none;
}
.navBar a.left{float:left;}
.navBar a:hover{
/*background-color: #7fa751;*/
background-color: #8c463d;
}

table, td, th{
border: 2px solid white;
text-align: center;
}

tr:nth-child(even) {
/*background-color: #8c463d;*/
background-color: #626268;
}

td a, td a:visited {
color: #57e5ff;
}

@media (max-width: 847px) {
.navBar {
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
.navBar a {
float: none;
width: 100%;
padding: 6px;
}

#userButton {
order: 4;
}
}
4 changes: 3 additions & 1 deletion MavenBack/src/main/webapp/games.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
<link rel="preconnect" href="https://fonts.gstatic.com">
<link rel="apple-touch-icon" href="apple-touch-icon.png">
<link rel="apple-touch-startup-image" href="apple-touch-icon.png">

<link rel="stylesheet" type="text/css" href="baseStyle.css">
<link rel="stylesheet" type="text/css" href="gamesStyle.css">

<title>Games Manager</title>
Expand Down Expand Up @@ -216,7 +218,7 @@
<body>
<div class = "navBar">
<a href = "/" class = "left">Home</a>
<a id="userButton" class = "right" href="/login" >...</a> <!--Leads to user page to display user name, stats, etc.-->
<a id="userButton" href="/login">...</a> <!--Leads to user page to display user name, stats, etc.-->
<a href = "/games">Manage Your Games</a> <!--Leads to seprate page for ppl to register their games-->
</div>
<div class="recent"> <!-- Using this class as a temporary to look decent while I work on the backend & functionality -->
Expand Down
71 changes: 7 additions & 64 deletions MavenBack/src/main/webapp/gamesStyle.css
Original file line number Diff line number Diff line change
@@ -1,53 +1,6 @@
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 400;
font-display: swap;
src: url("https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7lujVj9w.woff2") format("woff2");
} /* Change font if wanted */

:root {
--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;user-select: none;scrollbar-color: dark;-webkit-tap-highlight-color: transparent;
}

*,::after,::before {
box-sizing: border-box
}

html, body {
height: auto;
}

body {
font: normal 20px 'Source Sans Pro', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif;
margin: 0 auto;
background-color: #322e2b;
}
table, td, th{
border: 2px solid white;
text-align: center;
}
table{width: 50%}
tr:nth-child(even) {
background-color: #7fa751;

}
.navBar{
overflow: hidden;
background-color: #5A5A5A;
width: 100%;
}
.navBar a{
display: block;
text-align: center;
padding: 14px 16px;
color: white;
float: right;
text-decoration: none;
}
.navBar a.left{float:left;}
.navBar a.right{float:right;}
.navBar a:hover{background-color: #7fa751;}

.leaderboard{float:left;}
.recent{float: right;}
p, h1, th, td{color: white;}
Expand All @@ -72,12 +25,14 @@ p, h1, th, td{color: white;}
.pendingGames p, .recent p{
margin: 10px;
}

.heading{
text-align: center;
}

table{
width: 100%;
}
}

input[type=text], input[type=number]{
width: 95%;
Expand All @@ -92,7 +47,8 @@ input[type=text], input[type=number]{
color: white;
}
#submitButton{
background-color: #7fa751;
/*background-color: #7fa751;*/
background-color: #8c463d;
text-align: center;
color: white;
display: block;
Expand All @@ -109,7 +65,7 @@ input[type=text], input[type=number]{
}
#submitButton:hover{
background-color: white;
color: #7fa751;
color: #8c463d;
}

@media (max-width: 800px) {
Expand All @@ -118,20 +74,7 @@ input[type=text], input[type=number]{
width: 100%;

}
.navBar{
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;

}
.navBar a{
float: none;
width: 100%;
padding: 6px;

}
.right{ order: 4}
input[type=text], input[type=number]{
margin: 0px;
}
Expand Down
65 changes: 33 additions & 32 deletions MavenBack/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<meta property="og:image" content="images/favicon-192.png">

<link rel="image_src" href="images/favicon-192.png">
<link rel="stylesheet" type="text/css" href="style.css">
<link rel="manifest" href="manifest.json">
<link rel="shortcut icon" href="images/favicon.ico"/>
<link rel="icon" sizes="16x16 32x32" href="images/favicon.ico">
Expand All @@ -28,6 +27,9 @@
<link rel="apple-touch-icon" href="apple-touch-icon.png">
<link rel="apple-touch-startup-image" href="apple-touch-icon.png">

<link rel="stylesheet" type="text/css" href="baseStyle.css">
<link rel="stylesheet" type="text/css" href="style.css">

<title>PingPongPage</title>

<script>
Expand Down Expand Up @@ -170,46 +172,45 @@
</head>
<body>

<!--<div class = "header">
<h1>Welcome to the UCC PingPongPage</h1>
</div>-->
<div class = "navBar">
<a href = "https://www.youtube.com/watch?v=dQw4w9WgXcQ" class = "left">Welcome to the UCC Ping Pong Page!</a>
<a id="userButton" href="/login">...</a> <!--Leads to user page to display user name, stats, etc.-->
<a href = "/games">Manage Your Games</a> <!--Leads to seprate page for ppl to register their games-->
</div>
<div class = "tablesContainer">
<div class = "topPlayers">

<h1 class ="heading"><u>Top Players</u></h1>
<div class = "topPlayers">

<div style="overflow-x:auto;">
<table id="playerTable" class = "leaderboard">
<tr>
<th>Username</th>
<th>Rating</th>
<th>Games in Period</th>
</tr>
</table>
</div>
<h1 class ="heading"><u>Top Players</u></h1>

<div style="overflow-x:auto;">
<table id="playerTable" class = "leaderboard">
<tr>
<th>Username</th>
<th>Rating</th>
<th>Games in Period</th>
</tr>
</table>
</div>

</div>
<div class = "recentGames">

<h1 class = "heading"><u>Recent Games</u></h1>

<div style="overflow-x:auto;">
<table id="gamesTable" class = "recent">
<tr>
<th>Date</th>
<th>Winner</th>
<th>Loser</th>
<th>Winner's Score</th>
<th>Loser's Score</th>
<th>Expected Win %</th>
</tr>
</table>
</div>
</div>

<h1 class = "heading"><u>Recent Games</u></h1>

<div id="gamesTableWrap" style="overflow-x:auto;">
<table id="gamesTable" class = "recent">
<tr>
<th>Date</th>
<th>Winner</th>
<th>Loser</th>
<th>Winner's Score</th>
<th>Loser's Score</th>
<th>Expected Win %</th>
</tr>
</table>
</div>

</div>
</div>

</body>
Expand Down
2 changes: 2 additions & 0 deletions MavenBack/src/main/webapp/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
<link rel="preconnect" href="https://fonts.gstatic.com">
<link rel="apple-touch-icon" href="apple-touch-icon.png">
<link rel="apple-touch-startup-image" href="apple-touch-icon.png">

<link rel="stylesheet" type="text/css" href="baseStyle.css">
<link rel="stylesheet" type="text/css" href="loginStyle.css">

<title>Login</title>
Expand Down
30 changes: 2 additions & 28 deletions MavenBack/src/main/webapp/loginStyle.css
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 400;
font-display: swap;
src: url("https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7lujVj9w.woff2") format("woff2");
} /* Change font if wanted */

:root {
--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;user-select: none;scrollbar-color: dark;-webkit-tap-highlight-color: transparent;
}

*,::after,::before {
box-sizing: border-box
}

html, body {
height: auto;
}

body {
font: normal 20px 'Source Sans Pro', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif;
margin: 0 auto;
background-color: #322e2b;
}

.inputContainer{
position: absolute;
top: 50%;
Expand Down Expand Up @@ -60,7 +34,7 @@ input[type=text]{
}

.emailBtn{
background-color: #7fa751;
background-color: #8c463d;
text-align: center;
color: white;
display: block;
Expand All @@ -78,7 +52,7 @@ input[type=text]{

.emailBtn:hover{
background-color: white;
color: #7fa751;
color: #8c463d;
}

p {
Expand Down
Loading

0 comments on commit d4824e5

Please sign in to comment.