From a859c52e9ab72bf3d0d452c436f77bc7939f5ff0 Mon Sep 17 00:00:00 2001 From: dongdigua Date: Sat, 30 Mar 2024 12:11:56 +0800 Subject: [PATCH] about: 88x31 badges; footer css; myversion filter --- .gitattributes | 3 ++- .github/workflows/site.yml | 4 ++++ Makefile | 4 ++++ css/main.css | 6 ++++-- images/badges/Arch.png | Bin 0 -> 535 bytes images/badges/made4.gif | Bin 0 -> 1286 bytes images/badges/sources | 2 ++ index.gmi | 2 +- index.html | 11 +++++------ org/about.org | 8 ++++++++ org/publish_config.el | 4 ++-- 11 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 images/badges/Arch.png create mode 100644 images/badges/made4.gif create mode 100644 images/badges/sources diff --git a/.gitattributes b/.gitattributes index 0dabda3..fbcda55 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,4 +3,5 @@ *.org linguist-vendored=false *.org linguist-detectable=true -index.gmi filter=dater +index.gmi filter=myversion +index.html filter=myversion diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml index fdc6a5c..d6e49ee 100644 --- a/.github/workflows/site.yml +++ b/.github/workflows/site.yml @@ -20,6 +20,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + with: + fetch-depth: 30 + fetch-tags: true - name: Install Emacs uses: purcell/setup-emacs@master @@ -32,6 +35,7 @@ jobs: - name: Build with Org run: | + make describe cd org make clean make diff --git a/Makefile b/Makefile index b879e31..7764c37 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,10 @@ posts: gmi: misc/mdlist2gmi.py > posts.gmi +describe: + git describe --tags HEAD + sed -i "s/\$$v\\$$/\$$v: $$(git describe --tags HEAD)\\$$/g" index.html + clean: rm posts.html rm posts.gmi diff --git a/css/main.css b/css/main.css index 4fc2b91..0b1459d 100644 --- a/css/main.css +++ b/css/main.css @@ -313,10 +313,12 @@ https://github.com/rgb-24bit/org-html-theme-list org-joshua } #postamble { + font-family: monospace; + text-align: center; padding: .3em; margin-bottom: 1em; /* border: 1px solid gray; */ - background-color: #dddaec; /* Gentoo Purple */ + background-color: #eaeaea; /* orgmode.org */ } #show_source { @@ -376,7 +378,7 @@ blockquote { .figure img { background: white; - padding: 5px; + /* padding: 5px; */ -moz-box-shadow: 0px 0px 5px #c7c7c7; -webkit-box-shadow: 0px 0px 5px #c7c7c7; box-shadow: 0px 0px 5px #c7c7c7; diff --git a/images/badges/Arch.png b/images/badges/Arch.png new file mode 100644 index 0000000000000000000000000000000000000000..f6ccce362f7549e097944a653215936420c5b885 GIT binary patch literal 535 zcmV+y0_gpTP)Px$(Md!>RA_3++yF)RnJ&^p8n7!!3EYD_MG**#7~;d{ z9Y2CBPsHvbaMC&F;NPR`x*h%(3?92UBsgBK&L4;>v zuUzCgV#m-DL5;9WQyh-?fr^OG0{b(Ciiqp^QM(R=wKf_@>MLomOoad9kc%1xNi0xQ zQl-}RfWT_ zS{f<5YZw9_p|g@c(_t8A5vI-c{P5SJTUid{CFKasLP(f`X^TOY1F_a1#Tg3ri^7gb zXbyqT>2jdAXuNEBXo^rjkqG^!fSFY1Kieif7on9h9D%DbomNlJB48~R5ho(|j6n0H zwikkCYEBUAfnEr?&^m$|K{5s1Dd;w-$*csuq7fpp?0}2KKgD`pVvEp$r1WSf8%T9g_?U z4D{P3=+|}Vw)X3^_G!2DX*Kt1Huq|1X{k4ME7x}_)ON_%w#&8kOINo_RkcdRr%P6~ zNL03nS2T;3Hwl$C2$nYR71wdc=CiZ21Jl7!1UkSBzyQh%3>^O%WI1F!HY_;U%pt55 zbHYHep-n*9Yt9aV1J3OHMp<`GY+QW2U%|Oc=H|sk4wEzjnLHvVJ$0Kb5nH$AM}yjl zshWjpS6&J|^XqnK=92Z=tZ{ytZTYD`m7CNqE_a#Bbk!pCmH%Ar?zpp2rq7SA_2(58 ziQ23awl-}yUuf6n-1F;$7Bcmk8mzdvsbce{uP@5-?``+(G&*7^`uf`Hj+I)etHsw} zKj18x^m5l0qX#pZSlKwV&YYijc8YGd+)LxU03D{Mw|ZWGNq>Dk!F_rQx2Sv8&UKfI zYWGTQ%jsJhI=|)B?Nt}=obbK9W%i7sf(3_MM7}5&6oo9_&At7p=eLUYk5A4_dfgUT z`1aGA2m6cN>nlu)KiV@({8{{~Cj0ldmFxDO-?#n!^KDl{=SSUo`YkT!USa6eGI!hZ zi@D5lUvIbka&()=Ea;^%yKS0f#X{x<50^#w83(?Y(&|{7ctOs8@0aN2MU@&MI$D0$ z? https://dongdigua.github.io https site mirror -$Date$ +$v$ diff --git a/index.html b/index.html index 9d7fd9b..6cc0a5d 100644 --- a/index.html +++ b/index.html @@ -18,9 +18,9 @@ a{color:#83c092;text-decoration:none} a:visited{color:#a7c080} a:hover{color:#d699b6} - .home{width:100%;min-height:calc(100vh - 60px);text-align:center} + .home{width:100%;min-height:calc(100vh - 50px);text-align:center} .home pre{max-width:80ch;padding-top:2em;margin-left:auto;margin-right:auto;line-height:1.5em;overflow:auto;display:inline-block;text-align:left} - footer{height:60px;text-align:center;background:#323d43} + footer{height:50px;text-align:center;background:#323d43} pre{font-family:inherit;margin:1rem} #quote{color:#7fbbb3;font-style:italic;text-align:center} #comment{color:#7a8478;font-style:italic} @@ -41,14 +41,13 @@ (github "@dongdigua") (bilibili "董地瓜") (payment "Monero") - (about "about) + (about "about") 

   
   
 
 
