diff --git a/Love_Live!_Logo.png b/Love_Live!_Logo.png deleted file mode 100644 index a7704e2..0000000 Binary files a/Love_Live!_Logo.png and /dev/null differ diff --git a/out/DIRECTORY_LISTING b/out/DIRECTORY_LISTING index 28dac3c..a009e37 100644 --- a/out/DIRECTORY_LISTING +++ b/out/DIRECTORY_LISTING @@ -17,14 +17,14 @@
-

Directory Listing for /

📁.. (Previous Directory)
📁articles 2022-07-15T17:56:25.52538Z gitpod 190
-
🗎codeBackground 2022-07-15T17:56:25.43738Z gitpod 2635
-
🗎otherpage.html 2022-07-15T17:56:25.50538Z gitpod 9008
-
🗎reset.css 2022-07-15T17:56:25.44138Z gitpod 1093
-
🗎sig.css 2022-07-15T17:56:25.45338Z gitpod 5175
-
🗎testfile.html 2022-07-15T17:56:25.50538Z gitpod 2011
-
🗎uploadform.html 2022-07-15T17:56:25.50538Z gitpod 884
-
🗎Love_Live!_Logo.png 2022-07-15T17:56:25.48938Z gitpod 21910
+

Directory Listing for /

📁.. (Previous Directory)
📁articles 2022-07-15T18:59:03.514236Z gitpod 4096
+
🗎codeBackground 2022-07-15T18:59:03.438236Z gitpod 2635
+
🗎otherpage.html 2022-07-15T18:59:03.482236Z gitpod 9616
+
🗎reset.css 2022-07-15T18:59:03.446236Z gitpod 1093
+
🗎sig.css 2022-07-15T18:59:03.454236Z gitpod 5854
+
🗎testfile.html 2022-07-15T18:59:03.486236Z gitpod 2011
+
🗎uploadform.html 2022-07-15T18:59:03.486236Z gitpod 884
+
🗎Love_Live!_Logo.png 2022-07-15T18:07:02.252848Z gitpod 12167
diff --git a/out/Love_Live!_Logo.png b/out/Love_Live!_Logo.png index baf5f79..4cd1d5c 100644 Binary files a/out/Love_Live!_Logo.png and b/out/Love_Live!_Logo.png differ diff --git a/out/articles/DIRECTORY_LISTING b/out/articles/DIRECTORY_LISTING index 469a311..3aeace1 100644 --- a/out/articles/DIRECTORY_LISTING +++ b/out/articles/DIRECTORY_LISTING @@ -17,11 +17,13 @@
-

Directory Listing for /articles/

📁.. (Previous Directory)
🗎curabitur vel tempus ex.article 2022-07-15T17:56:25.40138Z gitpod 579
-
🗎sigplace1.article 2022-07-15T17:56:25.42538Z gitpod 3923
-
📁test articles 2022-07-15T17:56:25.51738Z gitpod 147
-
🗎curabitur vel tempus ex.article.html 2022-07-15T17:56:25.50938Z gitpod 1296
-
🗎sigplace1.article.html 2022-07-15T17:56:25.51338Z gitpod 4640
+

Directory Listing for /articles/

📁.. (Previous Directory)
🗎curabitur vel tempus ex.article 2022-07-15T18:59:03.402236Z gitpod 579
+
🗎sigplace1.article 2022-07-15T18:59:03.426236Z gitpod 4531
+
📁test articles 2022-07-15T18:59:03.498236Z gitpod 147
+
🗎Love Live! Custom Arcade Controller.article 2022-07-15T18:59:03.434236Z gitpod 480
+
🗎curabitur vel tempus ex.article.html 2022-07-15T18:59:03.490236Z gitpod 1296
+
🗎sigplace1.article.html 2022-07-15T18:59:03.494236Z gitpod 5248
+
🗎Love Live! Custom Arcade Controller.article.html 2022-07-15T18:59:03.502236Z gitpod 1197
diff --git a/out/articles/Love Live! Custom Arcade Controller.article b/out/articles/Love Live! Custom Arcade Controller.article new file mode 100644 index 0000000..003aa56 --- /dev/null +++ b/out/articles/Love Live! Custom Arcade Controller.article @@ -0,0 +1,5 @@ +

My Love Live! Custom Arcade Controller

+
+

For over a year since I first got into Love Live! School Idol Festival ~after school ACTIVITY~ Wai-Wai!Home Meeting!! Try saying that one 10 times fast!Subscript

+
+
15 July 2022 1:53PM
%CONDITIONAL_EXPAND%
diff --git a/out/articles/Love Live! Custom Arcade Controller.article.html b/out/articles/Love Live! Custom Arcade Controller.article.html new file mode 100644 index 0000000..e7fabfe --- /dev/null +++ b/out/articles/Love Live! Custom Arcade Controller.article.html @@ -0,0 +1,33 @@ + + + + + + + + + +
+

My Love Live! Custom Arcade Controller

+
+

For over a year since I first got into Love Live! School Idol Festival ~after school ACTIVITY~ Wai-Wai!Home Meeting!! Try saying that one 10 times fast!Subscript

+
+
15 July 2022 1:53PM
+ +
+
+
+ + + diff --git a/out/articles/sigplace1.article b/out/articles/sigplace1.article index bd07452..b0adf6a 100644 --- a/out/articles/sigplace1.article +++ b/out/articles/sigplace1.article @@ -12,5 +12,6 @@

Vestibulum laoreet lorem consequat, mollis augue finibus, luctus libero. Praesent convallis sed velit vitae molestie. Vestibulum nec fringilla tellus, non dictum nulla. Donec tempor ac diam sit amet porta. Quisque mi ex, vulputate ac tincidunt vel, vestibulum vitae orci. Duis gravida mauris eget mauris pulvinar, lobortis tincidunt neque efficitur. Nunc blandit metus vitae faucibus vulputate. Curabitur rhoncus volutpat lorem, sit amet pulvinar ipsum. Fusce ultricies enim odio, a viverra quam tincidunt quis. Aliquam sollicitudin a sapien id efficitur. Proin at finibus elit, id gravida elit. Nulla facilisi. Ut tincidunt, ligula eu pulvinar dapibus, lorem nisl facilisis tellus, in ornare quam dolor quis libero. Pellentesque ut convallis orci. Donec volutpat nunc velit, tristique convallis purus lacinia sit amet. Maecenas porttitor cursus nisl sed porta.


-
Hello there!
+
Hello there! You can see this is the Love Live logo indeed! It is quite smol right now but that's okay. Let's keep on going with the text. If the caption is really long and with commas, they will now be combined,,,,,see how that works? Amazing!
+

Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.

3 May 2022 10:25AM
%CONDITIONAL_EXPAND% diff --git a/out/articles/sigplace1.article.html b/out/articles/sigplace1.article.html index a02ae23..3d969f7 100644 --- a/out/articles/sigplace1.article.html +++ b/out/articles/sigplace1.article.html @@ -31,7 +31,8 @@

Vestibulum laoreet lorem consequat, mollis augue finibus, luctus libero. Praesent convallis sed velit vitae molestie. Vestibulum nec fringilla tellus, non dictum nulla. Donec tempor ac diam sit amet porta. Quisque mi ex, vulputate ac tincidunt vel, vestibulum vitae orci. Duis gravida mauris eget mauris pulvinar, lobortis tincidunt neque efficitur. Nunc blandit metus vitae faucibus vulputate. Curabitur rhoncus volutpat lorem, sit amet pulvinar ipsum. Fusce ultricies enim odio, a viverra quam tincidunt quis. Aliquam sollicitudin a sapien id efficitur. Proin at finibus elit, id gravida elit. Nulla facilisi. Ut tincidunt, ligula eu pulvinar dapibus, lorem nisl facilisis tellus, in ornare quam dolor quis libero. Pellentesque ut convallis orci. Donec volutpat nunc velit, tristique convallis purus lacinia sit amet. Maecenas porttitor cursus nisl sed porta.


-
Hello there!
+
Hello there! You can see this is the Love Live logo indeed! It is quite smol right now but that's okay. Let's keep on going with the text. If the caption is really long and with commas, they will now be combined,,,,,see how that works? Amazing!
+

Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.

3 May 2022 10:25AM
diff --git a/out/articles/test articles/DIRECTORY_LISTING b/out/articles/test articles/DIRECTORY_LISTING index 15889a5..d2d053f 100644 --- a/out/articles/test articles/DIRECTORY_LISTING +++ b/out/articles/test articles/DIRECTORY_LISTING @@ -17,12 +17,12 @@
-

Directory Listing for /articles/test articles/

📁.. (Previous Directory)
🗎test1.article 2022-07-15T17:56:25.42538Z gitpod 1068
-
🗎test2.article 2022-07-15T17:56:25.42938Z gitpod 764
-
🗎test3.article 2022-07-15T17:56:25.42938Z gitpod 977
-
🗎test1.article.html 2022-07-15T17:56:25.51338Z gitpod 1785
-
🗎test2.article.html 2022-07-15T17:56:25.51338Z gitpod 1481
-
🗎test3.article.html 2022-07-15T17:56:25.51738Z gitpod 1694
+

