From a104d0ddb25d5ff01af8b6149deace9a8b7c9946 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 13 Feb 2021 18:45:35 +0000 Subject: [PATCH 1/4] Line spacing --- epicyon-profile.css | 2 +- theme/indymediamodern/theme.json | 2 +- theme/night/theme.json | 2 +- theme/rc3/theme.json | 2 +- theme/solidaric/theme.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epicyon-profile.css b/epicyon-profile.css index 282aed28f..473fbdb37 100644 --- a/epicyon-profile.css +++ b/epicyon-profile.css @@ -87,7 +87,7 @@ --quote-right-margin: 0.1em; --quote-font-weight: normal; --quote-font-size: 120%; - --line-spacing: 130%; + --line-spacing: 180%; --line-spacing-newswire: 120%; --newswire-item-moderated-color: white; --newswire-date-moderated-color: white; diff --git a/theme/indymediamodern/theme.json b/theme/indymediamodern/theme.json index 91859ddaa..8f9d41143 100644 --- a/theme/indymediamodern/theme.json +++ b/theme/indymediamodern/theme.json @@ -6,7 +6,7 @@ "header-bg-color": "#efefef", "verticals-width": "10px", "newswire-publish-icon": "False", - "line-spacing-newswire": "150%", + "line-spacing-newswire": "180%", "full-width-timeline-buttons": "False", "icons-as-buttons": "True", "rss-icon-at-top": "False", diff --git a/theme/night/theme.json b/theme/night/theme.json index 1762cfd2a..f29c4cd12 100644 --- a/theme/night/theme.json +++ b/theme/night/theme.json @@ -60,7 +60,7 @@ "event-color": "#0481f5", "event-background": "#00014a", "quote-right-margin": "0", - "line-spacing": "150%", + "line-spacing": "180%", "header-font": "'solidaric'", "*font-family": "'solidaric'", "*src": "url('./fonts/solidaric.woff2') format('woff2')", diff --git a/theme/rc3/theme.json b/theme/rc3/theme.json index 4eb466d6f..95b54d546 100644 --- a/theme/rc3/theme.json +++ b/theme/rc3/theme.json @@ -84,7 +84,7 @@ "event-color": "#0481f5", "event-background": "#00014a", "quote-right-margin": "0", - "line-spacing": "150%", + "line-spacing": "180%", "*font-family": "'Montserrat-Regular'", "*src": "url('./fonts/Montserrat-Regular.ttf') format('truetype')", "**font-family": "'Orbitron'", diff --git a/theme/solidaric/theme.json b/theme/solidaric/theme.json index 69cc6e057..e3e46b6ff 100644 --- a/theme/solidaric/theme.json +++ b/theme/solidaric/theme.json @@ -80,7 +80,7 @@ "title-background": "#ccc", "gallery-text-color": "#2d2c37", "quote-right-margin": "0", - "line-spacing": "150%", + "line-spacing": "180%", "header-font": "'solidaric'", "*font-family": "'solidaric'", "*src": "url('./fonts/solidaric.woff2') format('woff2')", From 2da558e7c1fc88a95874c5bf7dfee1490ecea2a0 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 13 Feb 2021 20:03:15 +0000 Subject: [PATCH 2/4] Left image on default theme --- theme/default/left_col_image.png | Bin 0 -> 1271 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 theme/default/left_col_image.png diff --git a/theme/default/left_col_image.png b/theme/default/left_col_image.png new file mode 100644 index 0000000000000000000000000000000000000000..268bbd86f1128d4c66153e4c99e2365029206a62 GIT binary patch literal 1271 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3sqmgFW3h5xgPSpt#}63f9n&dCn4{JBuLx@x+U z%p>L)Q$h&&eliut-+#^U4Hv~2LsIixa>h8Ok_uN0JU*_ndx~lI`!YUr^llILATmaR zrXJs$FdmieZZzn&odTKp~X%f|A|h~FnJe&+N^fr?-G!Hl30^jZ6k1vIVQUyWXGCN+d#_JK{Qu?SZ*_;J_is$32pkVz3 zfJE3^kqpW{QOqPtnQ(5f5kW@>po+{{5?>%ds@#zzC&AYejGfosSYxz(Svm7E<7@&5 zl`IA}MJiyWq^KWDjvA^enp8EbsRu1uv*eUD=WKZ$a@E9=sbw>BD^^`Rxq5bU_u{p1 z5uAZqalut`dTW;38l~y}<={P2O?$*7R zUI&GNlVYTyBM%!s%BT~yHf5%%Gf$g7%dAgohw7*H3)JXP<4tP$*^?Tq!R!t}>p0QH z48%AQh}$B7g6736I;F&m++r3BPBT$PlDgQ0PKy{2ra`Qep6ouz{S>#L{!`rezsQA! z?*AYcfbKK5FR1nPKi4*~$5*&Cje@UljNzywuj@ap@}E9`D-iN4;XB-!#KH0Wd2av! z0flKpLr_UWLm+T+Z)Rz1WdHzpoPCi!NW(xJ#a~mUQY#K-km8V`I$01E5nQwiMW_&J zg;pKRN57y+Lz3d+D7Y3J{8+3yxH#+T;3^1$A0SSSPKqv4;{TFDix>}%`|wi{pF@1EF1@S$CZ8W5;Qp0KsSA zN^kqC4Pg3{^m<#19RdB@z{Pc2llOqj9boXukW9&yf;7280eC;7Z^{7!w?KH!>#enq z(+40!U8Qb-gF|4XNZIQ?@9ydB?cX!4{(b Date: Sat, 13 Feb 2021 20:57:23 +0000 Subject: [PATCH 3/4] Right column image for default theme --- theme/default/right_col_image.png | Bin 0 -> 1271 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 theme/default/right_col_image.png diff --git a/theme/default/right_col_image.png b/theme/default/right_col_image.png new file mode 100644 index 0000000000000000000000000000000000000000..268bbd86f1128d4c66153e4c99e2365029206a62 GIT binary patch literal 1271 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3sqmgFW3h5xgPSpt#}63f9n&dCn4{JBuLx@x+U z%p>L)Q$h&&eliut-+#^U4Hv~2LsIixa>h8Ok_uN0JU*_ndx~lI`!YUr^llILATmaR zrXJs$FdmieZZzn&odTKp~X%f|A|h~FnJe&+N^fr?-G!Hl30^jZ6k1vIVQUyWXGCN+d#_JK{Qu?SZ*_;J_is$32pkVz3 zfJE3^kqpW{QOqPtnQ(5f5kW@>po+{{5?>%ds@#zzC&AYejGfosSYxz(Svm7E<7@&5 zl`IA}MJiyWq^KWDjvA^enp8EbsRu1uv*eUD=WKZ$a@E9=sbw>BD^^`Rxq5bU_u{p1 z5uAZqalut`dTW;38l~y}<={P2O?$*7R zUI&GNlVYTyBM%!s%BT~yHf5%%Gf$g7%dAgohw7*H3)JXP<4tP$*^?Tq!R!t}>p0QH z48%AQh}$B7g6736I;F&m++r3BPBT$PlDgQ0PKy{2ra`Qep6ouz{S>#L{!`rezsQA! z?*AYcfbKK5FR1nPKi4*~$5*&Cje@UljNzywuj@ap@}E9`D-iN4;XB-!#KH0Wd2av! z0flKpLr_UWLm+T+Z)Rz1WdHzpoPCi!NW(xJ#a~mUQY#K-km8V`I$01E5nQwiMW_&J zg;pKRN57y+Lz3d+D7Y3J{8+3yxH#+T;3^1$A0SSSPKqv4;{TFDix>}%`|wi{pF@1EF1@S$CZ8W5;Qp0KsSA zN^kqC4Pg3{^m<#19RdB@z{Pc2llOqj9boXukW9&yf;7280eC;7Z^{7!w?KH!>#enq z(+40!U8Qb-gF|4XNZIQ?@9ydB?cX!4{(b Date: Sat, 13 Feb 2021 21:48:24 +0000 Subject: [PATCH 4/4] Remove html from RSS feed titles --- newswire.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/newswire.py b/newswire.py index 29abb2428..29e24e3b7 100644 --- a/newswire.py +++ b/newswire.py @@ -302,6 +302,7 @@ def _xml2StrToDict(baseDir: str, domain: str, xmlStr: str, continue title = rssItem.split('')[1] title = _removeCDATA(title.split('')[0]) + title = removeHtml(title) description = '' if '' in rssItem and '' in rssItem: description = rssItem.split('')[1] @@ -388,6 +389,7 @@ def _xml1StrToDict(baseDir: str, domain: str, xmlStr: str, continue title = rssItem.split('')[1] title = _removeCDATA(title.split('')[0]) + title = removeHtml(title) description = '' if '' in rssItem and '' in rssItem: description = rssItem.split('')[1] @@ -462,6 +464,7 @@ def _atomFeedToDict(baseDir: str, domain: str, xmlStr: str, continue title = atomItem.split('')[1] title = _removeCDATA(title.split('')[0]) + title = removeHtml(title) description = '' if '' in atomItem and '' in atomItem: description = atomItem.split('')[1]