diff --git a/org/about.org b/org/about.org
index b0c7ea9..83c72c4 100644
--- a/org/about.org
+++ b/org/about.org
@@ -1,4 +1,5 @@
 #+TITLE: about
+#+OPTIONS: \n:nil
 
 - 哺乳纲 灵长目 人科 人属 智人
 - I use Arch btw
@@ -8,3 +9,10 @@
 - 骑公路车的
 - Elixir > Rust > Python
 - 不是很喜欢扁平化设计
+
+-----
+
+[[https://licensebuttons.net/l/by-nc-sa/4.0/88x31.png]]
+[[../images/badges/made4.gif]]
+[[../images/badges/Arch.png]]
+[[https://www.freebsd.org/gifs/power-button.gif]]
diff --git a/org/publish_config.el b/org/publish_config.el
index 71e71b2..b6391f4 100644
--- a/org/publish_config.el
+++ b/org/publish_config.el
@@ -22,10 +22,10 @@
 (setq org-html-postamble-format
       '(("en"
          "
-
dongdigua(dongdigua.github.io) CC BY-NC-SA, 禁止转载到私域(公众号，非自己托管的博客等)

+
dongdigua CC BY-NC-SA 禁止转载到私域(公众号，非自己托管的博客等)

 
Date: %d Build: %T

 
Proudly made with Emacs Org mode

-
If you have any idea, please contact me! I may add your comment

+
Email me to add comment

 ")))
 
 (setq org-html-home/up-format "