diff --git a/config.yaml b/config.yaml index 7f2f80d..c064bbd 100644 --- a/config.yaml +++ b/config.yaml @@ -2,7 +2,7 @@ author: Jim Shepich III templates_folder: ./site/templates sites: main: - title: Jimlab + title: Jimsite base_url: http://localhost:8000 web_root: ./dist build_cache: ./site diff --git a/jimsite/common.py b/jimsite/common.py index faea63b..5478169 100644 --- a/jimsite/common.py +++ b/jimsite/common.py @@ -41,6 +41,9 @@ class SiteConfig(pydantic.BaseModel): published: Optional[bool] = True git_repo: Optional[GitRepo] = None assets: Optional[list] = None + + # TODO: implement ignore for assets + ignore_assets: Optional[list] = None articles: Optional[list] = None template_selections: Optional[dict] = {} addons: Optional[list] = None diff --git a/site/assets/css/common.css b/site/assets/css/common.css index 1845eb7..c45a0e2 100644 --- a/site/assets/css/common.css +++ b/site/assets/css/common.css @@ -21,7 +21,7 @@ } */ -@font-face { +/* @font-face { font-family: Beleren; src: url('/assets/fonts/Beleren-Bold.ttf'); } @@ -64,7 +64,7 @@ @font-face { font-family: Floral; src: url('/assets/fonts/FloralCapitals.ttf'); -} +} */ var{ display:none; diff --git a/site/assets/css/layout.css b/site/assets/css/layout.css index 03b3cad..8f7bf20 100644 --- a/site/assets/css/layout.css +++ b/site/assets/css/layout.css @@ -1,7 +1,6 @@ html { height: 100%; box-sizing: border-box; - font-display: swap; } *, @@ -30,7 +29,7 @@ footer { header{ text-align:center; - padding: 1.25rem; + padding: 0.5rem; margin-bottom:/*1%*/0; } diff --git a/site/assets/css/theme.css b/site/assets/css/theme.css index ad3a24a..36ac776 100644 --- a/site/assets/css/theme.css +++ b/site/assets/css/theme.css @@ -3,16 +3,18 @@ body{ background-color: white; background-repeat: no-repeat; background-attachment: fixed; - font-family: Fira; + font-family: 'Fira Sans', sans-serif; + font-display: swap; } header{ background: var(--shading); background-color: var(--azure); color: #D8D8D8; - font-size: 2.1rem; - font-family: Beleren; - /* TODO: Replace Beleren */ + font-size: 2.5rem; + /* font-family: UnifrakturMaguntia, fantasy; */ + font-family: 'Jacquard 12', fantasy; + font-display: swap; } .silver-text, .nav-text{ @@ -27,7 +29,9 @@ header{ nav{ background: var(--silver); font-size: 1.15rem; - font-family: Beleren; + /* font-family: 'Jacquard 12', fantasy; */ + font-family: Fira Sans, sans-serif; + font-display: swap; } main{ @@ -35,7 +39,8 @@ main{ color: black; font-size: 1rem; line-height:normal; - font-family: Fira; + font-family: Fira Sans, sans-serif; + font-display: swap; text-align: justify; } diff --git a/site/assets/fonts/3dlet.ttf b/site/assets/fonts/3dlet.ttf deleted file mode 100644 index 562d958..0000000 Binary files a/site/assets/fonts/3dlet.ttf and /dev/null differ diff --git a/site/assets/fonts/3dlet.txt b/site/assets/fonts/3dlet.txt deleted file mode 100644 index bb328af..0000000 --- a/site/assets/fonts/3dlet.txt +++ /dev/null @@ -1,79 +0,0 @@ -_____________________________ -3D LET Created by Brian Kent -ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ - -Thanks for Downloading 3D LET. - - This Font is based on the 3D N of the Nintendo 64 Logo. The only -problem was that the N64's N is connected to make it look cube-like. -Trying to make the rest of the characters look connected wasn't working -out, so I made all of the characters 'Offset' instead of connected. - ---All of the lower case letters and #'s are 'Outline' charascters. ---All of the Upper case letters and Shift+#'s are 'Solid' characters. ->>>(Shift+# means use !@#$%^&*() for the #'s 1234567890) - - When Printing with this Font, use a large point size (above 24 pt.) - -If you have any questions or comments, you can e-mail me at -aefonts[AT]frontiernet[DOT]net - -You can visit my Homepage <ĈNIGMA GAMES & FONTS> at -http://www.aenigmafonts.com/ - -____________ -!!! NOTE !!! -ŻŻŻŻŻŻŻŻŻŻŻŻ -This font has been updated! I've edited the (BRK) in the font name -to just BRK. It seems that Adobe Illustrator and web pages with CSS -don't like fonts with ( and ) in their name. - -________________ -INSTALLING FONTS -ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ - There's a couple of ways to install Fonts. The 'easy' way to -install fonts is to just Unzip/place the font file [.ttf] into your -Windows\Fonts directory (I always use this method). If you're unable -to do it the 'easy' way, then try to do it this way (for Windows -95/98/NT): - -1] Unzip the Font(s) to a folder (or somewhere, just remember where -you unzipped it) on your Computer. - -2] Next, click on the START button, then select SETTINGS then -CONTROL PANEL. - -3] When the Control Panel Window pops up, Double Click on FONTS. - -4] When the FONTS window pops up, select File then Install New Font... - -5] A Add Fonts window will pop up, just go to the folder that you -unzipped the Font(s) to, select the Font(s) and then click on OK. -Now the Font(s) are installed. - - Now you can use the Font(s) in programs the utilize Fonts. Make -sure that you install the font(s) first, then open up your apps -(so the app will recognize the font). Sometimes you'll have to -wait until you computer 'auto-refreshes' for programs to recognize -fonts (Windows is sometimes slow to do that). You can refresh your -computer quicker by going into Windows Explorer -or- My Computer and -press F5 (or in the menubar select VIEW then REFRESH). - - -__________ -DISCLAIMER -ŻŻŻŻŻŻŻŻŻŻ --The font(s) in this zip file were created by me (Brian Kent). All -of my Fonts are Freeware, you can use them any way you want to -(Personal use, Commercial use, or whatever). - --If you have a Font related site and would like to offer my fonts on -your site, go right ahead. All I ask is that you keep this text file -intact with the Font. - --You may not Sell or Distribute my Fonts for profit or alter the font -file(s) [.ttf .fon] in any way without asking me first. I can be -reached at: -aefonts[AT]frontiernet[DOT]net - -(make sure you replace the [AT] and [DOT] with the proper characters) . diff --git a/site/assets/fonts/Adventure Outline.ttf b/site/assets/fonts/Adventure Outline.ttf deleted file mode 100644 index 1f3d578..0000000 Binary files a/site/assets/fonts/Adventure Outline.ttf and /dev/null differ diff --git a/site/assets/fonts/Adventure.ttf b/site/assets/fonts/Adventure.ttf deleted file mode 100644 index 714c389..0000000 Binary files a/site/assets/fonts/Adventure.ttf and /dev/null differ diff --git a/site/assets/fonts/Beleren-Bold.ttf b/site/assets/fonts/Beleren-Bold.ttf deleted file mode 100644 index 979b66c..0000000 Binary files a/site/assets/fonts/Beleren-Bold.ttf and /dev/null differ diff --git a/site/assets/fonts/Brody Font Regular.otf b/site/assets/fonts/Brody Font Regular.otf deleted file mode 100644 index daf07b6..0000000 Binary files a/site/assets/fonts/Brody Font Regular.otf and /dev/null differ diff --git a/site/assets/fonts/CollegiateBlackFLF.ttf b/site/assets/fonts/CollegiateBlackFLF.ttf deleted file mode 100644 index 0dacb89..0000000 Binary files a/site/assets/fonts/CollegiateBlackFLF.ttf and /dev/null differ diff --git a/site/assets/fonts/CollegiateBorderFLF.ttf b/site/assets/fonts/CollegiateBorderFLF.ttf deleted file mode 100644 index d7a8f57..0000000 Binary files a/site/assets/fonts/CollegiateBorderFLF.ttf and /dev/null differ diff --git a/site/assets/fonts/CollegiateFLF.ttf b/site/assets/fonts/CollegiateFLF.ttf deleted file mode 100644 index 917662c..0000000 Binary files a/site/assets/fonts/CollegiateFLF.ttf and /dev/null differ diff --git a/site/assets/fonts/CollegiateInsideFLF.ttf b/site/assets/fonts/CollegiateInsideFLF.ttf deleted file mode 100644 index c8b7124..0000000 Binary files a/site/assets/fonts/CollegiateInsideFLF.ttf and /dev/null differ diff --git a/site/assets/fonts/CollegiateOutlineFLF.ttf b/site/assets/fonts/CollegiateOutlineFLF.ttf deleted file mode 100644 index 3cd24ca..0000000 Binary files a/site/assets/fonts/CollegiateOutlineFLF.ttf and /dev/null differ diff --git a/site/assets/fonts/EBGaramond.ttf b/site/assets/fonts/EBGaramond.ttf deleted file mode 100644 index 123d5dd..0000000 Binary files a/site/assets/fonts/EBGaramond.ttf and /dev/null differ diff --git a/site/assets/fonts/FiraSans-Regular.ttf b/site/assets/fonts/FiraSans-Regular.ttf deleted file mode 100644 index c4cfa59..0000000 Binary files a/site/assets/fonts/FiraSans-Regular.ttf and /dev/null differ diff --git a/site/assets/fonts/FloralCapitals.ttf b/site/assets/fonts/FloralCapitals.ttf deleted file mode 100644 index 44e0a27..0000000 Binary files a/site/assets/fonts/FloralCapitals.ttf and /dev/null differ diff --git a/site/assets/fonts/MODERNA_.TTF b/site/assets/fonts/MODERNA_.TTF deleted file mode 100644 index 930574e..0000000 Binary files a/site/assets/fonts/MODERNA_.TTF and /dev/null differ diff --git a/site/assets/fonts/Open 24 Display St.ttf b/site/assets/fonts/Open 24 Display St.ttf deleted file mode 100644 index a498eb5..0000000 Binary files a/site/assets/fonts/Open 24 Display St.ttf and /dev/null differ diff --git a/site/assets/fonts/OxygenMono-Regular.ttf b/site/assets/fonts/OxygenMono-Regular.ttf deleted file mode 100644 index 64c165c..0000000 Binary files a/site/assets/fonts/OxygenMono-Regular.ttf and /dev/null differ diff --git a/site/assets/fonts/Playbill.ttf b/site/assets/fonts/Playbill.ttf deleted file mode 100644 index 5a1ef4e..0000000 Binary files a/site/assets/fonts/Playbill.ttf and /dev/null differ diff --git a/site/assets/fonts/PoiretOne-Regular.ttf b/site/assets/fonts/PoiretOne-Regular.ttf deleted file mode 100644 index 2da1bcf..0000000 Binary files a/site/assets/fonts/PoiretOne-Regular.ttf and /dev/null differ diff --git a/site/assets/fonts/StitchWarrior demo.ttf b/site/assets/fonts/StitchWarrior demo.ttf deleted file mode 100644 index f663399..0000000 Binary files a/site/assets/fonts/StitchWarrior demo.ttf and /dev/null differ diff --git a/site/assets/fonts/electrical.ttf b/site/assets/fonts/electrical.ttf deleted file mode 100644 index d21dbb3..0000000 Binary files a/site/assets/fonts/electrical.ttf and /dev/null differ diff --git a/site/templates/partials/default_css.html b/site/templates/partials/default_css.html index 0bc0f4c..c34eeeb 100644 --- a/site/templates/partials/default_css.html +++ b/site/templates/partials/default_css.html @@ -1,4 +1,5 @@ + diff --git a/site/templates/partials/header.html b/site/templates/partials/header.html index 45c5c32..4d6afde 100644 --- a/site/templates/partials/header.html +++ b/site/templates/partials/header.html @@ -1,3 +1,3 @@
- Jimlab + {site.title}
\ No newline at end of file