Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yPhil
Pétrolette
Commits
94f9c609
Commit
94f9c609
authored
Mar 06, 2018
by
yPhil
Browse files
Merge branch 'dev'
parents
2c08a3bc
07e62d72
Changes
14
Hide whitespace changes
Inline
Side-by-side
package-lock.json
View file @
94f9c609
{
"name"
:
"petrolette"
,
"version"
:
"1.0.1
6
"
,
"version"
:
"1.0.1
7
"
,
"lockfileVersion"
:
1
,
"requires"
:
true
,
"dependencies"
:
{
...
...
package.json
View file @
94f9c609
{
"name"
:
"petrolette"
,
"description"
:
"Fly-by-night news reading webapp."
,
"version"
:
"1.0.1
6
"
,
"version"
:
"1.0.1
7
"
,
"private"
:
true
,
"license"
:
"GPL-3.0-only"
,
"engines"
:
{
...
...
public/css/fontello.css
View file @
94f9c609
@font-face
{
font-family
:
'fontello'
;
src
:
url('../font/fontello.eot?
39214387
')
;
src
:
url('../font/fontello.eot?
39214387
#iefix')
format
(
'embedded-opentype'
),
url('../font/fontello.woff2?
39214387
')
format
(
'woff2'
),
url('../font/fontello.woff?
39214387
')
format
(
'woff'
),
url('../font/fontello.ttf?
39214387
')
format
(
'truetype'
),
url('../font/fontello.svg?
39214387
#fontello')
format
(
'svg'
);
src
:
url('../font/fontello.eot?
81897662
')
;
src
:
url('../font/fontello.eot?
81897662
#iefix')
format
(
'embedded-opentype'
),
url('../font/fontello.woff2?
81897662
')
format
(
'woff2'
),
url('../font/fontello.woff?
81897662
')
format
(
'woff'
),
url('../font/fontello.ttf?
81897662
')
format
(
'truetype'
),
url('../font/fontello.svg?
81897662
#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?
39214387
#fontello') format('svg');
src: url('../font/fontello.svg?
81897662
#fontello') format('svg');
}
}
*/
...
...
@@ -64,9 +64,14 @@
.icon-pencil
:before
{
content
:
'\e806'
;
}
/* '' */
.icon-ok
:before
{
content
:
'\e807'
;
}
/* '' */
.icon-comments
:before
{
content
:
'\e808'
;
}
/* '' */
.icon-down-dir
:before
{
content
:
'\e809'
;
}
/* '' */
.icon-trash-empty
:before
{
content
:
'\e80a'
;
}
/* '' */
.icon-w3c
:before
{
content
:
'\e80b'
;
}
/* '' */
.icon-down
:before
{
content
:
'\e80c'
;
}
/* '' */
.icon-down-1
:before
{
content
:
'\e80d'
;
}
/* '' */
.icon-down-big
:before
{
content
:
'\e80e'
;
}
/* '' */
.icon-cancel
:before
{
content
:
'\e80f'
;
}
/* '' */
.icon-rss-alt
:before
{
content
:
'\e810'
;
}
/* '' */
.icon-flashlight
:before
{
content
:
'\e812'
;
}
/* '' */
.icon-plus-1
:before
{
content
:
'\e813'
;
}
/* '' */
.icon-cog
:before
{
content
:
'\e814'
;
}
/* '' */
...
...
public/css/petrolette.css
View file @
94f9c609
...
...
@@ -7,6 +7,8 @@
--ui-color-sen
:
#f26522
;
--ui-color-sep
:
#ccc
;
--ui-color-rss
:
#f26522
;
--var-header-height
:
26px
;
--var-controls-width
:
150px
;
--var-controls-font-size
:
16pt
;
...
...
@@ -865,23 +867,30 @@ li.feed {
width
:
var
(
--var-controls-toggle-size
);
}
/* .icon-down-dir { */
/* margin: 0; */
/* font-size:24pt; */
/* } */
.feedIcon
{
/* font-size: 24pt; */
text-align
:
center
;
width
:
var
(
--var-controls-toggle-size
);
height
:
var
(
--var-controls-toggle-size
);
background-size
:
var
(
--var-controls-toggle-size
);
background-image
:
url("/static/images/feed-generic-rss.png")
;
/*
background-image: url("/static/images/feed-generic-rss.png");
*/
background-repeat
:
no-repeat
;
}
.icon-rss-squared
{
color
:
var
(
--ui-color-rss
);
}
.tabSort
.ui-sortable-placeholder
{
visibility
:
visible
!important
;
border
:
3px
dashed
var
(
--ui-color-sec
)
!important
;
}
.feedToggle
>
.ui-icon
{
margin
:
.1rem
.2rem
0
.1rem
;
}
.mobHeader
>
.feedTitle
{
color
:
var
(
--color-ter
);
flex-basis
:
auto
;
...
...
public/font/fontello.eot
View file @
94f9c609
No preview for this file type
public/font/fontello.svg
View file @
94f9c609
...
...
@@ -24,12 +24,22 @@
<glyph
glyph-name=
"comments"
unicode=
""
d=
"M1179 385q0-126-79-233t-215-170-296-62q-122 0-234 39l2-3-357-107q44 59 71 126t31 106l4 38q-106 120-106 266 0 126 79 233t215 169 295 62 296-62 215-169 79-233z m-250 0q0 29-21 50t-51 21q-29 0-50-21t-21-50q0-30 21-51t50-21q30 0 51 21t21 51z m-250 0q0 29-21 50t-51 21q-29 0-50-21t-21-50q0-30 21-51t50-21q30 0 51 21t21 51z m-250 0q0 29-21 50t-51 21q-29 0-50-21t-21-50q0-30 21-51t50-21q30 0 51 21t21 51z"
horiz-adv-x=
"1179"
/>
<glyph
glyph-name=
"down-dir"
unicode=
""
d=
"M540 587l-269-473-271 473 540 0z"
horiz-adv-x=
"540"
/>
<glyph
glyph-name=
"trash-empty"
unicode=
""
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=
"w3c"
unicode=
""
d=
"M0 84l0 766 1000 0 0-766-500-234z m84 461l63-275q3-14 17-14l47 0q14 0 18 14l23 113 21-113q4-14 18-14l49 0q14 0 17 14l61 275q2 10-3 16t-13 6l-50 0q-14 0-16-14l-23-121-26 121q-4 14-17 14l-38 0q-13 0-15-14l-26-121-25 121q-2 14-16 14l-50 0q-20 0-16-22z m344-242q37-51 103-53 45 2 76 30t32 68q-2 43-34 68 30 28 30 63-2 45-32 68t-72 24q-64 0-99-51-8-12 2-23l27-26q14-12 25 2 18 24 41 24 20 0 24-10 6-12 0-26-8-9-45-9-20 0-20-16l0-41q2-21 20-18 45 0 49-9t4-16q0-25-28-25-29 0-47 25-11 16-25 2l-29-29q-10-10-2-22z m232 108q0-73 36-117t95-44q70 0 104 75 3 19-10 23l-37 18q-6 2-14-1t-10-9q-12-29-33-29t-35 23-14 62 14 61 35 24q21-2 33-28 8-13 24-10l37 18q17 10 10 25-34 71-104 71-59 0-95-45t-36-117z"
horiz-adv-x=
"1000"
/>
<glyph
glyph-name=
"down"
unicode=
""
d=
"M911 351l-447-448-446 448 158 158 177-176 0 464 223 0 0-464 176 175z"
horiz-adv-x=
"928"
/>
<glyph
glyph-name=
"down-1"
unicode=
""
d=
"M700 391q31-31 31-73t-31-74l-334-334-335 334q-31 31-31 74t31 73 74 32 74-32l82-82 0 377q0 43 31 73t74 31q43 0 73-31t31-73l0-377 83 82q31 32 73 32t74-32z"
horiz-adv-x=
"731"
/>
<glyph
glyph-name=
"down-big"
unicode=
""
d=
"M899 386q0-30-21-50l-363-364q-22-21-51-21-29 0-50 21l-363 364q-21 20-21 50 0 29 21 51l41 41q22 21 51 21 29 0 50-21l164-164v393q0 29 21 50t51 22h71q29 0 50-22t21-50v-393l165 164q20 21 50 21 29 0 51-21l41-41q21-22 21-51z"
horiz-adv-x=
"928.6"
/>
<glyph
glyph-name=
"cancel"
unicode=
""
d=
"M0 90q0 36 26 62l195 195-195 196q-26 25-26 61t26 61 61 25 61-25l196-196 195 196q25 25 61 25t61-25 25-61-25-61l-195-196 195-195q25-26 25-62t-25-61q-25-25-61-25t-61 25l-195 195-196-195q-25-25-61-25t-61 25q-26 26-26 61z"
horiz-adv-x=
"686.5"
/>
<glyph
glyph-name=
"rss-alt"
unicode=
""
d=
"M1000 761v-824q0-36-26-62t-62-26h-824q-36 0-62 26t-26 62v824q0 36 26 62t62 26h824q36 0 62-26t26-62z m-283-765h136q0 143-56 274t-150 226-226 150-274 56v-135q154 0 286-76t208-208 76-287z m-240 0h136q0 126-62 234t-170 170-234 62v-135q136 0 233-97 97-95 97-234z m-153 88q0 37-26 63t-63 26q-36 0-62-26t-26-63q0-36 26-62t62-26q37 0 63 26t26 62z"
horiz-adv-x=
"1000"
/>
<glyph
glyph-name=
"flashlight"
unicode=
""
d=
"M807 706q62-62 85-130t-5-92l-134-134q-16-16-62-26t-96-4l-408-408q-18-18-57-6t-75 50q-36 36-49 74t5 56l408 408q-6 50 4 96t26 62l136 136q24 28 92 4t130-86z m-448-408q32-32 80 14 46 46 14 82-14 14-38 10t-44-24-23-43 11-39z m336 298q30-30 68-50t62-25 28-1q2 4-4 27t-26 60-50 67-66 50-59 26-27 2 1-28 25-62 48-66z"
horiz-adv-x=
"902"
/>
<glyph
glyph-name=
"plus-1"
unicode=
""
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"
/>
...
...
public/font/fontello.ttf
View file @
94f9c609
No preview for this file type
public/font/fontello.woff
View file @
94f9c609
No preview for this file type
public/font/fontello.woff2
View file @
94f9c609
No preview for this file type
public/images/feed-generic-rss.png
deleted
100644 → 0
View file @
2c08a3bc
1018 Bytes
public/images/feed-toggle-triangle-000.png
deleted
100644 → 0
View file @
2c08a3bc
402 Bytes
public/images/feed-toggle-triangle-fff.png
deleted
100644 → 0
View file @
2c08a3bc
447 Bytes
public/images/feed-toggle-triangle.xcf
deleted
100644 → 0
View file @
2c08a3bc
File deleted
public/lib/js/PTL.feed.js
View file @
94f9c609
...
...
@@ -5,7 +5,7 @@ PTL.feed = {
var
feedIndex
=
$
(
'
#tabs
'
).
find
(
'
.feed
'
).
length
;
var
$feedToggle
=
$
(
'
<i>
'
)
.
attr
(
'
class
'
,
'
feedIcon rotate translate
'
)
.
attr
(
'
class
'
,
'
feedIcon
icon-rss-squared
rotate translate
'
)
.
data
(
'
title
'
,
'
Fold / unfold this source (%1)
'
,
url
)
.
attr
(
'
title
'
,
PTL
.
tr
(
'
Fold / unfold this source (%1)
'
,
url
));
...
...
@@ -76,9 +76,11 @@ PTL.feed = {
.
data
(
'
type
'
,
type
)
.
data
(
'
limit
'
,
limit
);
var
$header
=
$
(
'
<div class="mobHeader ui-widget-header">
'
);
var
$toggleDiv
=
$
(
'
<div class="feedToggle">
'
);
var
$myControlsToggleDiv
=
$
(
'
<div class="myControlsToggleDiv">
'
);
var
$header
=
$
(
'
<div>
'
)
.
attr
(
'
class
'
,
'
mobHeader
'
);
var
$toggleDiv
=
$
(
'
<div>
'
)
.
attr
(
'
class
'
,
'
feedToggle
'
);
var
$feedHandle
=
$
(
'
<div>
'
)
.
data
(
'
title
'
,
PTL
.
tr
(
'
Move this source (%1)
'
,
url
))
...
...
@@ -107,17 +109,6 @@ PTL.feed = {
$feedToggle
.
appendTo
(
$toggleDiv
);
$myControlsToggleDiv
.
click
(
function
()
{
var
$controls
=
$
(
this
).
next
();
$
(
'
.feedControls
'
).
not
(
$controls
).
removeClass
(
'
flexGrow
'
);
$controls
.
toggleClass
(
'
flexGrow
'
);
$
(
this
).
toggleClass
(
'
open
'
);
});
$feedControls
.
hover
(
function
()
{
$
(
this
).
find
(
'
.collapsible
'
).
show
(
'
fade
'
,
'
fast
'
);
...
...
@@ -127,27 +118,33 @@ PTL.feed = {
}
);
$header
.
hover
(
function
()
{
$header
.
hover
(
function
()
{
var
iconImg
=
$feedToggle
.
css
(
'
background-image
'
);
var
iconImg
=
$feedToggle
.
css
(
'
background-image
'
);
$feedToggle
.
addClass
(
'
feedToggleArrow
'
);
$feedToggle
.
css
(
'
background-image
'
,
'
none
'
);
$
(
this
).
data
(
'
img
'
,
iconImg
);
$feedToggle
.
addClass
(
'
icon-down-big
'
);
$feedToggle
.
removeClass
(
'
icon-rss-squared
'
);
},
$
(
this
).
data
(
'
img
'
,
iconImg
);
},
function
()
{
$feedToggle
.
removeClass
(
'
feedToggleArrow
'
);
$feedToggle
.
removeClass
(
'
icon-down-big
'
);
// $feedToggle.css('background-image', iconImg);
if
(
typeof
$
(
this
).
data
(
'
img
'
)
!==
'
undefined
'
)
{
console
.
log
(
'
iconImg:
'
,
$
(
this
).
data
(
'
img
'
));
if
(
$
(
this
).
data
(
'
img
'
)
!==
'
none
'
)
{
$feedToggle
.
css
(
'
background-image
'
,
$
(
this
).
data
(
'
img
'
));
}
else
{
$feedToggle
.
addClass
(
'
generic
'
);
$feedToggle
.
addClass
(
'
icon-rss-squared
'
);
}
}
);
}
);
if
(
!
PTL
.
utilities
.
isMobile
())
{
$selectDiv
.
addClass
(
'
collapsible
'
);
...
...
@@ -236,11 +233,15 @@ PTL.feed = {
timeout
:
2000
},
function
(
icon
)
{
if
(
!
icon
||
icon
.
length
===
0
)
icon
=
'
/static/images/feed-generic-rss.png
'
;
if
(
!
icon
||
icon
.
length
===
0
)
{
console
.
log
(
'
generic!
'
,
feedHost
);
icon
=
'
/static/images/feed-generic-rss.png
'
;
}
}).
done
(
function
(
icon
)
{
$feedIcon
.
css
(
'
background-image
'
,
'
url("
'
+
icon
+
'
")
'
);
$feedIcon
.
removeClass
(
'
icon-rss-squared
'
);
$header
.
data
(
'
img
'
,
icon
);
var
img
=
new
Image
();
...
...
@@ -248,7 +249,9 @@ PTL.feed = {
img
.
src
=
icon
;
img
.
onerror
=
function
()
{
$feedIcon
.
css
(
'
background-image
'
,
'
url("/static/images/feed-generic-rss.png")
'
);
console
.
log
(
'
onerror generic!
'
,
feedHost
);
$feedIcon
.
addClass
(
'
icon-rss-squared
'
);
$feedIcon
.
css
(
'
background-image
'
,
'
none
'
);
};
}).
fail
(
function
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment