Commit 0988198b authored by yPhil's avatar yPhil

Feed: icon-rss-squared is now an icon

parent dd30a4e3
@font-face {
font-family: 'fontello';
src: url('../font/fontello.eot?41377705');
src: url('../font/fontello.eot?41377705#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?41377705') format('woff2'),
url('../font/fontello.woff?41377705') format('woff'),
url('../font/fontello.ttf?41377705') format('truetype'),
url('../font/fontello.svg?41377705#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?41377705#fontello') format('svg');
src: url('../font/fontello.svg?81897662#fontello') format('svg');
}
}
*/
......@@ -71,6 +71,7 @@
.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'; } /* '' */
......
......@@ -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;
......@@ -876,10 +878,14 @@ li.feed {
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;
......
No preview for this file type
......@@ -38,6 +38,8 @@
<glyph glyph-name="cancel" unicode="&#xe80f;" 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="&#xe810;" 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="&#xe812;" 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="&#xe813;" 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" />
......
No preview for this file type
......@@ -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,33 +118,33 @@ PTL.feed = {
}
);
$header.hover (
function() {
var iconImg = $feedToggle.css('background-image');
$header.hover (function() {
$feedToggle.css('background-image', 'none');
var iconImg = $feedToggle.css('background-image');
$feedToggle.addClass('icon-down-big');
$feedToggle.css('background-image', 'none');
console.log('iconImg: ', iconImg);
$feedToggle.addClass('icon-down-big');
$feedToggle.removeClass('icon-rss-squared');
$(this).data('img',iconImg);
$(this).data('img', iconImg);
},
},
function() {
$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');
......@@ -242,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();
......@@ -254,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() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment