Commit fff3711b authored by yPhil's avatar yPhil
Browse files

Merge branch 'server'

parents 0f760e9b cb280598
Pipeline #394795 passed with stage
in 37 seconds
......@@ -17,7 +17,7 @@
News feeds are organized into tabs, which can contain an infinite number of columns; everything is configurable, and saved directly in the browser cache. To view the same feeds on your phone, either export / import the `petrolette.conf` file, or (recommended) use the user's personal cloud synchronization feature.
![Petrolette](https://framagit.org/yphil/assets/-/raw/master/img/petrolette.png)
![Petrolette](https://yphil.bitbucket.io/images/misc/petrolette.png)
## Features
......
......@@ -25,7 +25,8 @@
"remotestorage": "rs#1.1.0",
"rs-widget": "1.3.0",
"DOMPurify": "dompurify#^2.2.6",
"responsively-lazy": "^2.0.2"
"responsively-lazy": "^2.0.2",
"slim-scroll": "^1.3.3"
},
"resolutions": {
"intro.js": "^3.3.1"
......
@font-face {
font-family: 'fontello';
src: url('../font/fontello.eot?29737017');
src: url('../font/fontello.eot?29737017#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?29737017') format('woff2'),
url('../font/fontello.woff?29737017') format('woff'),
url('../font/fontello.ttf?29737017') format('truetype'),
url('../font/fontello.svg?29737017#fontello') format('svg');
src: url('../font/fontello.eot?9875755');
src: url('../font/fontello.eot?9875755#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?9875755') format('woff2'),
url('../font/fontello.woff?9875755') format('woff'),
url('../font/fontello.ttf?9875755') format('truetype'),
url('../font/fontello.svg?9875755#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
......@@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
src: url('../font/fontello.svg?29737017#fontello') format('svg');
src: url('../font/fontello.svg?9875755#fontello') format('svg');
}
}
*/
......@@ -55,8 +55,6 @@
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
}
.icon-petrolette:before { content: '\e801'; } /* '' */
.icon-download:before { content: '\e802'; } /* '' */
.icon-upload:before { content: '\e803'; } /* '' */
.icon-up:before { content: '\e804'; } /* '' */
.icon-down:before { content: '\e805'; } /* '' */
......@@ -64,6 +62,8 @@
.icon-rss:before { content: '\e807'; } /* '' */
.icon-checked:before { content: '\e808'; } /* '' */
.icon-checkbox:before { content: '\e809'; } /* '' */
.icon-petrolette:before { content: '\e80a'; } /* '' */
.icon-download:before { content: '\e80b'; } /* '' */
.icon-trash-empty:before { content: '\e810'; } /* '' */
.icon-plus:before { content: '\e811'; } /* '' */
.icon-minus:before { content: '\e812'; } /* '' */
......@@ -81,4 +81,6 @@
.icon-cloud:before { content: '\e824'; } /* '' */
.icon-error:before { content: '\e825'; } /* '' */
.icon-note:before { content: '\e826'; } /* '' */
.icon-help:before { content: '\e827'; } /* '' */
\ No newline at end of file
.icon-help:before { content: '\e827'; } /* '' */
.icon-buoy:before { content: '\e828'; } /* '' */
.icon-video:before { content: '\e829'; } /* '' */
\ No newline at end of file
......@@ -274,7 +274,7 @@ a:active {
/* font-family: "Aveny T WEB", Arial, sans-serif; */
font-family: BebasNeueRegular, Verdana, sans-serif !important;
/* font-stretch: ultra-condensed; */
font-style: normal;
/* font-style: normal; */
-webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale;
......@@ -285,15 +285,11 @@ a:active {
/* height: 30px; */
margin-left: var(--title-margin-left);
text-overflow: ellipsis;
color: var(--color-fg6);
overflow: hidden;
display: block;
width: 100px;
white-space: nowrap;
text-overflow: ellipsis;
}
#preload > .feed-title {
......@@ -576,14 +572,14 @@ fieldset {
width: available;
}
.menu legend {
font-size: 9pt;
}
legend {
color: var(--color-ui-pri);
}
.menu legend {
font-size: 9pt;
}
.js-enabled-only {
display: none;
}
......@@ -599,6 +595,12 @@ nav#sideMenu {
width: var(--side-menu-width-expanded);
z-index: 11;
overflow: auto;
scrollbar-width: thin;
scrollbar-color: var(--color-ui-oct) var(--color-ui-qua);
}
nav#sideMenu:hover {
scrollbar-color: var(--color-ui-sec) var(--color-ui-qua);
}
nav#sideMenu.expanded {
......@@ -779,6 +781,7 @@ button.ui-state-success {
.feed-header > .feed-handle,
.dialog .help-bookmarklet {
cursor: -webkit-grab;
cursor: grab;
}
......@@ -873,7 +876,7 @@ nav#sideMenu .flex-box > * {
margin-bottom: 0.4em;
}
nav#sideMenu #gallerySlideTransition {
#gallerySlideTransition {
margin-top: 2px;
}
......@@ -924,13 +927,19 @@ label:last-child {
/* } */
#tabs {
white-space: nowrap;
overflow: hidden;
white-space: nowrap;
}
#tabs > ul {
overflow: auto;
overflow-x: auto;
overflow-y: hidden;
scrollbar-width: thin;
scrollbar-color: var(--color-fg4) var(--color-bg1);
}
#tabs > ul:hover {
scrollbar-color: var(--color-fg5) var(--color-bg1);
}
#tabs > ul > li {
......@@ -1186,19 +1195,38 @@ table {
}
li.feed div.feed-body {
will-change: contents;
border-bottom: 1px solid var(--color-bg2);
border-left: 1px solid var(--color-bg1);
border-right: 1px solid var(--color-bg1);
margin: 0;
/* height: 150px; */
overflow: hidden;
overflow-y: auto;
/* resize: vertical; */
scrollbar-width: thin;
scrollbar-color: var(--color-fg4) var(--color-bg1);
}
li.feed div.feed-body:hover {
overflow-y: scroll;
scrollbar-color: var(--color-fg5) var(--color-bg1);
}
/* Works on Chrome, Edge, and Safari */
*::-webkit-scrollbar {
width: 12px;
}
*::-webkit-scrollbar-track {
background: var(--color-ui-qua);
}
*::-webkit-scrollbar-thumb {
background-color: var(--color-ui-pri);
border-radius: 20px;
border: 3px solid var(--color-ui-qua);
}
.folded {
height: 0 !important;
}
......@@ -1397,10 +1425,21 @@ div#logo-title > .logo-title > a:hover {
flex-direction: column;
}
#beggar > span {
#beggar > span.beggarIcon {
font-size: 6em;
}
#beggar > span.beggarClose {
position: absolute;
top: 4px;
right: 6px;
cursor: pointer;
}
#beggar > span.beggarClose:hover {
color: var(--color-ui-sec);
}
#beggar > a.ui-button {
margin: 1em 0 0.5em 0;
}
......@@ -1412,31 +1451,46 @@ div#logo-title > .logo-title > a:hover {
}
#beggar a.beggarLink:link,
#beggar a.beggarLink:visited {
text-decoration: underline !important;
color: var(--color-ui-pri);
}
#beggar a.beggarLink:hover {
color: var(--color-ui-sec);
}
/* #beggar > h4 { */
/* margin-top: 0; */
/* } */
#notify {
background-color: var(--color-ui-qua);
border: 1px solid var(--color-ui-sec);
border-radius: 5px;
width: 200px;
/* height: 220px; */
/* max-width: 100%; */
padding: 1em;
position: sticky;
bottom: 16px;
left: 16px;
z-index: 30;
/* flex-direction: column; */
}
#beggar a.beggarLink:visited {
text-decoration: underline !important;
color: var(--color-ui-pri);
}
#beggar a.beggarLink:hover {
color: var(--color-ui-sec);
}
/* #beggar > h4 { */
/* margin-top: 0; */
/* } */
#notify {
background-color: var(--color-ui-qua);
border: 1px solid var(--color-ui-sec);
border-radius: 5px;
width: 200px;
/* height: 220px; */
/* max-width: 100%; */
padding: 1em;
position: sticky;
bottom: 16px;
left: 16px;
z-index: 30;
/* flex-direction: column; */
}
audio {
background-color: var(--color-ui-pri);
border-radius: 0;
height: 24px;
width: 100% !important;
}
video {
width: 100% !important;
height: auto !important;
}
div.itemDiv {
max-width: auto;
}
......@@ -9,7 +9,7 @@
{
"uid": "fb598151d4f3bbb37861ac6fdfabb383",
"css": "petrolette",
"code": 59393,
"code": 59402,
"src": "custom_icons",
"selected": true,
"svg": {
......@@ -23,7 +23,7 @@
{
"uid": "348b04ea17f646fbc6a46e20ebe4fe12",
"css": "download",
"code": 59394,
"code": 59403,
"src": "mfglabs"
},
{
......@@ -134,18 +134,18 @@
"code": 59424,
"src": "zocial"
},
{
"uid": "5d9730dc93976d27eb07914eab50a507",
"css": "audio",
"code": 59425,
"src": "elusive"
},
{
"uid": "9cc990bbcac7aa8504078b3f49df79b1",
"css": "comments",
"code": 59426,
"src": "fontawesome"
},
{
"uid": "7480a298ce334eef70193895e799c3fd",
"css": "audio",
"code": 59425,
"src": "elusive"
},
{
"uid": "1e89103762be72b0720eda0468e62b90",
"css": "globe",
......@@ -175,6 +175,18 @@
"css": "help",
"code": 59431,
"src": "entypo"
},
{
"uid": "2f9f67ee4354feef8c1f51e03bac6ef3",
"css": "buoy",
"code": 59432,
"src": "entypo"
},
{
"uid": "6341ebcbe1ed1f6777c1b9527ead368e",
"css": "video",
"code": 59433,
"src": "entypo"
}
]
}
\ No newline at end of file
No preview for this file type
......@@ -6,10 +6,6 @@
<font id="fontello" horiz-adv-x="1000" >
<font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
<missing-glyph horiz-adv-x="1000" />
<glyph glyph-name="petrolette" unicode="&#xe801;" d="M54 850c-18 0-36-10-46-27l0 0c-16-26-7-60 19-75l252-149 0-432c0-30 24-55 55-55 30 0 55 25 55 55l0 463c0 17-8 32-21 42-3 3-5 5-9 7l-276 163c-9 6-19 8-29 8z m892 0c-10 0-20-2-29-8l-276-163c-3-2-6-4-9-7-13-10-20-25-20-42l0-463c0-30 24-55 54-55 31 0 55 25 55 55l0 432 252 149c26 15 35 49 19 75l0 0c-10 17-28 27-46 27z m-446-48c-30 0-55-24-55-55l0-842c0-31 25-55 55-55 30 0 55 24 55 55l0 842c0 31-25 55-55 55z" horiz-adv-x="1000" />
<glyph glyph-name="download" unicode="&#xe802;" d="M0 84v73q0 33 24 56t57 24 56-24 24-56v-73q0-17 12-29t30-13h531q18 0 30 13t12 29v73q0 33 24 56t56 24 57-24 24-56v-73q0-84-59-143t-144-60h-531q-84 0-144 60t-59 143z m155 359q0 33 24 57 23 23 56 23t57-23l105-106v344q0 33 24 57t56 23 57-23 24-57v-344l110 110q24 24 57 24t56-24q24-23 24-56t-24-57l-247-247q-24-25-57-25-32 0-56 25l-242 242q-24 24-24 57z" horiz-adv-x="937.5" />
<glyph glyph-name="upload" unicode="&#xe803;" d="M0 84v73q0 33 24 56t57 24 56-24 24-56v-73q0-17 12-29t30-13h531q18 0 30 13t12 29v73q0 33 24 56t56 24 57-24 24-56v-73q0-84-59-143t-144-60h-531q-84 0-143 59t-60 144z m155 407q0 33 24 57l247 247q23 23 57 23 33 0 56-23l243-242q23-24 23-57t-23-57q-24-23-57-23t-57 23l-105 105v-344q0-33-24-57t-56-24q-33 0-57 24t-24 57v344l-110-110q-24-23-57-23t-56 23-24 57z" horiz-adv-x="937.5" />
<glyph glyph-name="up" unicode="&#xe804;" d="M366 790l334-334q31-31 31-73t-31-74-74-31-73 31l-83 82 0-377q0-44-31-74t-73-30q-43 0-74 31t-31 73l0 377-82-82q-31-31-74-31t-74 31-31 74 31 73z" horiz-adv-x="731" />
......@@ -24,6 +20,10 @@
<glyph glyph-name="checkbox" unicode="&#xe809;" d="M625 707h-464q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v464q0 37-26 63t-63 26z m161-89v-464q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h464q66 0 114-48t47-113z" horiz-adv-x="785.7" />
<glyph glyph-name="petrolette" unicode="&#xe80a;" d="M54 850c-18 0-36-10-46-27l0 0c-16-26-7-60 19-75l252-149 0-432c0-30 24-55 55-55 30 0 55 25 55 55l0 463c0 17-8 32-21 42-3 3-5 5-9 7l-276 163c-9 6-19 8-29 8z m892 0c-10 0-20-2-29-8l-276-163c-3-2-6-4-9-7-13-10-20-25-20-42l0-463c0-30 24-55 54-55 31 0 55 25 55 55l0 432 252 149c26 15 35 49 19 75l0 0c-10 17-28 27-46 27z m-446-48c-30 0-55-24-55-55l0-842c0-31 25-55 55-55 30 0 55 24 55 55l0 842c0 31-25 55-55 55z" horiz-adv-x="1000" />
<glyph glyph-name="download" unicode="&#xe80b;" d="M0 84v73q0 33 24 56t57 24 56-24 24-56v-73q0-17 12-29t30-13h531q18 0 30 13t12 29v73q0 33 24 56t56 24 57-24 24-56v-73q0-84-59-143t-144-60h-531q-84 0-144 60t-59 143z m155 359q0 33 24 57 23 23 56 23t57-23l105-106v344q0 33 24 57t56 23 57-23 24-57v-344l110 110q24 24 57 24t56-24q24-23 24-56t-24-57l-247-247q-24-25-57-25-32 0-56 25l-242 242q-24 24-24 57z" horiz-adv-x="937.5" />
<glyph glyph-name="trash-empty" unicode="&#xe810;" d="M286 439v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m143 0v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m142 0v-321q0-8-5-13t-12-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q7 0 12-5t5-13z m72-404v529h-500v-529q0-12 4-22t8-15 6-5h464q2 0 6 5t8 15 4 22z m-375 601h250l-27 65q-4 5-9 6h-177q-6-1-10-6z m518-18v-36q0-8-5-13t-13-5h-54v-529q0-46-26-80t-63-34h-464q-37 0-63 33t-27 79v531h-53q-8 0-13 5t-5 13v36q0 8 5 13t13 5h172l39 93q9 21 31 35t44 15h178q23 0 44-15t30-35l39-93h173q8 0 13-5t5-13z" horiz-adv-x="785.7" />
<glyph glyph-name="plus" unicode="&#xe811;" d="M550 400q30 0 30-50t-30-50l-210 0 0-210q0-30-50-30t-50 30l0 210-210 0q-30 0-30 50t30 50l210 0 0 210q0 30 50 30t50-30l0-210 210 0z" horiz-adv-x="580" />
......@@ -46,7 +46,7 @@
<glyph glyph-name="pin" unicode="&#xe820;" d="M0 527l316 323 0-123 301-277 187 46-195-208 391-438-444 392-188-192 30 169-255 316z" horiz-adv-x="1000" />
<glyph glyph-name="audio" unicode="&#xe821;" d="M0 141l0 418 236 0 358 291 0-1000-358 291-236 0z m656 37q74 74 74 174 0 104-74 180l73 74q103-106 107-256 0-144-107-246z" horiz-adv-x="836" />
<glyph glyph-name="audio" unicode="&#xe821;" d="M0 69l0 250q0 207 147 353t353 147 354-147 146-353l0-250q-4-41-35-54t-61 5-29 49l0 250q0 156-109 265t-266 110-266-110-109-265l0-250q-4-41-35-54t-61 5-29 49z m188-157l0 313q0 14 8 22t23 9l62 0q14 0 23-9t9-22l0-313q0-13-9-22t-23-9l-62 0q-14 0-23 9t-8 22z m500 0l0 313q0 14 8 22t23 9l62 0q14 0 23-9t9-22l0-313q0-13-9-22t-23-9l-62 0q-14 0-23 9t-8 22z" horiz-adv-x="1000" />
<glyph glyph-name="comments" unicode="&#xe822;" d="M357 350q0-30-21-50t-50-21-51 21-21 50 21 51 51 20 50-20 21-51z m214 0q0-30-20-50t-51-21-50 21-21 50 21 51 50 20 51-20 20-51z m215 0q0-30-21-50t-51-21-50 21-21 50 21 51 50 20 51-20 21-51z m-286 286q-114 0-213-39t-157-105-59-142q0-62 40-119t113-98l48-28-15-53q-13-51-39-97 85 36 154 96l24 21 32-3q38-5 72-5 114 0 213 39t157 105 59 142-59 142-157 105-213 39z m500-286q0-97-67-179t-182-130-251-48q-39 0-81 4-110-97-257-135-27-8-63-12h-3q-8 0-15 6t-9 15v1q-2 2 0 6t1 6 2 5l4 5t4 5 4 5q4 5 17 19t20 22 17 22 18 28 15 33 15 42q-88 50-138 123t-51 157q0 73 40 139t106 114 160 76 194 28 194-28 160-76 106-114 40-139z" horiz-adv-x="1000" />
......@@ -59,6 +59,10 @@
<glyph glyph-name="note" unicode="&#xe826;" d="M0-25l0 750q0 39 27 66t67 28l656 0q25 0 45-18l187-187q18-20 18-45l0-594q0-39-27-66t-67-28l-812 0q-39 0-67 28t-27 66z m63 0q0-14 8-23t23-8l812 0q14 0 23 8t8 23l0 563-124 0q-40 0-67 27t-27 66l0 125-625 0q-14 0-23-9t-8-22l0-750z m62 78q0 16 16 16l718 0q16 0 16-16t-16-15l-718 0q-16 0-16 15z m0 94q0 16 16 16l718 0q16 0 16-16t-16-16l-718 0q-16 0-16 16z m0 94q0 15 16 15l718 0q16 0 16-15t-16-16l-718 0q-16 0-16 16z m0 93q0 16 16 16l718 0q16 0 16-16t-16-15l-718 0q-16 0-16 15z m0 110l0 187q0 14 9 23t22 8l219 0q14 0 22-8t9-23l0-187q0-14-9-23t-22-8l-219 0q-13 0-22 8t-9 23z m63 31l156 0 0 125-156 0 0-125z m281-47q0 16 15 16l375 0q16 0 16-16t-16-15l-375 0q-15 0-15 15z m0 94q0 16 15 16l157 0q15 0 15-16t-15-16l-157 0q-15 0-15 16z m0 94q0 15 15 15l157 0q15 0 15-15t-15-16l-157 0q-15 0-15 16z m281 15q0-25 19-44t43-18l125 0-187 187 0-125z" horiz-adv-x="1000" />
<glyph glyph-name="help" unicode="&#xe827;" d="M454 810q190 2 326-130t140-322q2-190-131-327t-323-141q-190-2-327 131t-139 323q-4 190 130 327t324 139z m-2-740q30 0 49 19t19 47q2 30-17 49t-49 19l-2 0q-28 0-47-18t-21-46q0-30 19-49t47-21l2 0z m166 328q26 34 26 78 0 78-54 116-52 38-134 38-64 0-104-26-68-42-72-146l0-4 110 0 0 4q0 26 16 54 16 24 54 24 40 0 52-20 16-20 16-44 0-18-16-40-8-12-20-20l-6-4q-6-4-16-11t-20-15-21-17-17-17q-14-20-18-78l0-8 108 0 0 4q0 12 4 28 6 20 28 36l28 18q46 34 56 50z" horiz-adv-x="920" />
<glyph glyph-name="buoy" unicode="&#xe828;" d="M454 810q190 2 326-130t140-322q2-190-131-327t-323-141q-190-2-327 131t-139 323q-4 190 130 327t324 139z m0-60q-94 0-178-44l62-104q56 28 122 28t122-28l62 104q-88 46-190 44z m-246-522q-28 60-28 122 0 64 28 124l-102 62q-46-88-46-190 2-96 46-180z m258-278q98 4 178 46l-62 104q-60-30-122-30t-122 30l-62-104q86-46 190-46z m-6 180q92 0 156 65t64 155q0 92-64 156t-156 64-156-64-64-156q0-90 64-155t156-65z m252 98l104-62q46 96 44 190 0 96-44 180l-104-62q28-60 28-124 0-62-28-122z" horiz-adv-x="920" />
<glyph glyph-name="video" unicode="&#xe829;" d="M980 600l-100 0 0-100 100 0 0-100-100 0 0-100 100 0 0-100-100 0 0-100 100 0 0-60q0-16-12-28t-28-12l-900 0q-16 0-28 12t-12 28l0 60 100 0 0 100-100 0 0 100 100 0 0 100-100 0 0 100 100 0 0 100-100 0 0 60q0 18 12 29t28 11l900 0q16 0 28-11t12-29l0-60z m-600-400l250 150-250 150 0-300z" horiz-adv-x="980" />
</font>
</defs>
</svg>
\ No newline at end of file
No preview for this file type
public/images/newlogo.png

