Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Jonas 2021-05-07 12:25:34 +02:00
commit e82588b955
6 changed files with 231 additions and 168 deletions

Binary file not shown.

View File

@ -6,6 +6,6 @@
"\\Javascript", "\\Javascript",
"\\Styles" "\\Styles"
], ],
"SelectedNode": "\\Styles\\AdminPage.css", "SelectedNode": "\\Javascript\\Stem.js",
"PreviewInSolutionExplorer": false "PreviewInSolutionExplorer": false
} }

View File

@ -75,98 +75,106 @@
<h3>Administration</h3> <h3>Administration</h3>
<h5>Opret Game Jam</h5> <h5>Opret Game Jam</h5>
<div> <div class="container">
<form id="createGameJam" method="POST"> <form id="createGameJam" method="POST">
<div class="row">
<div>
<div class="FormField"> <div class="FormField">
<input <input type="text"
type="text"
class="FormFieldInput" class="FormFieldInput"
placeholder="Gamejam title" placeholder="Gamejam title"
name="newGameJam" name="newGameJam"
id="gamejamTitle" id="gamejamTitle"
required required />
/>
<label for="gamejamTitle" class="FormFieldLabel"> <label for="gamejamTitle" class="FormFieldLabel">
Gamejam title Gamejam title
</label> </label>
</div> </div>
</div>
</div>
<div class="row row-cols-2">
<div class="col" id="colDate">
<div class="FormField"> <div class="FormField">
<div id="Dates"> <input type="date"
<input
type="date"
class="FormFieldInput" class="FormFieldInput"
placeholder="mm/dd/yyyy" placeholder="mm/dd/yyyy"
name="startDate" name="startDate"
id="startDate" id="startDate"
required required />
/>
<label for="startDate" class="FormFieldLabel" id="startDateLabel"> <label for="startDate" class="FormFieldLabel" id="startDateLabel">
Start dato Start dato
</label> </label>
<input
type="date"
class="FormFieldInput"
placeholder="mm/dd/yyyy"
name="endDate"
id="endDate"
required
/>
<label for="endDate" class="FormFieldLabel" id="endDateLabel">
Slut dato
</label>
</div> </div>
</div>
<div class="Times"> <div class="col" id="colTime">
<input <div class="FormField">
type="text" <input type="time"
class="FormFieldInput" class="FormFieldInput"
placeholder="hh:mm" placeholder="hh:mm"
name="startTime" name="startTime"
id="startTime" id="startTime"
required required />
/>
<label for="startTime" class="FormFieldLabel" id="startTimeLabel"> <label for="startTime" class="FormFieldLabel" id="startTimeLabel">
Start tid Start tid
</label> </label>
</div>
</div>
<input </div>
type="text"
<div class="row row-cols-2">
<div class="col" id="colDate">
<div class="FormField">
<input type="date"
class="FormFieldInput"
placeholder="mm/dd/yyyy"
name="endDate"
id="endDate"
required />
<label for="endDate" class="FormFieldLabel" id="endDateLabel">
Slut dato
</label>
</div>
</div>
<div class="col" id="colTime">
<div class="FormField">
<input type="time"
class="FormFieldInput" class="FormFieldInput"
placeholder="hh:mm" placeholder="hh:mm"
name="endTime" name="endTime"
id="endTime" id="endTime"
required required />
/>
<label for="endTime" class="FormFieldLabel" id="endTimeLabel"> <label for="endTime" class="FormFieldLabel" id="endTimeLabel">
Slut tid Slut tid
</label> </label>
</div> </div>
</div> </div>
</div>
<!--Behold-->
<div class="FormField"> <div class="FormField">
<input <input type="text"
type="text"
class="FormFieldInput" class="FormFieldInput"
placeholder="Emne / Keywords (Ikke obligatorisk)" placeholder="Emne / Keywords (Ikke obligatorisk)"
name="keyWord" name="keyWord"
id="keyWord" id="keyWord" />
required
/>
<label for="keyWord" class="FormFieldLabel" id="keyWordLabel"> <label for="keyWord" class="FormFieldLabel" id="keyWordLabel">
Emne / Keywords (Ikke obligatorisk) Emne (Ikke obligatorisk)
</label> </label>
</div> </div>
<div class="FormField"> <div class="FormField">
<textarea <textarea class="FormFieldInput"
class="FormFieldInput"
placeholder="Beskrivelse" placeholder="Beskrivelse"
name="description" name="description"
id="Beskrivelse" id="Beskrivelse"
required required></textarea>
></textarea>
<label for="keyWord" class="FormFieldLabel" id="keyWordLabel"> <label for="keyWord" class="FormFieldLabel" id="keyWordLabel">
Beskrivelse Beskrivelse
</label> </label>

View File

@ -1,11 +1,13 @@
body { body {
text-align: center; text-align: center;
background-color: #121B26;
color: #F2E6D8;
} }
.HeaderPanel { .HeaderPanel {
position: fixed; position: fixed;
overflow: hidden; overflow: hidden;
background-color: rgb(33, 37, 41); background-color: #59142D;
padding: 10px 10px; padding: 10px 10px;
top: 0; top: 0;
width: 100%; width: 100%;
@ -13,13 +15,16 @@ body {
.HeaderPanel a { .HeaderPanel a {
text-align: center; text-align: center;
color: rgba(255, 255, 255, .75); color: #F2E6D8;
padding: 6px; padding: 6px;
text-decoration: none; text-decoration: none;
font-size: 18px; font-size: 18px;
line-height: 25px; line-height: 25px;
border-radius: 4px; border-radius: 4px;
} }
.HeaderPanel a:hover {
color: #BF7D65;
}
.HeaderTitle { .HeaderTitle {
text-align: center; text-align: center;
@ -32,10 +37,19 @@ body {
float: left; float: left;
} }
h5{
padding-bottom: 30px;
}
/*Create game jam*/ /*Create game jam*/
.container{
height: 70vh !important;
}
#createGameJam { #createGameJam {
justify-content: center; /*justify-content: center;*/
display: grid; display: grid;
width: 90%;
} }
#createGameJam input{ #createGameJam input{
@ -48,10 +62,10 @@ body {
} }
#startDate { #startDate {
width: 32.5%; /*width: 32.5%;*/
display: inline-block !important; display: inline-block !important;
margin-right: 2.5%; margin-right: 2.5%;
float: left;
} }
#startDateLabel { #startDateLabel {
@ -60,48 +74,64 @@ body {
} }
#endDate { #endDate {
width: 32.5%; /*width: 32.5%;
*/
display: inline-block !important; display: inline-block !important;
margin-left: 2.5%;
margin-right: 2.5%; margin-right: 2.5%;
float: left; float: left;
} }
#endDateLabel { #endDateLabel {
display: inline-block; display: inline-block;
left: 37.5%; left: 0;
/* left: 37.5%;
*/
}
#colDate{
width: 60%;
}
#colTime{
width: 40%;
} }
#startTime { #startTime {
width: 12.5%; /* width: 12.5%;
display: inline-block !important; */
/* display: inline-block !important;*/
margin-right: 2.5%; margin-right: 2.5%;
float: left; float: left;
justify-content: center;
display: grid;
} }
#startTimeLabel { #startTimeLabel {
display: inline-block; display: inline-block;
left: 72.5%; left: 0;
/*left: 72.5%;
*/
} }
#endTime { #endTime {
width: 12.5%; /*width: 12.5%;
display: inline-block !important; */ display: inline-block !important;
float: left; float: left;
} }
#endTimeLabel { #endTimeLabel {
display: inline-block; display: inline-block;
left: 87.5%; left: 0;
/* left: 87.5%;*/
} }
#description { #description {
background-color: rgb(18, 18, 18); color: #F2E6D8;
color: rgba(255, 255, 255, .55);
border-radius: 15px; border-radius: 15px;
border: double; border: double;
width:400px; width: 100%;
height: 250px; height: 250px;
} }
@ -110,10 +140,29 @@ body {
} }
#indsend { #indsend {
/* background-color: #121B26;
border-radius: 15px; border-radius: 15px;
color: rgba(255, 255, 255, .55); color: #F2E6D8;
background-color: rgb(18, 18, 18); border: double;*/
border: double; border: 0;
background: none;
display: block;
margin: 20px auto;
text-align: center;
border: 2px solid rgb(52, 152, 219);
padding: 10px 10px;
outline: none;
color: #F2E6D8;
border-radius: 24px;
transition: 0.25s;
width: 50%;
}
#indsend:hover {
color: #BF7D65;
}
#row{
width:100%;
} }
/*Create Game Jam end*/ /*Create Game Jam end*/
@ -153,14 +202,16 @@ body {
display: block; display: block;
transition: 0.2s; transition: 0.2s;
font-size: 1rem; font-size: 1rem;
color: #9b9b9b; color: #F2E6D8;
} }
.FormFieldInput:focus { .FormFieldInput:focus {
padding-bottom: 6px; padding-bottom: 6px;
font-weight: 700; font-weight: 700;
border-width: 3px; border-width: 3px;
border-image: linear-gradient(to right, #11998e, #38ef7d); border-image: linear-gradient(to right, #59142D, #FF142D);
/*linear-gradient(to right, #11998e, #38ef7d);*/
border-image-slice: 1; border-image-slice: 1;
} }
.FormFieldInput:focus ~ .FormFieldLabel { .FormFieldInput:focus ~ .FormFieldLabel {
@ -169,7 +220,7 @@ body {
display: block; display: block;
transition: 0.2s; transition: 0.2s;
font-size: 1rem; font-size: 1rem;
color: #11998e; color: #BF7D65;
font-weight: 700; font-weight: 700;
} }

View File

@ -832,6 +832,9 @@ image_gruppenavn {
.right_text { .right_text {
float: right; float: right;
} }
.Collapsible:hover {
color: #BF7D65;
}
#hjem { #hjem {
padding-top: 0; padding-top: 0;
@ -865,6 +868,7 @@ image_gruppenavn {
rgb(18, 18, 18)*/ rgb(18, 18, 18)*/
opacity: 1; opacity: 1;
} }
/*Knap Return to top*/
#return-to-top { #return-to-top {
position: fixed; position: fixed;
bottom: 20px; bottom: 20px;
@ -906,7 +910,7 @@ image_gruppenavn {
color: rgba(255, 255, 255, 0.55); color: rgba(255, 255, 255, 0.55);
top: 5px; top: 5px;
} }
/*
.Collapse-Button { .Collapse-Button {
width: 30%; width: 30%;
text-align: center; text-align: center;
@ -920,7 +924,7 @@ image_gruppenavn {
.Collapse-Button:hover { .Collapse-Button:hover {
border-color: #721b1a; border-color: #721b1a;
} }*/
ul.Circle-list { ul.Circle-list {
display: inline-block; display: inline-block;

View File

@ -1,7 +1,7 @@
body, body,
html { html {
background-color: rgb(18, 18, 18) !important; background-color: #121B26 !important;
color: rgba(255, 255, 255, .55) !important; color: #F2E6D8 !important;
font-family: Arial, Helvetica, sans-serif !important; font-family: Arial, Helvetica, sans-serif !important;
margin: 40px !important; margin: 40px !important;
padding: 10px !important; padding: 10px !important;
@ -19,14 +19,14 @@ html {
#isWebBased { #isWebBased {
border: 0; border: 0;
background: none; background-color: transparent;
display: block; display: block;
margin: 20px auto; margin: 20px auto;
text-align: center; text-align: center;
border: 2px solid rgb(52, 152, 219); border: 2px solid #2A558C;
padding: 10px 10px; padding: 10px 10px;
outline: none; outline: none;
color: rgba(255, 255, 255, .55); color: #F2E6D8;
border-radius: 24px; border-radius: 24px;
transition: 0.25s; transition: 0.25s;
position: static; position: static;
@ -37,14 +37,14 @@ html {
#gameFil { #gameFil {
border: 0; border: 0;
background: none; background-color: transparent;
display: block; display: block;
margin: 20px auto; margin: 20px auto;
text-align: center; text-align: center;
border: 2px solid rgb(52, 152, 219); border: 2px solid #2A558C;
padding: 10px 10px; padding: 10px 10px;
outline: none; outline: none;
color: rgba(255, 255, 255, .55); color: #F2E6D8;
border-radius: 24px; border-radius: 24px;
transition: 0.25s; transition: 0.25s;
position: static; position: static;
@ -81,7 +81,7 @@ html {
display: block; display: block;
border: none; border: none;
height: 3px !important; height: 3px !important;
background: rgb(0, 113, 185) !important; background: #59142D !important;
background: linear-gradient(to right, rgb(18, 18, 18), rgb(0, 113, 185), rgb(38, 171, 255), rgb(0, 113, 185), rgb(18, 18, 18)) !important; background: linear-gradient( to right, #121B26, #59142D, #94153d, #59142D, #121B26) !important;
opacity: 1; opacity: 1;
} }