From 43d47fb2aa80d041fa724341955327868f9fcf9d Mon Sep 17 00:00:00 2001 From: Ida Tiegel Date: Fri, 7 May 2021 12:24:07 +0200 Subject: [PATCH] Update --- Frontend/.vs/Frontend/v16/.suo | Bin 37376 -> 43008 bytes Frontend/.vs/VSWorkspaceState.json | 2 +- Frontend/Html/AdminPage.html | 192 +++++++++++++++-------------- Frontend/Styles/AdminPage.css | 175 ++++++++++++++++---------- Frontend/Styles/Index.css | 10 +- Frontend/Styles/ShowCase.css | 20 +-- 6 files changed, 231 insertions(+), 168 deletions(-) diff --git a/Frontend/.vs/Frontend/v16/.suo b/Frontend/.vs/Frontend/v16/.suo index 086b68c51e78ab45003694302144cf2494be3564..e43b793a811f293bf803642bd018e456a4c86a96 100644 GIT binary patch delta 7047 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 `s|1n!kw3 zu{!rZT{PqVMRUTU(XM$Qt>l%t4_2>4+g*3>k8j(2(_>BlvN(gEHJ#}GQL^WZ-Rj&v zK)a_t@M*9IbaKypEV&WE%!|-=5g$mA-kWIF8eMN!N0&(dw1iPtNf_0XW%N4cbp?bP zzyQ{&Ac2LL6RgAwPL*GZXo>ZrlnhnS?J1aAbhi;i!L23KK1bB4Wk$itdfD%!^pwkV%g))eJWGF_6wM zBfmheB}-p4V&0`qJY>kkubG7pCDLD?iBDtUN#)Ew59)N_nwWT%e^vZz`nKSole9q- ze9s~1TgDY9b{-Qd*qcCRw4#5yH|G+x9P zU|G(G{NK7tl{8dMn@9J~R%G2d zNQtx0d*?dvp&ps~VkC8(e=GNJzq|LJva3Cg-d>eJ1>4>l zcC;PGsmTd4&rKzgaWm(irQMM(qlyu#cvZbqMxAA> z#)%bCi&%@;gsPUQfL_yxlWci1Eppw4lvOt`e<^1qu85#(m~;d=LW7{g(kN2+RS(I? zKpGB3wgRbJ;g=vKN5~qV?T9>OJrilJ%-6^D7gA9W_hK>fs}X{%v{0(hGNcs>PaD@D zzfN|9+E#~?^@w_e72!c_Kr|pWA{39kDe8EB4CmtrNYM>y$gKG(e;S1D(# zh#w(n5$@@-_@Bim`XrO_EoCx;^cTcW`L8e9cMW0oG3Yl$#11vg8hmg|$b>+08v7{p zCwqDF17$4bIcBRD*;y8UaEM=iXO&yaQiv#2N(E7HigYkk^%hT+L77b}&|B@-O0}U^ zB)E?bM8!u#5QJjHCu3x|ywc$Wvwz#NHO?|edHHZdu)8nBv|*I?Ghrqc&CXyUqtFG{ zbILE8D_OM^gBpt!D$RQ6vj$8?(@Gn4!Mq8HI=Mv zpu?|asYdV%k_0K$zd1JNNMuFFrcbF-FZpcMbPrD{OsOq@Io&TctiPsv!L7o^mC>rE zRzQmw%V}hfA!uAIb+dAFEAwiZ6)2%rM2c9!bU2=YkBp64)`mQFANdbb@#xftsDDY4 z4@r`MGyHyhdlj++Di}&@;E z{btJ}N8dABK6tjMxA9EBJK>(J`Qw70r!4FAy+?FRtszK8Il7~kT+~tweFjEq5asS=eq6-^^W*n>Bm3hqV0Ov)m;#)>x!y$ zMfhpzsu~8SS|`|XI5M;q_OzC=lM+Wkh+! z#jfd3Ilcm-eSY+7l>u{$rTn6?zfOutBK)L3@E{(Rcswxshlihbx;)M`U#V~wH*6?( zLa;v%lUxVKM)JRKEL9jwnA%~|NcBZ65^m%OTvs2|Mhd~#W@Zzl{D};0dpHGj{KnuD zp*}o~18)0sF*A7f6HeKx{Q~y=OTI0_S&YEj2bT<}7=}uM$M-~=)L0_hG$~sY{a%RD6L-O)-Yhsu|r*c6lw;R>*(fnAUqRF<-D(< zKFmP&$Zte@^ndt|vFs5iYutkt#s?s8js*@|S?i6s3~4)pUK@0u#kJvJNtz1H1oq_} zu%gpPg$=(t@B^41OUHRV9C)%)yA_{HPchvL3r9xR8F#!*uA%2e7t@DS3kSzaV7jLO z-q~x4MLVM`Ylhdpbril<8vu3fZt#pwLU_y}_C#YR$EvuP=j(5>>@#qo&;oTQnqkYh z0sqwm=L@rxc?!%{Skb}csV_ J8O$a2e*z2HV=4du diff --git a/Frontend/.vs/VSWorkspaceState.json b/Frontend/.vs/VSWorkspaceState.json index 1f88e30..85b8072 100644 --- a/Frontend/.vs/VSWorkspaceState.json +++ b/Frontend/.vs/VSWorkspaceState.json @@ -6,6 +6,6 @@ "\\Javascript", "\\Styles" ], - "SelectedNode": "\\Styles\\AdminPage.css", + "SelectedNode": "\\Javascript\\Stem.js", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/Frontend/Html/AdminPage.html b/Frontend/Html/AdminPage.html index ecb9c74..153f17f 100755 --- a/Frontend/Html/AdminPage.html +++ b/Frontend/Html/AdminPage.html @@ -75,104 +75,112 @@