Directory Listing for /articles/test articles/

📁.. (Previous Directory)
🗎test1.article 2022-07-15T18:59:03.430236Z gitpod 1068
+
🗎test2.article 2022-07-15T18:59:03.430236Z gitpod 764
+
🗎test3.article 2022-07-15T18:59:03.434236Z gitpod 977
+
🗎test1.article.html 2022-07-15T18:59:03.494236Z gitpod 1785
+
🗎test2.article.html 2022-07-15T18:59:03.498236Z gitpod 1481
+
🗎test3.article.html 2022-07-15T18:59:03.498236Z gitpod 1694
diff --git a/out/otherpage.html b/out/otherpage.html index febe13f..2c4b04c 100644 --- a/out/otherpage.html +++ b/out/otherpage.html @@ -40,20 +40,21 @@ This is a different webpage.

Vestibulum laoreet lorem consequat, mollis augue finibus, luctus libero. Praesent convallis sed velit vitae molestie. Vestibulum nec fringilla tellus, non dictum nulla. Donec tempor ac diam sit amet porta. Quisque mi ex, vulputate ac tincidunt vel, vestibulum vitae orci. Duis gravida mauris eget mauris pulvinar, lobortis tincidunt neque efficitur. Nunc blandit metus vitae faucibus vulputate. Curabitur rhoncus volutpat lorem, sit amet pulvinar ipsum. Fusce ultricies enim odio, a viverra quam tincidunt quis. Aliquam sollicitudin a sapien id efficitur. Proin at finibus elit, id gravida elit. Nulla facilisi. Ut tincidunt, ligula eu pulvinar dapibus, lorem nisl facilisis tellus, in ornare quam dolor quis libero. Pellentesque ut convallis orci. Donec volutpat nunc velit, tristique convallis purus lacinia sit amet. Maecenas porttitor cursus nisl sed porta.


-
Hello there!
+
Hello there! You can see this is the Love Live logo indeed! It is quite smol right now but that's okay. Let's keep on going with the text. If the caption is really long and with commas, they will now be combined,,,,,see how that works? Amazing!
+

Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.

3 May 2022 10:25AM




⤈ Click to expand.

A Test Title

In dolor erat, malesuada at elit cursus, convallis imperdiet turpis. Ut aliquet magna tellus, at viverra mauris ullamcorper vehicula. Nam quis urna semper magna ornare elementum sed id mauris. Suspendisse faucibus nunc ante, ac rhoncus nisl tristique sed. Vestibulum pretium odio eget scelerisque vestibulum. Aliquam viverra ex ac vestibulum interdum. Donec ligula nunc, dignissim a purus vitae, fermentum laoreet diam. Quisque nec auctor urna. Vestibulum sit amet ligula ullamcorper, congue ipsum et, accumsan ante. Phasellus fermentum, sapien nec pulvinar blandit, elit purus pretium urna, et dapibus orci urna eu metus. Nunc molestie dictum pharetra. Suspendisse luctus felis et ante tristique, vitae commodo diam porttitor. Aliquam orci eros, placerat ac justo vitae, bibendum efficitur metus. Phasellus eget bibendum mauris.

-
2 May 2022 10:16AM




⤈ Click to expand.
+
2 May 2022 10:16AM




⤈ Click to expand.

Another test title

Sed lobortis nisi id nunc tincidunt volutpat. Mauris cursus felis quis condimentum posuere. Pellentesque vitae dolor et justo suscipit ultrices. Integer dapibus leo id felis varius, ut volutpat massa bibendum. Quisque sed nunc arcu. In sit amet faucibus magna, non venenatis massa. Cras sed placerat risus, id consectetur est. Pellentesque in nunc dolor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Quisque eget lorem ac urna posuere accumsan. Quisque sed imperdiet nisi.

-
1 May 2022 05:13AM




⤈ Click to expand.
+
1 May 2022 05:13AM




⤈ Click to expand.

And More

