Skip to content

C
cbdiscord
Commit 98732fb4 authored by Geovanny's avatar Geovanny
Browse files
Options

Added some info into home page

parent e5cd11a6
Show whitespace changes
Inline Side-by-side
Showing with 111 additions and 24 deletions
web/index.html
View file @ 98732fb4
...@@ -10,6 +10,16 @@ ...@@ -10,6 +10,16 @@
<body> <body>
<nav-placeholder></nav-placeholder> <nav-placeholder></nav-placeholder>
<script src="/navbar/navbar.js"></script> <script src="/navbar/navbar.js"></script>
<h1>STUFF IN HERE</h1> <div class="home-text">
<p>
Conqueror's blade application to keep track of your units.
</p>
<p>
House System is a WIP to manage house members and create parties based on their units.
</p>
<p>
Web-app implementation of Discord Bot. Invite Bot to your server <a href="https://discord.com/oauth2/authorize?client_id=534070031747776534&scope=bot&permissions=36895808">here</a>
</p>
</div>
</body> </body>
</html> </html>
web/navbar/navbar.html
View file @ 98732fb4
...@@ -3,19 +3,15 @@ ...@@ -3,19 +3,15 @@
<a href="/">Conquy Blade</a> <a href="/">Conquy Blade</a>
</bar-title> </bar-title>
<bar-options> <bar-options>
<div class="dropdown"> <div class="dropdown bar-element">
<p>Unit</p> <p>Unit</p>
<div class="dropdown-content"> <div class="dropdown-content">
<a href="/units">All Units</a> <a href="/units">All Units</a>
<a href="/myunits">My Units</a> <a href="/myunits">My Units</a>
</div> </div>
</div> </div>
<div class="dropdown"> <div class="bar-element">
<p>House</p> <a onclick="alert('Not implemented yet')">House</a>
<div class="dropdown-content">
<a href="/units">All Units</a>
<a>My Units</a>
</div>
</div> </div>
</bar-options> </bar-options>
<bar-user> <bar-user>
...@@ -23,7 +19,7 @@ ...@@ -23,7 +19,7 @@
<div class="dropdown" style="display: none;"> <div class="dropdown" style="display: none;">
<p>House</p> <p>House</p>
<div class="dropdown-content"> <div class="dropdown-content">
<a>Profile</a> <a onclick="alert('Not implemented yet')">Profile</a>
<a onclick="logOut()">Log Out</a> <a onclick="logOut()">Log Out</a>
</div> </div>
</div> </div>
......
web/sass/main.scss
View file @ 98732fb4
...@@ -18,3 +18,11 @@ content-body{ ...@@ -18,3 +18,11 @@ content-body{
margin-top: 50px; margin-top: 50px;
grid-area: content; grid-area: content;
} }
.home-text{
text-align: center;
font-size: 30px;
a{
color: rgb(20, 20, 161);
}
}
\ No newline at end of file
web/sass/navbar.scss
View file @ 98732fb4
...@@ -7,22 +7,27 @@ nav-bar{ ...@@ -7,22 +7,27 @@ nav-bar{
/1fr 5fr 1fr /1fr 5fr 1fr
; ;
background-color: rgb(117, 16, 16); background-color: rgb(117, 16, 16);
max-height: 100px;
} }
bar-title { bar-title {
margin: auto; // margin: auto;
margin-top: 20px;
text-align: center;
min-width: 260px;
a { a {
grid-area: title; grid-area: title;
font-size: 300%; font-size: 300%;
color: whitesmoke; color: white;
text-decoration: none; text-decoration: none;
} }
} }
bar-options{ bar-options{
grid-area: options; grid-area: options;
min-width: 500px;
} }
.dropdown { .dropdown {
...@@ -34,6 +39,25 @@ bar-options{ ...@@ -34,6 +39,25 @@ bar-options{
height: 100%; height: 100%;
} }
.bar-element{
position: relative;
display: inline-block;
text-align: center;
font-size: 30px;
min-width: 160px;
height: 100%;
a{
display: block;
margin-block-start: 1em;
margin-block-end: 1em;
margin-inline-start: 0px;
margin-inline-end: 0px;
}
}
.bar-element:hover{
background-color: #9c4949;
}
.dropdown-content { .dropdown-content {
display: none; display: none;
position: absolute; position: absolute;
...@@ -52,7 +76,6 @@ bar-options{ ...@@ -52,7 +76,6 @@ bar-options{
} }
.dropdown:hover { .dropdown:hover {
background-color: #9c4949;
.dropdown-content { .dropdown-content {
display: block; display: block;
} }
......
web/stylesheets/main.css
View file @ 98732fb4
...@@ -33,20 +33,24 @@ nav-bar { ...@@ -33,20 +33,24 @@ nav-bar {
color: #dbdbdb; color: #dbdbdb;
grid-template: "title options user"/1fr 5fr 1fr; grid-template: "title options user"/1fr 5fr 1fr;
background-color: #751010; background-color: #751010;
max-height: 100px;
} }
bar-title { bar-title {
margin: auto; margin-top: 20px;
text-align: center;
min-width: 260px;
} }
bar-title a { bar-title a {
grid-area: title; grid-area: title;
font-size: 300%; font-size: 300%;
color: whitesmoke; color: white;
text-decoration: none; text-decoration: none;
} }
bar-options { bar-options {
grid-area: options; grid-area: options;
min-width: 500px;
} }
.dropdown { .dropdown {
...@@ -58,6 +62,26 @@ bar-options { ...@@ -58,6 +62,26 @@ bar-options {
height: 100%; height: 100%;
} }
.bar-element {
position: relative;
display: inline-block;
text-align: center;
font-size: 30px;
min-width: 160px;
height: 100%;
}
.bar-element a {
display: block;
margin-block-start: 1em;
margin-block-end: 1em;
margin-inline-start: 0px;
margin-inline-end: 0px;
}
.bar-element:hover {
background-color: #9c4949;
}
.dropdown-content { .dropdown-content {
display: none; display: none;
position: absolute; position: absolute;
...@@ -75,9 +99,6 @@ bar-options { ...@@ -75,9 +99,6 @@ bar-options {
background-color: #3b0f0f; background-color: #3b0f0f;
} }
.dropdown:hover {
background-color: #9c4949;
}
.dropdown:hover .dropdown-content { .dropdown:hover .dropdown-content {
display: block; display: block;
} }
...@@ -304,4 +325,12 @@ content-body { ...@@ -304,4 +325,12 @@ content-body {
grid-area: content; grid-area: content;
} }
.home-text {
text-align: center;
font-size: 30px;
}
.home-text a {
color: #1414a1;
}
/*# sourceMappingURL=main.css.map */ /*# sourceMappingURL=main.css.map */
web/stylesheets/main.css.map
View file @ 98732fb4
{"version":3,"sourceRoot":"","sources":["../fontawesome/font_awesome.scss","../sass/navbar.scss","../sass/login.scss","../sass/unit.scss","../sass/main.scss"],"names":[],"mappings":"AAAA;EACI;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAmBF;EACI;IAAK;;EACP;IAAO;;;AC1CX;EACI;EACA;EACA;EACA,eACI;EAGJ;;;AAGJ;EAEI;;AACA;EACI;EACA;EAEA;EACA;;;AAIR;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACI;EACA;;AAEJ;EACI;;;AAIR;EACI;;AACA;EACI;;;AAIR;EACI;EACA;EACA;;AACA;EACI;EACA;;;AAIR;EACI;;;AAKA;EACI;;AAEJ;EACI;;;AChFR;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EAEA;EACA;EACA;;AACA;EACI;EACA;;;AAIN;AACF;EACI;EAEA;EACA;EACA;EACA;EACA;;;AAGF;AACF;EACI;;;AAGF;AACF;EACI;;;AAGF;AACF;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;AAA0B;;;AAG9B;AACA;EACI;IAAM;;EACN;IAAI;;;AAGN;EACE;EACA;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;;ACnFJ;EACI;EACA;;;AAGJ;EACI;;;AAEJ;EACI;;AAEA;EACI;;;AAKR;EACI;;AACA;EACI;;;AAGR;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EAEA,eACI;;;AAKR;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;;;AAEJ;EACI;EACA;EACA;;;AAEJ;EACI;EACA;;AACA;EACI;EACA;;;AAGR;EACI;;;AAEJ;EACI;;AACA;EACI;EACA;;;AC3FR;EACI;EACA;EACA;EACA;EACA,eACI;;;AAKR;EACI;EACA","file":"main.css"} {"version":3,"sourceRoot":"","sources":["../fontawesome/font_awesome.scss","../sass/navbar.scss","../sass/login.scss","../sass/unit.scss","../sass/main.scss"],"names":[],"mappings":"AAAA;EACI;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAmBF;EACI;IAAK;;EACP;IAAO;;;AC1CX;EACI;EACA;EACA;EACA,eACI;EAGJ;EACA;;;AAGJ;EAGI;EACA;EACA;;AACA;EACI;EACA;EAEA;EACA;;;AAIR;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AACA;EACI;EACA;EACA;EACA;EACA;;;AAGR;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACI;EACA;;AAEJ;EACI;;;AAKJ;EACI;;;AAIR;EACI;EACA;EACA;;AACA;EACI;EACA;;;AAIR;EACI;;;AAKA;EACI;;AAEJ;EACI;;;ACvGR;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EAEA;EACA;EACA;;AACA;EACI;EACA;;;AAIN;AACF;EACI;EAEA;EACA;EACA;EACA;EACA;;;AAGF;AACF;EACI;;;AAGF;AACF;EACI;;;AAGF;AACF;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;AAA0B;;;AAG9B;AACA;EACI;IAAM;;EACN;IAAI;;;AAGN;EACE;EACA;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;;ACnFJ;EACI;EACA;;;AAGJ;EACI;;;AAEJ;EACI;;AAEA;EACI;;;AAKR;EACI;;AACA;EACI;;;AAGR;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EAEA,eACI;;;AAKR;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;;;AAEJ;EACI;EACA;EACA;;;AAEJ;EACI;EACA;;AACA;EACI;EACA;;;AAGR;EACI;;;AAEJ;EACI;;AACA;EACI;EACA;;;AC3FR;EACI;EACA;EACA;EACA;EACA,eACI;;;AAKR;EACI;EACA;;;AAGJ;EACI;EACA;;AACA;EACI","file":"main.css"}
\ No newline at end of file \ No newline at end of file
web/stylesheets/navbar.css
View file @ 98732fb4
...@@ -4,20 +4,24 @@ nav-bar { ...@@ -4,20 +4,24 @@ nav-bar {
color: #dbdbdb; color: #dbdbdb;
grid-template: "title options user"/1fr 5fr 1fr; grid-template: "title options user"/1fr 5fr 1fr;
background-color: #751010; background-color: #751010;
max-height: 100px;
} }
bar-title { bar-title {
margin: auto; margin-top: 20px;
text-align: center;
min-width: 260px;
} }
bar-title a { bar-title a {
grid-area: title; grid-area: title;
font-size: 300%; font-size: 300%;
color: whitesmoke; color: white;
text-decoration: none; text-decoration: none;
} }
bar-options { bar-options {
grid-area: options; grid-area: options;
min-width: 500px;
} }
.dropdown { .dropdown {
...@@ -29,6 +33,26 @@ bar-options { ...@@ -29,6 +33,26 @@ bar-options {
height: 100%; height: 100%;
} }
.bar-element {
position: relative;
display: inline-block;
text-align: center;
font-size: 30px;
min-width: 160px;
height: 100%;
}
.bar-element a {
display: block;
margin-block-start: 1em;
margin-block-end: 1em;
margin-inline-start: 0px;
margin-inline-end: 0px;
}
.bar-element:hover {
background-color: #9c4949;
}
.dropdown-content { .dropdown-content {
display: none; display: none;
position: absolute; position: absolute;
...@@ -46,9 +70,6 @@ bar-options { ...@@ -46,9 +70,6 @@ bar-options {
background-color: #3b0f0f; background-color: #3b0f0f;
} }
.dropdown:hover {
background-color: #9c4949;
}
.dropdown:hover .dropdown-content { .dropdown:hover .dropdown-content {
display: block; display: block;
} }
......
web/stylesheets/navbar.css.map
View file @ 98732fb4
{"version":3,"sourceRoot":"","sources":["../sass/navbar.scss"],"names":[],"mappings":"AAAA;EACI;EACA;EACA;EACA,eACI;EAGJ;;;AAGJ;EAEI;;AACA;EACI;EACA;EAEA;EACA;;;AAIR;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACI;EACA;;AAEJ;EACI;;;AAIR;EACI;;AACA;EACI;;;AAIR;EACI;EACA;EACA;;AACA;EACI;EACA;;;AAIR;EACI;;;AAKA;EACI;;AAEJ;EACI","file":"navbar.css"} {"version":3,"sourceRoot":"","sources":["../sass/navbar.scss"],"names":[],"mappings":"AAAA;EACI;EACA;EACA;EACA,eACI;EAGJ;EACA;;;AAGJ;EAGI;EACA;EACA;;AACA;EACI;EACA;EAEA;EACA;;;AAIR;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AACA;EACI;EACA;EACA;EACA;EACA;;;AAGR;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACI;EACA;;AAEJ;EACI;;;AAKJ;EACI;;;AAIR;EACI;EACA;EACA;;AACA;EACI;EACA;;;AAIR;EACI;;;AAKA;EACI;;AAEJ;EACI","file":"navbar.css"}
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment