style

6 files changed, 27 insertions, 12 deletions

diff --git a/server/src/routes/ui/layout.rs b/server/src/routes/ui/layout.rs
index 1085f84..f333fa1 100644
--- a/server/src/routes/ui/layout.rs
+++ b/server/src/routes/ui/layout.rs
@@ -10,8 +10,8 @@ markup::define! {
             }
             body {
                 nav {
-                    h1 { "Jellything" }
-
+                    h1 { a[href="/"] { "Jellything" } }
+                    a[href="/library"] { "My Library" }
                 }
                 #main { @main }
             }
diff --git a/server/src/routes/ui/node.rs b/server/src/routes/ui/node.rs
index ea23291..64f5e84 100644
--- a/server/src/routes/ui/node.rs
+++ b/server/src/routes/ui/node.rs
@@ -56,5 +56,6 @@ markup::define! {
     ItemPage(item: Arc<Item>) {
         h1 { @item.info.title }
         a[href=&player_uri(&item.lib_path)] { "Watch now" }
+        p { "Lorem ipsum dolor sit amed...." }
     }
 }
diff --git a/server/src/routes/ui/player.rs b/server/src/routes/ui/player.rs
index 69f6e7f..aaed5ee 100644
--- a/server/src/routes/ui/player.rs
+++ b/server/src/routes/ui/player.rs
@@ -69,6 +69,7 @@ pub fn player_conf<'a>(item: Arc<Item>) -> MyResult<HtmlTemplate<markup::DynRend
                     @for (tid, track) in &video_tracks {
                         option[value=tid] { @format!("{track}") }
                     }
+                    option[value=""] { "Disable" }
                 }
                 br;
 
@@ -77,11 +78,13 @@ pub fn player_conf<'a>(item: Arc<Item>) -> MyResult<HtmlTemplate<markup::DynRend
                     @for (tid, track) in &audio_tracks {
                         option[value=tid] { @format!("{track}") }
                     }
+                    option[value=""] { "Disable" }
                 }
                 br;
 
                 label[for="select-s"] { "Subtitles: " }
                 select[name="s", id="select-s"] {
+                    option[value="", selected] { "None" }
                     @for (tid, track) in &sub_tracks {
                         option[value=tid] { @format!("{track}") }
                     }
diff --git a/server/src/routes/ui/style/layout.css b/server/src/routes/ui/style/layout.css
index 2e54b1b..078dd4e 100644
--- a/server/src/routes/ui/style/layout.css
+++ b/server/src/routes/ui/style/layout.css
@@ -7,8 +7,6 @@
     color: rgb(218, 218, 218);
     font-family: "Cantarell", sans-serif;
     font-weight: 500;
-    margin: 0px;
-    padding: 0px;
 }
 
 body {
@@ -29,6 +27,8 @@ nav {
 nav h1 {
     margin: 0px;
     font-size: 1.5em;
+    display: inline;
+    margin-right: 1em;
 }
 
 #main {
diff --git a/server/src/routes/ui/style/mod.rs b/server/src/routes/ui/style/mod.rs
index f3d751b..07e92dd 100644
--- a/server/src/routes/ui/style/mod.rs
+++ b/server/src/routes/ui/style/mod.rs
@@ -8,18 +8,25 @@ use std::{
 
 fn css_bundle() -> String {
     if cfg!(debug_assertions) {
-        read_to_string(
-            PathBuf::from_str(file!())
-                .unwrap()
-                .parent()
+        ["layout.css", "player.css"]
+            .into_iter()
+            .map(|n| {
+                read_to_string(
+                    PathBuf::from_str(file!())
+                        .unwrap()
+                        .parent()
+                        .unwrap()
+                        .join(n),
+                )
                 .unwrap()
-                .join("layout.css"),
-        )
-        .unwrap()
+            })
+            .collect::<Vec<_>>()
+            .join("\n")
     } else {
-        include_str!("layout.css").to_string()
+        concat!(include_str!("layout.css"), include_str!("player.css")).to_string()
     }
 }
+
 fn font_bundle() -> Vec<u8> {
     if cfg!(debug_assertions) {
         let mut woff = Vec::new();
diff --git a/server/src/routes/ui/style/player.css b/server/src/routes/ui/style/player.css
new file mode 100644
index 0000000..d4a14ab
--- /dev/null
+++ b/server/src/routes/ui/style/player.css
@@ -0,0 +1,4 @@
+
+video {
+    width: 100%;
+}