Curabitur suscipit quam tellus, non rhoncus diam vehicula in. Aliquam ut dapibus tortor. Cras accumsan arcu vel ante maximus ornare. Nam tempus fermentum leo maximus euismod. Donec vehicula pretium est a ultrices. Nunc blandit nibh lorem, nec blandit leo posuere quis. Sed mauris ligula, euismod eu aliquam vel, rhoncus eget magna. Proin eget tortor ut ligula suscipit mattis. Integer rutrum aliquet eleifend. Suspendisse leo libero, placerat nec mi id, sagittis malesuada felis. Quisque euismod ante cursus elit lobortis, eu tempus ligula condimentum. Mauris viverra metus et dignissim efficitur. Ut placerat nunc nunc, eu tempus neque ultrices nec. Suspendisse et magna risus. Phasellus in ullamcorper tortor. Sed lobortis ut mi in blandit.

-
30 Apr 2022 6:14PM




⤈ Click to expand.
+
30 Apr 2022 6:14PM




⤈ Click to expand.

Curabitur vel tempus ex

Curabitur vel tempus ex. Duis cursus sapien nisl, ut pulvinar dui porttitor ut. Nullam odio purus, tristique non turpis sit amet, malesuada ultricies purus. Mauris ut nulla nisl. Aenean sit amet est egestas justo volutpat consequat. Suspendisse in sagittis augue, et mattis tortor. Nullam viverra metus et nibh fringilla iaculis.

-
29 Apr 2022 7:37PM




⤈ Click to expand.
+
29 Apr 2022 7:37PM