Administration

Opret Game Jam
-
-
-
- - -
+
+ +
+
-
-
- - +
+ + +
+
+
- - -
+
+ +
+
+ + +
+
+
+
+ + +
+
-
- - +
- - -
-
+
-
- - -
-
- - -
- - +
+
+ + +
+
+ +
+
+ + +
+
+
+ + +
+ + +
+ +
+ + +
+ +
diff --git a/Frontend/Styles/AdminPage.css b/Frontend/Styles/AdminPage.css index b8ec265..2e518f1 100755 --- a/Frontend/Styles/AdminPage.css +++ b/Frontend/Styles/AdminPage.css @@ -1,25 +1,30 @@ body { text-align: center; + background-color: #121B26; + color: #F2E6D8; } .HeaderPanel { position: fixed; overflow: hidden; - background-color: rgb(33, 37, 41); + background-color: #59142D; padding: 10px 10px; top: 0; width: 100%; } -.HeaderPanel a { - text-align: center; - color: rgba(255, 255, 255, .75); - padding: 6px; - text-decoration: none; - font-size: 18px; - line-height: 25px; - border-radius: 4px; -} + .HeaderPanel a { + text-align: center; + color: #F2E6D8; + padding: 6px; + text-decoration: none; + font-size: 18px; + line-height: 25px; + border-radius: 4px; + } + .HeaderPanel a:hover { + color: #BF7D65; + } .HeaderTitle { text-align: center; @@ -32,10 +37,19 @@ body { float: left; } +h5{ + padding-bottom: 30px; +} + /*Create game jam*/ -#createGameJam{ - justify-content: center; - display: grid; + +.container{ + height: 70vh !important; +} +#createGameJam { + /*justify-content: center;*/ + display: grid; + width: 90%; } #createGameJam input{ @@ -48,10 +62,10 @@ body { } #startDate { - width: 32.5%; + /*width: 32.5%;*/ display: inline-block !important; margin-right: 2.5%; - float: left; + } #startDateLabel { @@ -60,49 +74,65 @@ body { } #endDate { - width: 32.5%; + /*width: 32.5%; + */ display: inline-block !important; - margin-left: 2.5%; margin-right: 2.5%; float: left; } #endDateLabel { display: inline-block; - left: 37.5%; + left: 0; + /* left: 37.5%; + */ +} +#colDate{ + width: 60%; +} + +#colTime{ + width: 40%; } #startTime { - width: 12.5%; - display: inline-block !important; + /* width: 12.5%; + */ + /* display: inline-block !important;*/ margin-right: 2.5%; float: left; + justify-content: center; + display: grid; } #startTimeLabel { display: inline-block; - left: 72.5%; + left: 0; + + /*left: 72.5%; + */ + } #endTime { - width: 12.5%; - display: inline-block !important; + /*width: 12.5%; + */ display: inline-block !important; float: left; } #endTimeLabel { display: inline-block; - left: 87.5%; + left: 0; + /* left: 87.5%;*/ } - + #description { - background-color: rgb(18, 18, 18); - color: rgba(255, 255, 255, .55); + color: #F2E6D8; border-radius: 15px; border: double; - width:400px; - height:250px; + width: 100%; + height: 250px; } #Beskrivelse { @@ -110,11 +140,30 @@ body { } #indsend { + /* background-color: #121B26; border-radius: 15px; - color: rgba(255, 255, 255, .55); - background-color: rgb(18, 18, 18); - border: double; + color: #F2E6D8; + 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*/ @@ -125,16 +174,16 @@ body { } .FormFieldInput { - font-family: inherit; - width: 100%; - border: 0; - border-bottom: 2px solid #9b9b9b; - outline: 0; - font-size: 1.3rem; - color: #fff; - padding: 7px 0; - background: transparent; - transition: border-color 0.2s; + font-family: inherit; + width: 100%; + border: 0; + border-bottom: 2px solid #9b9b9b; + outline: 0; + font-size: 1.3rem; + color: #fff; + padding: 7px 0; + background: transparent; + transition: border-color 0.2s; } .FormFieldInput::placeholder { @@ -148,30 +197,32 @@ body { } .FormFieldLabel { - position: absolute; - top: 0; - display: block; - transition: 0.2s; - font-size: 1rem; - color: #9b9b9b; + position: absolute; + top: 0; + display: block; + transition: 0.2s; + font-size: 1rem; + color: #F2E6D8; + } .FormFieldInput:focus { - padding-bottom: 6px; - font-weight: 700; - border-width: 3px; - border-image: linear-gradient(to right, #11998e, #38ef7d); - border-image-slice: 1; -} -.FormFieldInput:focus ~ .FormFieldLabel { - position: absolute; - top: 0; - display: block; - transition: 0.2s; - font-size: 1rem; - color: #11998e; - font-weight: 700; + padding-bottom: 6px; + font-weight: 700; + border-width: 3px; + border-image: linear-gradient(to right, #59142D, #FF142D); + /*linear-gradient(to right, #11998e, #38ef7d);*/ + border-image-slice: 1; } + .FormFieldInput:focus ~ .FormFieldLabel { + position: absolute; + top: 0; + display: block; + transition: 0.2s; + font-size: 1rem; + color: #BF7D65; + font-weight: 700; + } .FormFieldInput:required, .FormFieldInput:invalid { diff --git a/Frontend/Styles/Index.css b/Frontend/Styles/Index.css index 60f7206..6d9d5c1 100755 --- a/Frontend/Styles/Index.css +++ b/Frontend/Styles/Index.css @@ -832,9 +832,12 @@ image_gruppenavn { .right_text { float: right; } +.Collapsible:hover { + color: #BF7D65; +} #hjem { - padding-top: 0; + padding-top: 0; } #header { @@ -865,6 +868,7 @@ image_gruppenavn { rgb(18, 18, 18)*/ opacity: 1; } +/*Knap Return to top*/ #return-to-top { position: fixed; bottom: 20px; @@ -906,7 +910,7 @@ image_gruppenavn { color: rgba(255, 255, 255, 0.55); top: 5px; } - +/* .Collapse-Button { width: 30%; text-align: center; @@ -920,7 +924,7 @@ image_gruppenavn { .Collapse-Button:hover { border-color: #721b1a; -} +}*/ ul.Circle-list { display: inline-block; diff --git a/Frontend/Styles/ShowCase.css b/Frontend/Styles/ShowCase.css index a9215bd..6b26d00 100644 --- a/Frontend/Styles/ShowCase.css +++ b/Frontend/Styles/ShowCase.css @@ -1,7 +1,7 @@ body, html { - background-color: rgb(18, 18, 18) !important; - color: rgba(255, 255, 255, .55) !important; + background-color: #121B26 !important; + color: #F2E6D8 !important; font-family: Arial, Helvetica, sans-serif !important; margin: 40px !important; padding: 10px !important; @@ -19,14 +19,14 @@ html { #isWebBased { border: 0; - background: none; + background-color: transparent; display: block; margin: 20px auto; text-align: center; - border: 2px solid rgb(52, 152, 219); + border: 2px solid #2A558C; padding: 10px 10px; outline: none; - color: rgba(255, 255, 255, .55); + color: #F2E6D8; border-radius: 24px; transition: 0.25s; position: static; @@ -37,14 +37,14 @@ html { #gameFil { border: 0; - background: none; + background-color: transparent; display: block; margin: 20px auto; text-align: center; - border: 2px solid rgb(52, 152, 219); + border: 2px solid #2A558C; padding: 10px 10px; outline: none; - color: rgba(255, 255, 255, .55); + color: #F2E6D8; border-radius: 24px; transition: 0.25s; position: static; @@ -81,7 +81,7 @@ html { display: block; border: none; height: 3px !important; - background: rgb(0, 113, 185) !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: #59142D !important; + background: linear-gradient( to right, #121B26, #59142D, #94153d, #59142D, #121B26) !important; opacity: 1; } \ No newline at end of file