diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 949792d..4dd277f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,13 +18,15 @@ jobs: - name: Build run: | sudo apt update - sudo apt install software-properties-common + sudo apt install -y software-properties-common sudo add-apt-repository ppa:deadsnakes/ppa - sudo apt install python3.10 curl git + sudo apt update + sudo apt install -y npm python3.10 curl git curl -sS https://bootstrap.pypa.io/get-pip.py | sudo python3.10 sudo pip3 install lxml + sudo npm install -g pug-cli git clone --depth 1 https://gitlab.com/octtspacc/staticoso - python3.10 ./staticoso/Source/Build.py + ./Scripts/Deploy.GitHub.sh - name: Deploy uses: JamesIves/github-pages-deploy-action@v4 diff --git a/Assets/Assets/Pages/index.css b/Assets/Assets/Pages/index.css index c934533..eb445dd 100644 --- a/Assets/Assets/Pages/index.css +++ b/Assets/Assets/Pages/index.css @@ -1,3 +1,13 @@ +#RingsDiv Img, +.CCIcons > Img, .CCIcon { + Display: Inline !Important; + Max-Height: 1em !Important; + Vertical-Align: Sub; +} +.CCIcons > Img, .CCIcon { + Margin-Left: 3px; +} + .BlinkA { Animation: BlinkerA 0.25s Step-Start Infinite; } diff --git a/Assets/Assets/WM.css b/Assets/Assets/WM.css index d99f0e1..5584146 100644 --- a/Assets/Assets/WM.css +++ b/Assets/Assets/WM.css @@ -3,7 +3,8 @@ *--------------------------------------------------------*/ :Root { - --WindowPadding: 4px; + --WindowMargin: 4px; + --WindowPadding: 8px; --WindowBorderSize: 4px; --TitleBarHeight: 32px; @@ -28,6 +29,14 @@ Body { .NoDisplay { Display: None; } +.Center { + Text-Align: Center; +} + +Ul { + Padding-Left: 8px; + Padding-Right: 4px; +} /*--------------------------------------------------------*/ @@ -38,16 +47,16 @@ Body { *--------------------------------------------------------*/ .Window { - Margin: Var(--WindowPadding); + Margin: Var(--WindowMargin); Border: Solid Var(--WindowBorderSize) Var(--TitleBarBackground); Color: #000000; Background: #EEE0FF; } .WindowContent { - Min-Width: Calc(100% + Var(--WindowPadding)*2 + Var(--WindowBorderSize)*2); + Min-Width: Calc(100% + Var(--WindowMargin)*2 + Var(--WindowBorderSize)*2); Padding: Calc(Var(--WindowPadding)*2); Overflow-Y: Auto; - Margin-Left: Calc(0px - Var(--WindowPadding) - Var(--WindowBorderSize)); + Margin-Left: Calc(0px - Var(--WindowMargin) - Var(--WindowBorderSize)); Margin-Top: Var(--WindowBorderSize); Color: #000000; Background: #EEE0FF; @@ -58,7 +67,7 @@ Body { } .TitleBar { - Padding: Var(--WindowPadding); + Padding: Var(--WindowMargin); Color: Var(--TitleBarForeground); Background: Var(--TitleBarBackground); Vertical-Align: Top; @@ -81,7 +90,7 @@ Body { Background: Var(--TaskBarBackground); Position: Fixed; Bottom: 0px; - Padding: Var(--WindowPadding); + Padding: Var(--WindowMargin); Min-Height: Var(--TaskBarHeight); Max-Height: Var(--TaskBarHeight); Z-Index: 256; @@ -152,7 +161,7 @@ Body { Z-Index: 16; } #MainWindow .WindowContent { - Max-Height: Calc(90vh - Calc(Var(--TitleBarHeight) * 2) - Var(--WindowPadding)); + Max-Height: Calc(90vh - Calc(Var(--TitleBarHeight) * 2) - Var(--WindowMargin)); } #TitlesWindow { @@ -164,7 +173,11 @@ Body { Z-Index: 8; } #TitlesWindow .WindowContent { - Max-Height: Calc(60vh - Calc(Var(--TitleBarHeight) * 2) - Var(--WindowPadding)); + Max-Height: Calc(60vh - Calc(Var(--TitleBarHeight) * 2) - Var(--WindowMargin)); +} + +#TitlesWindow .WindowContent Ul Li, .TaskBarMenu Ul Li { + List-Style-Type: None !Important; } /*--------------------------------------------------------*/ diff --git a/Assets/Assets/loli-documentatrice.css b/Assets/Assets/loli-documentatrice.css index fba1039..eeb3181 100644 --- a/Assets/Assets/loli-documentatrice.css +++ b/Assets/Assets/loli-documentatrice.css @@ -75,9 +75,6 @@ article #title span, article #title img { margin: 2px 0px 0px 0px; padding: 2px; } -#ContentInfo br { - Display: None; -} /* Article content */ article .e-content { diff --git a/Assets/Assets/sitoctt.css b/Assets/Assets/sitoctt.css index d3e4c80..60cc988 100644 --- a/Assets/Assets/sitoctt.css +++ b/Assets/Assets/sitoctt.css @@ -39,6 +39,8 @@ Body { Color: Transparent !Important; } + + /*--------------------------------------------------------*/ @@ -141,16 +143,6 @@ A:Hover:Not( Margin-Bottom: -4px; } -#RingsDiv Img, -.CCIcons > Img, .CCIcon { - Display: Inline !Important; - Max-Height: 1em !Important; - Vertical-Align: Sub; -} -.CCIcons > Img, .CCIcon { - Margin-Left: 3px; -} - Details > Summary:hover { Font-Size: 15pt; } diff --git a/Scripts/Build.PC.sh b/Scripts/Build.PC.sh index 770724c..4549a62 100755 --- a/Scripts/Build.PC.sh +++ b/Scripts/Build.PC.sh @@ -10,7 +10,7 @@ python3 ../staticoso/Source/Build.py \ # Spacc " #\ - #--GemtextOut=True #\ - #--SitemapOut=True \ + #--DiffBuild="True" \ + #--GemtextOutput=True #\ #--MastodonURL="https://botsin.space" \ #--MastodonToken="$MastodonToken" diff --git a/Scripts/Deploy.GitHub.sh b/Scripts/Deploy.GitHub.sh new file mode 100755 index 0000000..5fe9268 --- /dev/null +++ b/Scripts/Deploy.GitHub.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +python3.10 ./staticoso/Source/Build.py \ + --SiteDomain="https://sitoctt.octt.eu.org" \ + --FolderRoots="{'*':'https://octtspacc.gitlab.io'}" \ + --DynamicParts="{'Head':['Twemoji.html'], 'Footer':['StatCounter.html']}" diff --git a/Scripts/Deploy.GitLab.sh b/Scripts/Deploy.GitLab.sh index 0c3ded1..6129996 100755 --- a/Scripts/Deploy.GitLab.sh +++ b/Scripts/Deploy.GitLab.sh @@ -6,8 +6,7 @@ python3 ./staticoso/Source/Build.py \ --DynamicParts="{'Head':['Twemoji.html'], 'Footer':['StatCounter.html']}" \ --MastodonURL="https://botsin.space" \ --MastodonToken="$MastodonToken" \ - --SitemapOut=True \ - --GemtextOut=True \ + --GemtextOutput=True \ --GemtextHeader="\ # sitoctt Alcune informazioni importanti sono disponibili su: diff --git a/Site.ini b/Site.ini index 0592687..e03ec4b 100644 --- a/Site.ini +++ b/Site.ini @@ -3,7 +3,13 @@ Name = ✨sitoctt✨ BlogName = blogoctt Template = sitoctt.html Lang = it + +[Categories] +Uncategorized = Fritto-Misto + +[Minify] Minify = True +KeepComments = True [Markdown] Exts = ('attr_list', 'def_list', 'footnotes', 'markdown_del_ins', 'md_in_html', 'mdx_subscript', 'mdx_superscript', 'tables')