diff --git a/src/routes/static_files.rs b/src/routes/static_files.rs index 548d010..f020680 100644 --- a/src/routes/static_files.rs +++ b/src/routes/static_files.rs @@ -2,7 +2,7 @@ use rocket::fs::NamedFile; use rocket::response::status::NotFound; use std::path::{Path, PathBuf}; -#[get("/", rank = 3)] +#[get("/static/")] pub async fn static_files(file: PathBuf) -> Result> { NamedFile::open(Path::new("static/").join(file)) .await diff --git a/static/css/index.css b/static/css/index.css index ac97176..2a653d1 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -5,7 +5,7 @@ body { body { height: 95vh; - font-family: monospace; + font-family: 'Fira Code', monospace; display: grid; } @@ -16,11 +16,26 @@ form.highlight { .grid_form { display: grid; - grid-template-columns: 4fr 1fr 1fr; + grid-template-columns: 4fr 1fr; + grid-template-rows: 1fr 20fr; + grid-gap: 2em; height: 100vh; margin-top: 1vh; - align-items: start; - justify-items: center; + align-items: stretch; + justify-items: stretch; +} + +.textareaBox { + grid-column: 1/2; + grid-row: 1/3; +} + +.selectBox { + grid-row: 2/3; +} + +.submitButtonBox { + grid-row: 1/2; } textarea { @@ -34,7 +49,8 @@ textarea { overflow: auto; color: inherit; - font-family: monospace; + font-family: 'Fira Code', monospace; + font-size: inherit; line-height: inherit; } @@ -42,21 +58,39 @@ select { color: inherit; background-color: #0f1419; border: none; - padding: 0 1em 0 0; - margin: 0; - width: 80%; + width: 100%; font-family: inherit; font-size: inherit; cursor: inherit; line-height: inherit; } +option { + padding: 0.3em; + height: 1.2em; +} + +option:focus { + background-color: #E6E1CF; + color: #0f1419; +} + +option:checked { + background-color: #E6E1CF; + color: #0f1419; +} + +option:hover { + background-color: #E6E1CF; + color: #0f1419; +} + button[type="submit"] { background-color: #F29718; + color: #0f1419; border: none; - padding: 0 1em 0 0; - margin: 0; - width: 50%; + height: 100%; + width: 100%; font-family: inherit; font-size: inherit; line-height: inherit; diff --git a/static/android-chrome-192x192.png b/static/media/android-chrome-192x192.png similarity index 100% rename from static/android-chrome-192x192.png rename to static/media/android-chrome-192x192.png diff --git a/static/android-chrome-512x512.png b/static/media/android-chrome-512x512.png similarity index 100% rename from static/android-chrome-512x512.png rename to static/media/android-chrome-512x512.png diff --git a/static/apple-touch-icon.png b/static/media/apple-touch-icon.png similarity index 100% rename from static/apple-touch-icon.png rename to static/media/apple-touch-icon.png diff --git a/static/favicon-16x16.png b/static/media/favicon-16x16.png similarity index 100% rename from static/favicon-16x16.png rename to static/media/favicon-16x16.png diff --git a/static/favicon-32x32.png b/static/media/favicon-32x32.png similarity index 100% rename from static/favicon-32x32.png rename to static/media/favicon-32x32.png diff --git a/static/favicon.ico b/static/media/favicon.ico similarity index 100% rename from static/favicon.ico rename to static/media/favicon.ico diff --git a/templates/base.html.tera b/templates/base.html.tera index e9204f5..68bf292 100644 --- a/templates/base.html.tera +++ b/templates/base.html.tera @@ -1,43 +1,55 @@ - - - - - {{ title }} - + {% block styles %} + {% endblock styles %} - - {% block styles %} - {% endblock styles %} + {% block head %} {% endblock head %} + - {% block head %} {% endblock head %} - + + {% block body %}{% endblock body %} + - - {% block body %}{% endblock body %} - - + \ No newline at end of file diff --git a/templates/index.html.tera b/templates/index.html.tera index 2925a6d..6914214 100644 --- a/templates/index.html.tera +++ b/templates/index.html.tera @@ -1,13 +1,14 @@ {% extends "base" %} {% block styles %} - + {% endblock styles %} {% block body %}
- +
+
+ +
- - - +
+ +
+ +
+
Uploading...
-
Uploading...
- + {% endblock body %} \ No newline at end of file diff --git a/templates/pretty.html.tera b/templates/pretty.html.tera index 188cffc..f3b14b3 100644 --- a/templates/pretty.html.tera +++ b/templates/pretty.html.tera @@ -8,7 +8,7 @@ pre { margin: 0px; - font-family: monospace; + font-family: 'Fira Code', monospace; } {% endblock styles %}