⤈ Click to expand.
diff --git a/out/sig.css b/out/sig.css index ad4c557..1802e4f 100644 --- a/out/sig.css +++ b/out/sig.css @@ -76,13 +76,25 @@ h2{ } body{ - font-family: Garamond, 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; + font-family: 'Trebuchet MS', Garamond, serif, 'Tahoma', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; background-color:#111; } +sub{ + font-size:0.65em; + position:relative; + bottom:-4px; +} + +sup{ + font-size:0.65em; + position:relative; + top:-8px; +} + .contentBody{ backdrop-filter: blur(4px); - color: #AA77FF; + color: #a985e4; font-weight:900; text-shadow: 0.3px 0.3px 3px #666666; z-index:-1; @@ -107,9 +119,10 @@ body{ display: inline-block; font-size:3.25em; margin: 12px 4px 0px 4px; - padding: 12px 32px 0px 32px; + padding: 12px 32px 12px 32px; border-bottom-style: outset; border-radius:32px 32px 0px 0px; + color: #AA77FF; background-color:rgba(255, 255, 255, .06); z-index:0; } @@ -117,7 +130,8 @@ body{ .contentBody .contentWrapper .content{ display: inline-block; min-width:97vw; - font-size:1.25em; + font-size:1.15em; + line-height:1.4; padding: 4px; margin: 0px 4px 0px 4px; background-color: rgba(255, 255, 255, .06); @@ -129,12 +143,25 @@ body{ .contentBody .contentWrapper .expandedContent{ display: inline-block; min-width:97vw; - font-size:1.25em; + font-size:1.15em; + line-height:1.4; padding: 4px; margin: 0px 4px 0px 4px; background-color: rgba(255, 255, 255, .06); z-index:0; } + + .contentBody .contentWrapper figure{ + border: 2px ridge rgb(88, 35, 86); + border-radius:4px; + margin:12px 20px 12px 20px; + } + + .contentBody .contentWrapper figcaption{ + font-size: 0.85em; + font-style: italic; + color:rgb(221, 105, 217); + } .contentBody .contentWrapper .datebar{ font-size:0.75em; diff --git a/sigPlace.java b/sigPlace.java index 17e2793..fe3426d 100644 --- a/sigPlace.java +++ b/sigPlace.java @@ -125,7 +125,11 @@ public class sigPlace { //Format: //:,,, String[] splitter = s.split(Pattern.quote(",")); - s="
"+splitter[3]+"
"; + StringBuilder captionText = new StringBuilder(splitter[3]); + for (int j=4;j
"+captionText.toString()+"
"; } else { //It's regular content, so add paragraphs. s="

"+s+"

"; diff --git a/sigServer.java b/sigServer.java index f6c1cfc..87ab3b0 100644 --- a/sigServer.java +++ b/sigServer.java @@ -204,6 +204,7 @@ public class sigServer { if (contentType!=null&&contentType.equals("text/html")) { clientOutput.write(("
Webpage generated in "+(System.currentTimeMillis()-startTime)+"ms
\r\n").getBytes()); } + System.out.println(contentType); } System.out.println("Sent "+file+" to client "+client+"."); } else { diff --git a/sitefiles/Love_Live!_Logo.png b/sitefiles/Love_Live!_Logo.png index a7704e2..4cd1d5c 100644 Binary files a/sitefiles/Love_Live!_Logo.png and b/sitefiles/Love_Live!_Logo.png differ diff --git a/sitefiles/articles/Love Live! Custom Arcade Controller.article b/sitefiles/articles/Love Live! Custom Arcade Controller.article new file mode 100644 index 0000000..2ae989d --- /dev/null +++ b/sitefiles/articles/Love Live! Custom Arcade Controller.article @@ -0,0 +1,5 @@ +-My Love Live! Custom Arcade Controller + +For over a year since I first got into Love Live! School Idol Festival ~after school ACTIVITY~ Wai-Wai!Home Meeting!! Try saying that one 10 times fast!Subscript + +===15 July 2022 1:53PM \ No newline at end of file diff --git a/sitefiles/articles/sigplace1.article b/sitefiles/articles/sigplace1.article index c670e40..58df9ef 100644 --- a/sitefiles/articles/sigplace1.article +++ b/sitefiles/articles/sigplace1.article @@ -12,5 +12,6 @@ Nunc tortor sem, dapibus mattis varius id, varius eu leo. Phasellus efficitur nu Vestibulum laoreet lorem consequat, mollis augue finibus, luctus libero. Praesent convallis sed velit vitae molestie. Vestibulum nec fringilla tellus, non dictum nulla. Donec tempor ac diam sit amet porta. Quisque mi ex, vulputate ac tincidunt vel, vestibulum vitae orci. Duis gravida mauris eget mauris pulvinar, lobortis tincidunt neque efficitur. Nunc blandit metus vitae faucibus vulputate. Curabitur rhoncus volutpat lorem, sit amet pulvinar ipsum. Fusce ultricies enim odio, a viverra quam tincidunt quis. Aliquam sollicitudin a sapien id efficitur. Proin at finibus elit, id gravida elit. Nulla facilisi. Ut tincidunt, ligula eu pulvinar dapibus, lorem nisl facilisis tellus, in ornare quam dolor quis libero. Pellentesque ut convallis orci. Donec volutpat nunc velit, tristique convallis purus lacinia sit amet. Maecenas porttitor cursus nisl sed porta. -:Love_Live!_Logo.png,50,center,Hello there! +:Love_Live!_Logo.png,left,30,Hello there! You can see this is the Love Live logo indeed! It is quite smol right now but that's okay. Let's keep on going with the text. If the caption is really long and with commas, they will now be combined,,,,,see how that works? Amazing! +Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on. ===3 May 2022 10:25AM \ No newline at end of file diff --git a/sitefiles/sig.css b/sitefiles/sig.css index 72f2617..e5e7ef5 100644 --- a/sitefiles/sig.css +++ b/sitefiles/sig.css @@ -76,13 +76,25 @@ h2{ } body{ - font-family: Garamond, 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; + font-family: 'Trebuchet MS', Garamond, serif, 'Tahoma', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; background-color:$SITE_BACKCOL; } +sub{ + font-size:0.65em; + position:relative; + bottom:-4px; +} + +sup{ + font-size:0.65em; + position:relative; + top:-8px; +} + .contentBody{ backdrop-filter: blur(4px); - color: #AA77FF; + color: #a985e4; font-weight:900; text-shadow: 0.3px 0.3px 3px #666666; z-index:-1; @@ -107,9 +119,10 @@ body{ display: inline-block; font-size:3.25em; margin: 12px 4px 0px 4px; - padding: 12px 32px 0px 32px; + padding: 12px 32px 12px 32px; border-bottom-style: outset; border-radius:32px 32px 0px 0px; + color: #AA77FF; background-color:rgba(255, 255, 255, .06); z-index:0; } @@ -117,7 +130,8 @@ body{ .contentBody .contentWrapper .content{ display: inline-block; min-width:97vw; - font-size:1.25em; + font-size:1.15em; + line-height:1.4; padding: 4px; margin: 0px 4px 0px 4px; background-color: rgba(255, 255, 255, .06); @@ -129,12 +143,25 @@ body{ .contentBody .contentWrapper .expandedContent{ display: inline-block; min-width:97vw; - font-size:1.25em; + font-size:1.15em; + line-height:1.4; padding: 4px; margin: 0px 4px 0px 4px; background-color: rgba(255, 255, 255, .06); z-index:0; } + + .contentBody .contentWrapper figure{ + border: 2px ridge rgb(88, 35, 86); + border-radius:4px; + margin:12px 20px 12px 20px; + } + + .contentBody .contentWrapper figcaption{ + font-size: 0.85em; + font-style: italic; + color:rgb(221, 105, 217); + } .contentBody .contentWrapper .datebar{ font-size:0.75em;