From 95ea7f10233355a5725c4ee2a7980a4428786679 Mon Sep 17 00:00:00 2001 From: octospacc Date: Mon, 16 May 2022 21:16:36 +0200 Subject: [PATCH] CSS tests --- .gitignore | 1 + Assets/Standard.css | 63 +++++++++++++++++++++++++++++++++ Assets/Style.css | 44 ----------------------- Build.py | 66 +++++++---------------------------- Parts/Standard/BottomBox.html | 1 + Parts/Standard/LeftBox.html | 2 ++ Parts/Standard/TopBox.html | 1 + Templates/Standard.html | 2 +- 8 files changed, 81 insertions(+), 99 deletions(-) create mode 100644 .gitignore create mode 100755 Assets/Standard.css delete mode 100755 Assets/Style.css diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..46f5006 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +public/* diff --git a/Assets/Standard.css b/Assets/Standard.css new file mode 100755 index 0000000..05483fe --- /dev/null +++ b/Assets/Standard.css @@ -0,0 +1,63 @@ +:root { + --ScreenBorderPadding: 4px; + --ContentPadding: 8px; +} + +* { + Box-Sizing: Border-Box; +} + +Body { + Margin: 0; + //Padding: var(--ScreenBorderPadding); + Box-Sizing: Border-Box; + Width: 100vw; + Position: Absolute; + Left: Auto; + Right: Auto; +} +#Container { + Box-Sizing: Border-Box; +} + +#TopBox { + Border: 2px Solid Purple; + Padding: var(--ContentPadding); +} +#LeftBox { + Float: Left; + Padding: var(--ContentPadding); + //Border: 2px Solid Purple; + user-select: none; +} +#RightBox { + //Position: Inherit; + //Border: 2px Solid Purple; + //Top: 16px; + //Right: 16px; +// Margin: 0; + Padding: var(--ContentPadding); + Float: Right; + user-select: none; +} +#MainBox { + //Text-Align: Center; + Margin: Auto; + Position: Absolute; + Z-Index: -1; + Left: 0; + Right: 0; + Width: 80%; +} +#BottomBox { + Box-Sizing: Border-Box; + Border: 2px Solid Purple; + Position: Fixed; + Bottom: 0; //var(--ScreenBorderPadding); + //Margin: var(--ScreenBorderPadding); + Left: 0; + Right: 0; + Padding: var(--ContentPadding); + Width: 100vw; + Text-Align: Right; +} diff --git a/Assets/Style.css b/Assets/Style.css deleted file mode 100755 index 8be203f..0000000 --- a/Assets/Style.css +++ /dev/null @@ -1,44 +0,0 @@ -:root { - --ScreenBorderPadding: 4px; -} - -* { - Box-Sizing: Border-Box; -} - -Body { - Margin: 0; - Padding: var(--ScreenBorderPadding); - Box-Sizing: Border-Box; - Width: 100vw; - Height: 100vh; -} -#Container { - Box-Sizing: Border-Box; -} - -#TopBox { - Border: 2px Solid Purple; - Padding: 8px; -} -#LeftBox { - Float: Left; - //Border: 2px Solid Purple; -} -#RightBox { - Position: Inherit; - Top: 16px; - Right: 16px; - Float: Right; -} -#MainBox { - Text-Align: Center; - Margin: Auto; -} -#BottomBox { - Box-Sizing: Border-Box; - //Border: 2px Solid Purple; - Position: Fixed; - Bottom: var(--ScreenBorderPadding); - Width: 100vw; -} diff --git a/Build.py b/Build.py index 394fb79..1e342fd 100755 --- a/Build.py +++ b/Build.py @@ -26,46 +26,14 @@ def ResetPublic(): shutil.rmtree('public') except FileNotFoundError: pass -# os.mkdir('public') - -def GetTitles(c): - Titles = [] - - return Titles def FormatTitles(Titles): - return '' - -""" -def GetAssociations(): - f = ReadFile('Associations.txt') - Templates = f.splitlines() - Uses = {} - for t in Templates: - t = t.split(' ') - Uses.update({t[0][:-1]: t[1:]}) - print(Uses) - return Uses - -def LoadTemplates(): - Templates = {} - for p in Path('Templates').rglob('*.html'): - p = str(p)[len('Templates')+1:] - Templates.update({p: ReadFile('Parts/{}'.format(p))}) - return Templates - - Templates = {} - for t in Associations: - Templates.update({t: ReadFile('Templates/{}'.format(t))}) - return Templates - -def LoadParts(): - Parts = {} - for p in Path('Parts').rglob('*.html'): - p = str(p)[len('Parts')+1:] - Parts.update({p: ReadFile('Parts/{}'.format(p))}) - return Parts -""" + HTMLTitles = '' + for t in Titles: + Heading = '- ' * (t.split(' ')[0].count('#')-1) + t = t.lstrip('#') + HTMLTitles += Heading + t + ' \n' + return Markdown().convert(HTMLTitles) def LoadFromDir(Dir): Contents = {} @@ -99,18 +67,12 @@ def PreProcessor(File): Titles += [ls] return Content, Titles, Meta -""" -def MetaProcessor(Meta): - Meta[] - return Meta -""" - def PatchHTML(Template, Parts, Content, Titles, Meta): HTMLTitles = FormatTitles(Titles) - Template = Template.replace('[HTML:Page:Title]', 'Untitled' if not Titles else Titles[0]) + Template = Template.replace('[HTML:Page:Title]', 'Untitled' if not Titles else Titles[0].lstrip('#')) Template = Template.replace('[HTML:Page:Style]', Meta['Style']) - Template = Template.replace('[HTML:Page:RightBox]', str(Titles)) + Template = Template.replace('[HTML:Page:RightBox]', HTMLTitles) Template = Template.replace('[HTML:Page:MainBox]', Content) for p in Parts: @@ -126,8 +88,8 @@ def MakeSite(Templates, Parts): Template = Templates[Meta['Template']] Template = Template.replace( - 'Style.css', - '{}Style.css'.format('../'*File.count('/'))) + '[HTML:Page:CSS]', + '{}{}.css'.format('../'*File.count('/'), Meta['Template'][:-5])) print(Content, Titles, Meta) WriteFile( @@ -143,17 +105,13 @@ def IgnoreFiles(dir, files): return [f for f in files if os.path.isfile(os.path.join(dir, f))] def CopyAssets(): shutil.copytree('Pages', 'public', ignore=IgnoreFiles) -# for File in Path('Assets').rglob('*'): -# File = str(File) -# shutil.copy(File, 'public/{}'.format(File[len('Assets/'):])) os.system("cp -R Assets/* public/") def Main(): os.chdir(os.path.dirname(os.path.abspath(__file__))) ResetPublic() -# Associations = GetAssociations() - Templates = LoadFromDir('Templates') #LoadTemplates(Associations) - Parts = LoadFromDir('Parts') #LoadParts() + Templates = LoadFromDir('Templates') + Parts = LoadFromDir('Parts') print(Templates, Parts) CopyAssets() MakeSite(Templates, Parts) diff --git a/Parts/Standard/BottomBox.html b/Parts/Standard/BottomBox.html index e69de29..e36f7f7 100644 --- a/Parts/Standard/BottomBox.html +++ b/Parts/Standard/BottomBox.html @@ -0,0 +1 @@ +Footer diff --git a/Parts/Standard/LeftBox.html b/Parts/Standard/LeftBox.html index e69de29..9f2d944 100644 --- a/Parts/Standard/LeftBox.html +++ b/Parts/Standard/LeftBox.html @@ -0,0 +1,2 @@ +Home + diff --git a/Parts/Standard/TopBox.html b/Parts/Standard/TopBox.html index e69de29..74fcd1a 100644 --- a/Parts/Standard/TopBox.html +++ b/Parts/Standard/TopBox.html @@ -0,0 +1 @@ +Header diff --git a/Templates/Standard.html b/Templates/Standard.html index efefb4d..ee221d9 100755 --- a/Templates/Standard.html +++ b/Templates/Standard.html @@ -3,7 +3,7 @@ - + [HTML:Page:Title] - postoctt