647 Bytes | W: | H:

public/images/newlogo.png

6.37 KB | W: | H:

public/images/newlogo.png
public/images/newlogo.png
public/images/newlogo.png
public/images/newlogo.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -14,7 +14,7 @@
viewBox="0 0 520.50081 524.34889"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
sodipodi:docname="newlogo.svg"
inkscape:export-filename="/home/px/src/petrolette/public/images/newlogo.png"
inkscape:export-xdpi="5.1900001"
......@@ -29,15 +29,15 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
inkscape:cx="4.6317302"
inkscape:cx="42.305884"
inkscape:cy="270.028"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1920"
inkscape:window-height="1163"
inkscape:window-width="1050"
inkscape:window-height="1034"
inkscape:window-x="0"
inkscape:window-y="18"
inkscape:window-y="22"
inkscape:window-maximized="0"
units="px"
fit-margin-top="0"
......@@ -52,7 +52,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
......@@ -62,7 +62,7 @@
id="layer1"
transform="translate(-111.79684,-278.04128)">
<path
style="fill:none;fill-rule:evenodd;stroke:#ff4b03;stroke-width:41.90000153;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
style="fill:none;fill-rule:evenodd;stroke:#19b5fe;stroke-width:41.90000153;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 133.00535,299.14183 162.85714,94.28571 0,51.42857 0,193.42857"
id="path4138"
inkscape:connector-curvature="0"
......@@ -71,7 +71,7 @@
inkscape:export-ydpi="8.6499996"
inkscape:export-filename="/home/px/src/petrolette/public/images/newlogo.png" />
<path
style="fill:none;fill-rule:evenodd;stroke:#ff4b03;stroke-width:41.90000153;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
style="fill:none;fill-rule:evenodd;stroke:#19b5fe;stroke-width:41.90000153;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 372.04723,344.28468 0,51.42857 0,385.42857"
id="path4138-3"
inkscape:connector-curvature="0"
......@@ -80,7 +80,7 @@
inkscape:export-ydpi="8.6499996"
inkscape:export-filename="/home/px/src/petrolette/public/images/newlogo.png" />
<path
style="fill:none;fill-rule:evenodd;stroke:#ff4b03;stroke-width:41.90000153;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
style="fill:none;fill-rule:evenodd;stroke:#19b5fe;stroke-width:41.90000153;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 611.08914,299.14184 -162.85715,94.2857 0,51.42857 0,193.42857"
id="path4138-6"
inkscape:connector-curvature="0"
......
......@@ -9,6 +9,7 @@ PTL.dialog = {
const $beggar = $('#beggar'),
$beggarH4 = $('#beggar > h4'),
$beggarClose = $('#beggar > span.beggarClose'),
$beggarOkButton = $('#beggar > #beggarOkButton'),
$beggarTourButton = $('#beggar > #beggarTourButton');
......@@ -17,7 +18,7 @@ PTL.dialog = {
window.open('https://liberapay.com/yPhil/donate');
});
$beggarH4.on('click', function() {
$beggarClose.on('click', function() {
$beggar.fadeOut('fast');
});
......@@ -544,7 +545,7 @@ PTL.dialog = {
title: PTL.tr('Add feed'),
class: "translate",
click: function() {
PTL.feed.add($('.column').first(), feedUrl, 'mixed', 8, 'on', true, false);
PTL.feed.add($('.column').first(), feedUrl, 'mixed', 450, 'on', true, false);
PTL.dialog.kill($dialog);
}
}
......
......@@ -183,7 +183,6 @@ PTL.feed = {
$feedToggle = $feed.find('.feed-toggle'),
$feedIcon = $feed.find('.feed-toggle > i');
$feedBody.css('height', feedLimit);
var l = PTL.util.getLocation(feedUrl),
feedProtocol = l.protocol ? l.protocol + '//' : '//',
......@@ -277,10 +276,14 @@ PTL.feed = {
$feedIcon.addClass('icon-rss');
$feedToggle.css('background-image', 'none');
$feedBody.css('height', '');
return;
} else {
$feedBody.css('height', feedLimit);
$.get("/favicon", {
url: decodeURI(feedHost),
dataType: "json"
......@@ -301,7 +304,7 @@ PTL.feed = {
$.each(data.feedItems, function(index, item) {
// if (index == parseInt(feedLimit)) return false;
if (index == 30) return false;
// console.log('i: (%s)', JSON.stringify(item));
......@@ -331,10 +334,12 @@ PTL.feed = {
var $imageLink = $('<a>').attr('target', '_blank'),
$itemLink = $('<a>').attr('target', '_blank'),
$soundLink = $('<a>').attr('target', '_blank'),
$audioLink = $('<a>').attr('target', '_blank'),
$videoLink = $('<a>').attr('target', '_blank'),
$commentsLink = $('<a>').attr('target', '_blank'),
$commentsIcon = $('<i>'),
$soundIcon = $('<i>'),
$audioIcon = $('<i>'),
$videoIcon = $('<i>'),
$image,
$summary = $('<null>').append(PTL.util.sanitizeInput(summary)).text(),
$itemDiv = $('<div>').attr('class', 'itemDiv'),
......@@ -396,13 +401,39 @@ PTL.feed = {
imageUrl = item.enclosures[0].url;
}
if (item.enclosures[0].url.match(/\.(ogg|mp3|mp4)$/)) {
$soundLink
if (item.enclosures[0].url && item.enclosures[0].url.match(/\.(mp4|webm)$/)) {
var videoPlayer = document.createElement('video');
videoPlayer.controls = 'controls';
videoPlayer.src = item.enclosures[0].url;
videoPlayer.type = item.enclosures[0].type;
$itemDiv.append(videoPlayer);
$videoLink
.attr('href', item.enclosures[0].url)
.appendTo($itemDiv);
$videoIcon
.attr('class', 'item-icon icon-video')
.appendTo($videoLink);
}
if (item.enclosures[0].url && item.enclosures[0].url.match(/\.(ogg|mp3)$/)) {
var audioPlayer = document.createElement('audio');
audioPlayer.controls = 'controls';
audioPlayer.src = item.enclosures[0].url;
audioPlayer.type = item.enclosures[0].type;
// audioPlayer.preload = 'metadata';
$itemDiv.append(audioPlayer);
$audioLink
.attr('href', item.enclosures[0].url)
.appendTo($itemDiv);
$soundIcon
$audioIcon
.attr('class', 'item-icon icon-audio')
.appendTo($soundLink);
.appendTo($audioLink);
}
}
......@@ -449,9 +480,9 @@ PTL.feed = {
.attr('data-caption', '<a href="' + item.link + '" class="ui-button ui-corner-all" title="' + $summary.trim() + '">' + item.title + '</a>');
$image = $('<img>')
.attr('src', '/static/images/loading.jpg')
.attr('src', '/static/images/loading.gif')
.attr('data-srcset', imageUrl)
.attr('srcset', 'data:image/gif;base64,R0lGODlhAQABAIAAAP///////yH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==')
.attr('srcset', '/static/images/loading.gif')
.attr('title', $summary.trim())
.attr('alt', item['mastodon:scope'] ? $summary.trim() : item.title)
.attr('class', 'ptl-img responsively-lazy')
......
......@@ -79,7 +79,7 @@ var PTL = (function() {
}
PTL.sideMenu('close');
PTL.feed.add($column, '', 'mixed'