diff --git a/config.json b/config.json index cb5b3d1..4776014 100644 --- a/config.json +++ b/config.json @@ -25,6 +25,14 @@ "adminKey": "supersecretkey", "testAppIsInternalApp": true, "testAppEnabled": true + }, + "eternity": { + "hostName": "http://localhost:8000", + "gitDir": "./git", + "outputDir": "./output" + }, + "datatracker": { + "hostName": "http://localhost:8000" } } } diff --git a/services-src/auth/resources/static/css/style.css b/services-src/auth/resources/static/css/style.css index 32ef8ec..b08778b 100644 --- a/services-src/auth/resources/static/css/style.css +++ b/services-src/auth/resources/static/css/style.css @@ -1,4 +1,16 @@ -@import url("../fonts/inter.css"); +@font-face { + font-family: 'Figtree'; + src: url("fonts/Figtree.woff2") format("woff2"); + font-style: normal; +} + +html { + background: linear-gradient(to top left, rgb(217, 236, 255), rgb(228, 249, 255), rgb(221, 255, 238), rgb(249,255,253)) no-repeat center center fixed; + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + background-size: cover; +} :root { --invertdm: 0%; @@ -66,17 +78,16 @@ p#statusBox { body { margin: 0; background-color: var(--editor); - font-family: "Inter", sans-serif; + font-family: "Figtree", sans-serif; } /* Sign up/log in div */ .inOutDiv { - border-radius: 8px; + border-radius: 25px; margin: 10%; - padding: 30px; - border: solid 1px var(--border-color); background-color: var(--inOutDiv); + padding: 35px 35px 50px; } table { @@ -87,14 +98,14 @@ input { width: calc(100% - 35px); margin-left: 10px; margin-right: 10px; - height: 30px; + height: 35px; padding-left: 10px; padding-right: 10px; border: solid; border-color: var(--border-color); border-width: 1px; - border-radius: 8px; + border-radius: 5px; min-width: 20px; } @@ -157,9 +168,6 @@ input { .inOutDiv p { font-size: 14px; } - .inOutDiv h2 { - font-size: 21px; - } .background { display: none; } @@ -201,27 +209,24 @@ input { .newOauth, .oauthList, .sessionEntry, .oauthEntry { text-align: center; - width: calc(100% - 17.5vh); margin-top: 7vh; margin-left: 7vh; margin-right: 7vh; padding: 15px 10px 30px; - border-style: solid; border-image: none; - border-radius: 8px; - border-width: 1px; + border-radius: 25px; font-size: 17px; background-color: var(--inOutDiv); - border-color: var(--border-color); } .oauthEntry, .sessionEntry { display: flex; flex-direction: column; justify-content: center; - padding: 5px; + padding: 20px; margin-top: 0; margin-bottom: 20px; + border: 3px dotted var(--border-color); } .oauthEntry button, .sessionEntry button { @@ -287,8 +292,9 @@ button:hover { h2 { display: block; - margin-top: 20px; - font-weight: 300; + margin-top: 10px; + font-weight: 600; + font-size: 22px; } .inOutDiv a { @@ -296,21 +302,6 @@ h2 { text-align: center; } -.background { - position: fixed; - z-index: -2; - top: 0; - width: 100%; - height: 100%; - object-fit: cover; - -webkit-user-drag: none; - user-select: none; - -moz-user-select: none; - -webkit-user-select: none; - -ms-user-select: none; - pointer-events: none; -} - .vAlign { display: flex; flex-direction: column; @@ -356,3 +347,82 @@ h2 { .w900 { font-weight: 900; } + +/* swipe animation */ +.swipe { + pointer-events: none; + position: absolute; + top: 0; + left: 0; + width: 100vw; + height: 100vh; + background-color: #fff; + animation: swipe 0.2s forwards; + display: none; +} + +.swipe-animate { + display: initial; +} + + +/* swipe-out animation */ +.swipe-out { + pointer-events: none; + position: absolute; + top: 0; + left: 0; + width: 100vw; + height: 100vh; + background-color: #fff; +} + +.swipe-out-animate { + animation: swipe-out 0.2s forwards; +} + +@keyframes swipe { + 0% { + transform: translateX(-100%); + } + 100% { + transform: translateX(0); + } +} + +@keyframes swipe-out { + 0% { + transform: translateX(0); + } + 100% { + transform: translateX(100%); + } +} + +@keyframes swipe-reduced { + 0% { + opacity: 0; + } + 100% { + opacity: 1; + } +} + +@keyframes swipe-out-reduced { + 0% { + opacity: 1; + } + 100% { + opacity: 0; + } +} + +@media (prefers-reduced-motion: reduce) { + .swipe { + animation: swipe-reduced 0.5s forwards; + } + + .swipe-out { + animation: swipe-out-reduced 0.5s forwards; + } +} \ No newline at end of file diff --git a/services-src/auth/resources/templates/authorize.html b/services-src/auth/resources/templates/authorize.html index b74dfa6..6f0307a 100644 --- a/services-src/auth/resources/templates/authorize.html +++ b/services-src/auth/resources/templates/authorize.html @@ -12,9 +12,8 @@
-Loading...
Please wait...
Processing information sent...
@@ -18,5 +17,7 @@ + +