public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

All new icons for the feed list.

Browse source
This commit is contained in:
Samuel Clay 2022-05-04 11:27:32 -04:00
parent a90c506d79
commit a880a24b55
24 changed files with 226 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/rss_feeds/views.py
View file

@ -81,7 +81,7 @@ def load_feed_favicon(request, feed_id):
not_found = True
if not_found or not feed_icon.data:
return HttpResponseRedirect(settings.MEDIA_URL + 'img/icons/circular/world.png')
return HttpResponseRedirect(settings.MEDIA_URL + 'img/icons/nouns/world.svg')
icon_data = base64.b64decode(feed_icon.data)
return HttpResponse(icon_data, content_type='image/png')

44
media/css/reader/darkmode.css
View file

@ -99,13 +99,13 @@ body.NB-dark {
.NB-dark .ui-layout-resizer-west {
background-color: rgb(52,59,61);
border-left: 1px solid #0B0F20;
border-left: 1px solid #303030;
}
.NB-dark .right-pane .ui-layout-resizer-south,
.NB-dark .right-pane .ui-layout-resizer-north {
background-color: rgb(52,59,61);
border-top: 1px solid #0B0F20;
border-bottom: 1px solid #0B0F20;
border-top: 1px solid #303030;
border-bottom: 1px solid #303030;
}
@ -181,6 +181,9 @@ color: #a85b40;
background-color: #303739;
}
.NB-dark .NB-module-account-subscription .NB-module-stats-count-description {
color: #c0c0c0;
}
/* "Logout", "Try" & "Add" button colors */
.NB-dark .NB-recommended-try,
.NB-dark .NB-recommended-add,
@ -244,13 +247,11 @@ color: #a85b40;
color: #797b7c;
}
.NB-dark .NB-feeds-header-user-dashboard img,
.NB-dark .NB-feeds-header-user-interactions img,
.NB-dark .NB-feeds-header-collapse-sidebar img {
opacity: 0.9;
}
.NB-dark .NB-feeds-header-user-dashboard:hover img,
.NB-dark .NB-feeds-header-user-interactions:hover img,
.NB-dark .NB-feeds-header-collapse-sidebar:hover img {
opacity: 1.0;
@ -855,7 +856,7 @@ color: #a85b40;
background: #393b3c;
background-color: #393b3c;
background-image: none;
border-color: #101719;
border-color: #303030
}
/* Buttons on bottom & top bar */
@ -901,7 +902,7 @@ color: #a85b40;
}
.NB-dark #story_taskbar {
border-top: 1px solid #101719;
border-top: 1px solid #303030;
}
.NB-dark .NB-feedbar .NB-taskbar .NB-task-story-previous {
border-right: 1px solid rgba(0,0,0,0.1);
@ -1021,8 +1022,8 @@ text-shadow: none;
}
.NB-dark .NB-feedlist .feed {
border-top: 1px solid #434543;
border-bottom: 1px solid #434543;
/* border-top: 1px solid #434543; */
/* border-bottom: 1px solid #434543; */
padding-right: 2px;
background-color: #434543;
}
@ -1033,9 +1034,9 @@ text-shadow: none;
.NB-dark .NB-feeds-header.NB-selected,
.NB-dark .NB-feedlist .folder.NB-selected>.folder_title {
background: none;
background-color: #313E4E;
border-top: 1px solid #2C305D;
border-bottom: 1px solid #2C305D;
background-color: #4d6d95;
/* border-top: 1px solid #2C305D; */
/* border-bottom: 1px solid #2C305D; */
}
/* Shared Stories*/
@ -1055,14 +1056,14 @@ border-bottom-color: #303739;
.NB-dark .NB-feeds-header .NB-feeds-header-title,
.NB-dark .NB-feedlists .NB-socialfeeds .feed .feed_title,
.NB-dark .NB-feedlist .feed_title {
color: #d2d2d2;
color: #bdbdbd;
text-shadow: 0 1px 0 rgba(0,0,0,.8);
}
/* Feed folder text */
.NB-dark .NB-feedlist .folder_title,
.NB-dark .NB-feedlist .folder.NB-selected>.folder_title {
color: #98999B;
color: #bdbdbd;
text-shadow: 0 1px 0 rgba(0,0,0,.8);
}
@ -1083,16 +1084,16 @@ border-bottom-color: #303739;
.NB-dark .NB-feeds-header-searches.NB-feeds-header,
.NB-dark .NB-feeds-header-starred.NB-feeds-header,
.NB-dark .NB-searches-folder {
border-bottom: 1px solid #333536;
/* border-bottom: 1px solid #333536; */
}
.NB-dark .NB-feeds-header-read-container.NB-feeds-header-container {
border-top: 1px solid #333536;
/* border-top: 1px solid #333536; */
}
/* Unread feed count badge */
.NB-dark .unread_count_neutral {
background-color: #7a7e77;
color: #FDFEFE;
text-shadow: 0 1px 0 rgba(0, 0, 0, .3);
/* text-shadow: 0 1px 0 rgba(0, 0, 0, .3); */
}
@ -1119,6 +1120,7 @@ border-bottom-color: #303739;
}
.NB-dark .NB-story-title-grid.NB-story-title .NB-storytitles-grid-bottom {
background-color: #292b2c;
border-top-color: #303030;
}
.NB-dark .NB-story-title:hover:not(.NB-selected),
.NB-dark .NB-story-title:hover:not(.NB-selected) .NB-storytitles-grid-bottom {
@ -1159,8 +1161,8 @@ border-bottom-color: #303739;
/* Selected stories highlight */
.NB-dark .NB-story-title.NB-selected {
color: #eee;
border-top: 1px solid #414545;
border-bottom: 1px solid #202121;
/* border-top: 1px solid #414545;
border-bottom: 1px solid #202121; */
background: none;
background-color: #30393F;
}
@ -1374,13 +1376,13 @@ color: #fff;
.NB-dark .NB-sideoption {
border: none;
text-shadow: none;
background-color: #393b3c;
background-color: transparent;
}
/* Story button text color (Train, Save, Share) */
.NB-dark .NB-sideoption .NB-sideoption-title {
color: rgba(255, 255, 255, 0.2);
color: #808080;
}
.NB-dark .NB-sideoption-save,

69
media/css/reader/reader.css
View file

@ -124,12 +124,10 @@ hr {
.NB-show-reader .NB-splash-bottom {
display: none;
}
.NB-show-reader .NB-feeds-header-user-dashboard,
.NB-show-reader .NB-feeds-header-collapse-sidebar {
opacity: 1;
cursor: pointer;
}
.NB-show-reader .NB-feeds-header-user-dashboard:hover img,
.NB-show-reader .NB-feeds-header-collapse-sidebar:hover img {
opacity: .9;
}
@ -585,7 +583,7 @@ hr {
}
.NB-feedlist li.folder .NB-folder-icon {
background: transparent url('/media/embed/icons/circular/g_icn_folder.png') no-repeat 0 0;
background: transparent url('/media/embed/icons/nouns/folder-open.svg') no-repeat 0 0;
width: 16px;
height: 16px;
background-size: 16px;
@ -603,7 +601,7 @@ hr {
top: 4px;
}
.NB-feedlist li.folder.NB-folder-collapsed .NB-folder-icon{
background: transparent url('/media/embed/icons/circular/g_icn_folder_rss.png') no-repeat 0 0;
background: transparent url('/media/embed/icons/nouns/folder-closed.svg') no-repeat 0 0;
background-size: 16px;
}
@ -1947,7 +1945,7 @@ img.feed_favicon {
width: 16px;
height: 16px;
margin: -1px 6px 0 0;
background: transparent url('/media/embed/icons/circular/clock.png') no-repeat 0 0;
background: transparent url('/media/embed/icons/nouns/saved-stories.svg') no-repeat 0 0;
background-size: 16px;
float: left;
display: none;
@ -3766,7 +3764,7 @@ body {
margin: 6px 0 0;
}
.NB-feed-story .NB-feed-story-header .NB-feed-story-starred-date .NB-icon {
background: transparent url('/media/embed/icons/circular/clock.png') no-repeat 0 center;
background: transparent url('/media/embed/icons/nouns/saved-stories.svg') no-repeat 0 center;
background-size: 16px;
height: 16px;
margin-top: 6px;
@ -4487,7 +4485,7 @@ body {
padding: 9px 4px;
height: 100%;
float: right;
background: transparent url('/media/embed/icons/circular/clock.png') no-repeat 8px center;
background: transparent url('/media/embed/icons/nouns/saved-stories.svg') no-repeat 8px center;
background-size: 16px;
transition: background .12s ease-out;
}
@ -4578,7 +4576,7 @@ body {
margin: 11px 2px 0 0;
width: 16px;
height: 16px;
background: transparent url("/media/embed/reader/tag.png") no-repeat 0 0;
background: transparent url("/media/img/icons/nouncs/tag.svg") no-repeat 0 0;
background-size: 14px;
}
.NB-sideoption-save .NB-sideoption-save-title {
@ -4849,6 +4847,9 @@ body {
/* ================ */
.NB-feeds-header-wrapper {
position: sticky;
top: 0;
z-index: 1;
}
.NB-feeds-header-user {
@ -4879,8 +4880,7 @@ body {
border-radius: 2px;
}
.NB-feeds-header-collapse-sidebar,
.NB-feeds-header-user-interactions,
.NB-feeds-header-user-dashboard {
.NB-feeds-header-user-interactions {
cursor: pointer;
padding: 10px 0 10px;
width: 36px;
@ -4893,19 +4893,14 @@ body {
.NB-feeds-header-user-interactions {
right: 32px;
}
.NB-feeds-header-user-dashboard {
right: 64px;
}
.NB-feeds-header-collapse-sidebar img,
.NB-feeds-header-user-interactions img,
.NB-feeds-header-user-dashboard img {
.NB-feeds-header-user-interactions img {
width: 16px;
height: 16px;
opacity: .7;
}
.NB-feeds-header-collapse-sidebar:hover img,
.NB-feeds-header-user-interactions:hover img,
.NB-feeds-header-user-dashboard:hover img {
.NB-feeds-header-user-interactions:hover img {
opacity: .9;
}
.NB-feeds-header-user-interactions .NB-feeds-header-user-interactions-badge {
@ -4926,14 +4921,11 @@ body {
text-shadow: 0 1px 0 rgba(0, 0, 0, .2);
z-index: 1;
}
.NB-feeds-header-user-dashboard,
.NB-feeds-header-collapse-sidebar {
opacity: .3;
cursor: default;
}
.NB-feeds-header-user-dashboard img,
.NB-feeds-header-collapse-sidebar img,
.NB-feeds-header-user-dashboard:hover img,
.NB-feeds-header-collapse-sidebar:hover img {
opacity: .7;
}
@ -4988,6 +4980,7 @@ body {
position: relative;
display: none;
overflow: hidden;
background-color: #e9ece6;
}
.NB-feeds-header {
@ -5001,6 +4994,7 @@ body {
line-height: 22px;
cursor: pointer;
overflow: hidden;
transition: transform .08s ease-out, border-radius .08s ease-out;
}
.NB-theme-feed-size-xs .NB-feeds-header {
@ -5065,23 +5059,13 @@ body {
padding: 0 4px;
margin: 2px 3px 0 0;
}
.NB-feeds-header-river-container .NB-feeds-header {
/* border-bottom: 1px solid #B7BBAA; */
}
.NB-feeds-header-read-container.NB-feeds-header-container {
/* border-top: 1px solid #B7BBAA; */
}
.NB-feeds-header-read.NB-feeds-header,
.NB-feeds-header-searches.NB-feeds-header,
.NB-feeds-header-starred.NB-feeds-header,
.NB-searches-folder {
/* border-bottom: 1px solid #B7BBAA; */
}
.NB-feeds-header-river-container .NB-feeds-header.NB-empty .NB-feeds-header-count {
display: none;
}
.NB-feeds-header-river-dashboard-container {
display: block;
}
/* ============================ */
/* = Header - Starred Stories = */
/* ============================ */
@ -5102,11 +5086,10 @@ body {
.NB-starred-feeds .feed {
/* border-top: 1px solid #E9EBEE; */
/* border-bottom: 1px solid #E9EBEE; */
background-color: #e5e5e5;
padding: 1px 0;
background-color: #dfdcd5;
}
.NB-starred-feeds {
background-color: #e5e5e5;
background-color: #dfdcd5;
}
.NB-feeds-header-starred.NB-empty .NB-feeds-header-count {
display: none;
@ -5135,11 +5118,11 @@ body {
.NB-feeds-header-searches {
cursor: default;
background-image: inherit;
background-color: #EAECE5;
background-color: inherit;
}
.NB-feeds-header.NB-feeds-header-searches:hover {
background-image: inherit;
background-color: #EAECE5;
background-color: inherit;
}
.NB-feeds-header-searches .NB-feeds-header-count {
@ -8330,7 +8313,7 @@ form.opml_import_form input {
.NB-menu-manage .NB-change-folders .NB-folder-option .NB-icon,
.NB-menu-manage .NB-change-folders .NB-add-folder-form .NB-icon {
background: transparent url('/media/embed/icons/circular/g_icn_folder.png') no-repeat 0 0;
background: transparent url('/media/embed/icons/nouns/folder-open.svg') no-repeat 0 0;
width: 16px;
height: 16px;
background-size: 16px;
@ -8339,7 +8322,7 @@ form.opml_import_form input {
margin: 1px 4px;
}
.NB-menu-manage .NB-change-folders .NB-folder-option.NB-folder-option-active .NB-icon {
background: transparent url('/media/embed/icons/circular/g_icn_folder_rss.png') no-repeat 0 0;
background: transparent url('/media/embed/icons/nouns/folder-closed.svg') no-repeat 0 0;
background-size: 16px;
}
.NB-menu-manage .NB-change-folders .NB-folder-option:hover .NB-icon-add {
@ -8615,14 +8598,14 @@ form.opml_import_form input {
opacity: 0.2;
}
.NB-menu-manage .NB-menu-manage-story-star .NB-menu-manage-image {
background: transparent url('/media/embed/icons/circular/clock.png') no-repeat 0 0;
background: transparent url('/media/embed/icons/nouns/saved-stories.svg') no-repeat 0 0;
background-size: 16px;
}
.NB-menu-manage .NB-menu-manage-story-open .NB-menu-manage-image {
background: transparent url('/media/embed/icons/silk/house.png') no-repeat 0 1px;
}
.NB-menu-manage.NB-story-starred .NB-menu-manage-story-star .NB-menu-manage-image {
background: transparent url('/media/embed/icons/circular/clock.png') no-repeat 0 0;
background: transparent url('/media/embed/icons/nouns/saved-stories.svg') no-repeat 0 0;
background-size: 16px;
opacity: .55;
}
@ -13435,7 +13418,7 @@ form.opml_import_form input {
background-size: 16px;
}
.NB-stat-realtime .NB-icon {
background: transparent url('/media/embed/icons/circular/clock.png');
background: transparent url('/media/embed/icons/nouns/saved-stories.svg');
background-size: 16px;
}
.NB-feedbar-options-stat .NB-stat {

9
media/img/icons/nouns/all-shares.svg Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>all-shares</title>
<g id="all-shares" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g transform="translate(0.000000, 11.000000)" fill="#95968E" fill-rule="nonzero" id="Shape">
<path d="M7.75041143,50.0587853 C8.12541143,48.8165853 8.26213143,48.3048853 8.36369143,47.7110853 C-0.679308569,38.3399853 -2.83130857,23.2460853 4.09029143,12.5740853 C12.3910914,-0.214914741 29.4772914,-3.84791474 42.2622914,4.46078526 C55.0432914,12.7693853 58.6802914,29.8747853 50.3833914,42.6637853 C43.0903914,53.9057853 28.8523914,58.2067853 16.5943914,53.1837853 C16.1373614,53.4689453 15.6959514,53.7970653 14.5552914,54.6720853 C13.3521914,55.5978653 12.7818914,56.0158853 12.1333914,56.4064853 C10.6685914,57.3049253 9.59819143,57.6408853 8.30529143,56.8010153 C6.98499143,55.9416353 6.76229143,54.6448153 7.00059143,53.0237153 C7.11778143,52.2424653 7.29356143,51.5706153 7.75059143,50.0589153 L7.75041143,50.0587853 Z M19.3634114,27.7427853 C19.6016914,26.8599753 19.4923214,26.0161853 19.0431014,25.2115853 C18.5899814,24.4068953 17.9259014,23.8873853 17.0431014,23.6490853 C16.1602914,23.4108053 15.3126014,23.5279953 14.5040014,23.9928353 C13.6954114,24.4615853 13.1720014,25.1373353 12.9376014,26.0201353 C12.6993214,26.9029453 12.8204114,27.7389353 13.2891614,28.5318353 C13.7618214,29.3248053 14.4375614,29.8404353 15.3203614,30.0787353 C16.2031714,30.3131053 17.0391614,30.2037353 17.8281614,29.7506053 C18.6172214,29.2974853 19.1289614,28.6256053 19.3633614,27.7428053 L19.3634114,27.7427853 Z M30.4024114,27.7466913 C30.6406914,26.8638813 30.5313214,26.0200913 30.0821014,25.2154913 C29.6289814,24.4108013 28.9649014,23.8912913 28.0821014,23.6529913 C27.1992914,23.4186113 26.3516014,23.5319013 25.5430014,23.9967413 C24.7344114,24.4654913 24.2149014,25.1412413 23.9766014,26.0240413 C23.7422214,26.9068513 23.8594111,27.7428413 24.3281614,28.5357413 C24.8008214,29.3287113 25.4804614,29.8443413 26.3633614,30.0826413 C27.2461714,30.3170213 28.0781614,30.2115513 28.8672614,29.7545213 C29.6563214,29.3014013 30.1680614,28.6334213 30.4024614,27.7467213 L30.4024114,27.7466913 Z M41.4414114,27.7505973 C41.6796914,26.8677873 41.5703214,26.0239973 41.1211014,25.2193973 C40.6718814,24.4147073 40.0039014,23.8951973 39.1211014,23.6568973 C38.2382914,23.4225273 37.3906014,23.5358073 36.5820014,24.0006473 C35.7734114,24.4693973 35.2539014,25.1451473 35.0156014,26.0279473 C34.7812214,26.9107573 34.8984114,27.7506473 35.3710714,28.5396473 C35.8398214,29.3326173 36.5194714,29.8482473 37.4022714,30.0865473 C38.2850814,30.3248273 39.1210714,30.2154573 39.9061714,29.7584273 C40.6952314,29.3053073 41.2069714,28.6373273 41.4413714,27.7506273 L41.4414114,27.7505973 Z M45.8203114,54.4575973 C49.6367114,52.0630973 52.9922114,48.8247973 55.5859114,44.8247973 C65.1640114,30.0627973 60.9648114,10.3247973 46.2148114,0.734797259 C46.1991864,0.723078259 46.1835614,0.715265259 46.1679364,0.703547259 C57.1479364,-1.83165274 69.0159364,2.57074726 75.5079364,12.5745473 C82.4298364,23.2465473 80.2813364,38.3405473 71.2345364,47.7115473 C71.3360964,48.3052973 71.4767264,48.8170473 71.8517264,50.0592473 C72.3048464,51.5709473 72.4845364,52.2428473 72.6017264,53.0240473 C72.8400064,54.6451473 72.6134444,55.9420473 71.2931264,56.8013473 C70.0001264,57.6411873 68.9337264,57.3052573 67.4650264,56.4068173 C66.8204964,56.0161973 66.2502264,55.5982273 65.0431264,54.6724173 C63.9025264,53.7974173 63.4611264,53.4693173 63.0079264,53.1841173 C57.4063264,55.4771173 51.3949264,55.8286173 45.8199264,54.4575173 L45.8203114,54.4575973 Z"></path>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

9
media/img/icons/nouns/all-stories.svg Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>all-stories</title>
<g id="all-stories" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g transform="translate(0.000000, 0.000000)" fill="#95968E" fill-rule="nonzero" id="Shape">
<path d="M25.9618,0 C17.3366,1.7148 9.9696,6.8828 5.2856,13.996 L17.1376,13.996 C19.1649,7.6562 22.2782,2.684 25.9618,0 L25.9618,0 Z M38.5276,0 C42.2112,2.6836 45.2971,7.6562 47.3518,13.996 L59.1758,13.996 C54.5235,6.8827 47.1288,1.715 38.5308,0 L38.5276,0 Z M33.844,1.1992 L33.844,13.9962 L44.211,13.9962 C41.8985,7.086 38.2735,2.1442 33.844,1.1992 L33.844,1.1992 Z M30.6174,1.23045 C26.2776,2.25775 22.7072,7.14065 20.4224,13.99645 L30.6174,13.99645 L30.6174,1.23045 Z M3.3984,17.25345 C1.4257,21.19485 0.2265,25.56205 -3.55271368e-15,30.21845 L14.508,30.21845 C14.62128,25.58955 15.22284,21.22235 16.2228,17.24945 L3.3988,17.24945 L3.3984,17.25345 Z M19.5074,17.25345 C18.5074,21.19485 17.9371,25.62065 17.8238,30.22245 L30.6208,30.22245 L30.6208,17.25345 L19.5074,17.25345 Z M33.8474,17.25345 L33.8474,30.22245 L46.8164,30.22245 C46.69921,25.62085 46.1289,21.19515 45.1289,17.25345 L33.8474,17.25345 Z M48.2734,17.25345 C49.24606,21.22225 49.8711,25.59325 49.9882,30.22245 L64.4962,30.22245 C64.26573,25.56225 63.0665,21.19515 61.0939,17.25345 L48.2699,17.25345 L48.2734,17.25345 Z M0.0004,33.47645 C0.22696,38.13265 1.4301,42.53115 3.3988,46.44545 L16.1958,46.44545 C15.22314,42.50015 14.6255,38.10165 14.5083,33.47645 L0.0004,33.47645 Z M17.8244,33.47645 C17.93768,38.10535 18.50799,42.50375 19.508,46.44545 L30.617,46.44545 L30.617,33.47645 L17.82,33.47645 L17.8244,33.47645 Z M33.8474,33.47645 L33.8474,46.44545 L45.1284,46.44545 C46.1284,42.50405 46.7261,38.10565 46.812,33.47645 L33.843,33.47645 L33.8474,33.47645 Z M49.9844,33.47645 C49.87112,38.10535 49.26956,42.50375 48.3008,46.44545 L61.0978,46.44545 C63.0705,42.53135 64.2697,38.13295 64.4962,33.47645 L49.9844,33.47645 Z M5.2854,49.69945 C9.9377,56.81275 17.3084,61.98045 25.9064,63.69545 C22.2502,61.01185 19.1642,56.03925 17.1369,49.69945 L5.2854,49.69945 Z M20.4224,49.69945 C22.7076,56.58225 26.2505,61.49645 30.6174,62.49645 L30.6174,49.69945 L20.4224,49.69945 Z M33.8484,49.69945 L33.8484,62.52345 C38.3015,61.58204 41.9304,56.64065 44.2154,49.69945 L33.8484,49.69945 Z M47.3604,49.69945 C45.3331,56.03925 42.2471,61.01145 38.5909,63.69545 C47.1886,61.98065 54.5559,56.81265 59.2119,49.69945 L47.3604,49.69945 Z"></path>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

9
media/img/icons/nouns/folder-closed.svg Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="90px" height="90px" viewBox="0 0 90 90" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>folder-closed</title>
<g id="folder-closed" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="noun-folder-977432-95978E" transform="translate(1.000000, 12.000000)" fill="#95968E" fill-rule="nonzero">
<path d="M73.7878387,17.999478 L78.2664326,17.999478 C80.8042014,17.999478 82.7450265,19.949564 82.7450265,22.4991717 L82.7450265,24.000554 L73.7877221,24.000554 L73.7878387,17.999478 Z M0.0341519079,32.0980808 L4.36240184,62.0999451 C4.66310143,64.3521357 6.60403151,66 8.84099574,66 L79.1597487,66 C81.4013784,66 83.3422035,64.3521357 83.6383426,62.0999451 L87.9665925,32.0980808 C88.276413,29.3103519 86.4039017,26.9986311 83.4879986,26.9986311 L4.51251253,26.9986311 C1.86090689,26.9986311 -0.298727591,29.0859415 0.0339186356,32.0980808 L0.0341519079,32.0980808 Z M70.7996212,4.49969372 L70.7996212,24.000554 L17.0560279,24.000554 L17.0560279,4.49969372 C17.0560279,1.94996884 18.9969696,0 21.5346218,0 L66.3205608,0 C68.8583296,0 70.7996212,1.95008602 70.7996212,4.49969372 L70.7996212,4.49969372 Z M63.3367754,17.999478 L23.0249982,17.999478 L23.0249982,20.9977895 L63.3332763,20.9977895 L63.3367754,17.999478 Z M63.3367754,11.9982848 L23.0249982,11.9982848 L23.0249982,14.9965963 L63.3332763,14.9965963 L63.3367754,11.9982848 Z M63.3367754,6.00166191 L31.9861516,6.00166191 L31.9861516,8.99997337 L63.3367754,8.99997337 L63.3367754,6.00166191 Z M14.0673438,6.00166191 L9.58874993,6.00166191 C7.05098114,6.00166191 5.11015603,7.95174793 5.11015603,10.5013556 L5.11015603,24.0011399 L14.0674605,24.0011399 L14.0673438,6.00166191 Z" id="Shape"></path>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

9
media/img/icons/nouns/folder-open.svg Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="92px" height="92px" viewBox="0 0 92 92" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>folder-open</title>
<g id="folder-open" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="noun-folder-977418-95978E" transform="translate(1.000000, 13.000000)" fill="#95968E" fill-rule="nonzero">
<path d="M90,16.5023145 L90,61.5002104 C90,64.0499896 88.0496818,66 85.4999238,66 L4.49995898,66 C1.95008379,66 0,64.0498724 0,61.5002104 L0,16.5023145 C0,13.9525353 1.95020099,12.0025168 4.49995898,12.0025168 L85.5046115,12.0025168 C88.0499162,11.9979475 90,13.9480821 90,16.5023145 L90,16.5023145 Z M39.9000738,8.99957919 L32.2505655,1.35035876 C31.3487337,0.448560983 30.3003645,0 29.1010161,0 L4.49995898,0 C1.95008379,0 3.55271368e-15,1.95012758 3.55271368e-15,4.49978959 L3.55271368e-15,10.5011106 C1.19934841,9.59931285 2.85199755,8.99969638 4.49995898,8.99969638 L39.9000738,8.99957919 Z" id="Shape"></path>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

19
media/img/icons/nouns/global-shares.svg Normal file
View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="118px" height="118px" viewBox="0 0 118 118" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>global-shares</title>
<g id="global-shares" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="noun-group-2235265-95978E" transform="translate(0.000000, 17.000000)" fill="#95968E" fill-rule="nonzero">
<path d="M40.7133551,32.09392 C40.5727351,31.17595 40.5024151,30.25012 40.5024151,29.33222 C40.5024151,21.98452 44.9086151,15.34822 51.5924151,12.44122 C49.2565151,9.23812 45.4986151,7.28892 41.5304151,7.28892 C34.6906151,7.28892 29.1244151,12.86312 29.1244151,19.71092 C29.1244151,26.28122 34.2533151,31.67192 40.7144151,32.09392 L40.7133551,32.09392 Z" id="Path"></path>
<path d="M23.6823551,24.15592 C23.3229851,22.71062 23.1393851,21.22622 23.1393851,19.71452 C23.1393851,11.95282 27.9987851,5.10152 35.1593851,2.46452 C33.0226851,0.86682 30.4405851,0.00362 27.7335851,0.00362 C20.9015851,0.00362 15.3425851,5.57002 15.3425851,12.40962 C15.3425851,17.74552 18.7605851,22.44062 23.6823851,24.15562 L23.6823551,24.15592 Z" id="Path"></path>
<path d="M47.4983551,43.76092 C45.3850551,42.09682 43.6663551,39.99142 42.4631551,37.58122 C42.1701851,37.565596 41.8615951,37.561689 41.5334651,37.561689 C30.4124651,37.561689 22.4354651,45.624189 17.1464651,62.206689 L13.8222651,72.683689 C13.7128851,73.027439 13.7910151,73.386809 14.0566351,73.750089 C14.5371051,74.406339 15.5097351,74.882889 16.3691351,74.882889 L27.2711351,74.882889 L28.8258351,70.003989 C33.0836351,56.601989 39.3568351,47.784989 47.4978351,43.761989 L47.4983551,43.76092 Z" id="Path"></path>
<path d="M26.4986551,30.31212 C16.0256551,30.89024 8.45565506,38.94102 3.37765506,54.90212 L0.057355057,65.39412 C0.010481057,65.53084 -0.114514943,65.91756 0.268295057,66.44882 C0.744855057,67.10507 1.71359506,67.58162 2.57689506,67.58162 L9.18239506,67.58162 L11.4714951,60.40192 C15.7292951,46.98392 22.0064951,38.16792 30.1354951,34.15592 C28.7447551,33.06212 27.5298551,31.77312 26.4986551,30.31212 Z" id="Path"></path>
<path d="M77.2683551,29.33192 C77.2683551,30.26942 77.2019491,31.19522 77.0691351,32.09362 C83.5418351,31.67174 88.6781351,26.28112 88.6781351,19.71462 C88.6781351,12.86692 83.1039351,7.29262 76.2561351,7.29262 C72.2717351,7.29262 68.5178351,9.23792 66.1901351,12.44102 C72.8620351,15.34332 77.2681351,21.98012 77.2681351,29.33202 L77.2683551,29.33192 Z" id="Path"></path>
<path d="M57.3813551,10.41792 L57.7172951,10.9687 C58.0962051,10.945263 58.4868251,10.925731 58.8891951,10.925731 C59.2876351,10.925731 59.6743551,10.945263 60.0571951,10.9687 L60.3931351,10.4062 C62.1236351,7.4609 64.5767351,5.0976 67.5376351,3.5156 C65.2251351,1.2695 62.1392351,0 58.8892351,0 C55.6275351,0 52.5415351,1.2656 50.2408351,3.5156 C53.2135351,5.1094 55.6666351,7.4726 57.3814351,10.4179 L57.3813551,10.41792 Z" id="Path"></path>
<path d="M94.6433551,19.71492 C94.6433551,21.22662 94.4597651,22.71492 94.1003851,24.15632 C99.0222851,22.44542 102.440185,17.75012 102.440185,12.41032 C102.440185,5.57052 96.8737851,0.00432 90.0341851,0.00432 C87.3310851,0.00432 84.7568851,0.8676 82.6200851,2.46522 C89.7841851,5.10582 94.6430851,11.95352 94.6430851,19.71522 L94.6433551,19.71492 Z" id="Path"></path>
<path d="M58.8893551,16.89392 C52.0416551,16.89392 46.4673551,22.47202 46.4673551,29.33192 C46.4673551,36.17172 52.0376551,41.73792 58.8893551,41.73792 C65.7331551,41.73792 71.2993551,36.17152 71.2993551,29.33192 C71.2993551,22.47642 65.7329551,16.89392 58.8893551,16.89392 Z" id="Path"></path>
<path d="M114.404355,54.90192 C109.322355,38.93692 101.752355,30.88592 91.2633551,30.31192 C90.2360551,31.77672 89.0172551,33.06192 87.6266551,34.15572 C95.7672551,38.16742 102.048655,46.98772 106.310655,60.39772 L108.599755,67.57742 L115.185655,67.57742 C116.048935,67.57742 117.021555,67.10476 117.502055,66.44852 C117.763775,66.09305 117.841895,65.73368 117.732525,65.38602 L114.404355,54.90192 Z" id="Path"></path>
<path d="M83.2523551,71.79692 C77.9906551,55.23492 70.0253551,47.18392 58.8933551,47.18392 C47.7763551,47.18392 39.7993551,55.23472 34.5063551,71.80092 L31.1860551,82.28892 C31.1430861,82.42173 31.0180851,82.80845 31.4087151,83.34362 C31.8852751,83.99987 32.8579151,84.47642 33.7212151,84.47642 L84.0652151,84.472514 C84.9284951,84.472514 85.8972151,83.995954 86.3738151,83.343614 C86.7566251,82.816274 86.6316251,82.425644 86.5886551,82.300614 L83.2523551,71.79692 Z" id="Path"></path>
<path d="M100.624355,62.20692 C95.3548551,45.62492 87.3823551,37.56192 76.2533551,37.56192 C75.9174151,37.56192 75.6088251,37.569733 75.3197651,37.581451 C74.1049651,39.987651 72.3822651,42.097051 70.2689651,43.768951 C78.4173651,47.780651 84.6989651,56.592951 88.9599651,69.998951 L90.5146651,74.877851 L101.432665,74.877851 C102.288135,74.877851 103.256865,74.397381 103.741265,73.733351 C104.002985,73.373971 104.077205,73.022411 103.967825,72.682551 L100.624355,62.20692 Z" id="Path"></path>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 5 KiB

4
media/img/icons/nouns/home.svg Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="128pt" height="128pt" version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
<path d="m118.81 51.227-51.594-41.422c-1.8789-1.5117-4.4102-1.5117-6.2891 0.003906l-51.746 41.645c-2.4219 1.9492-2.9727 5.7266-1.2344 8.4414 1.0547 1.6445 2.7109 2.5234 4.3867 2.5234 1.0898 0 2.1914-0.37109 3.1445-1.1367l48.598-39.117 48.449 38.895c2.4219 1.9453 5.7969 1.3203 7.5312-1.3945 1.7305-2.7148 1.1758-6.4922-1.2461-8.4375zm-98.172 11.977 12.555 56.125h18.363v-33.945h24.887v33.945h18.367l12.555-56.125-43.367-33.945z" fill="#95968e"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 599 B

9
media/img/icons/nouns/saved-stories.svg Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="99px" height="98px" viewBox="0 0 99 98" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>saved-stories</title>
<g id="saved-stories" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="noun-history-2712044-95978E" transform="translate(6.000000, 6.000000)" fill="#95968E" fill-rule="nonzero">
<path d="M43,0 C31.5957857,0 20.6568929,4.52912857 12.5943929,12.5943929 C4.52882143,20.6568929 0,31.5957857 0,43 C0,54.4042143 4.52912857,65.3431071 12.5943929,73.4056071 C20.6568929,81.4711786 31.5957857,86 43,86 C54.4042143,86 65.3431071,81.4708714 73.4056071,73.4056071 C81.4711786,65.3431071 86,54.4042143 86,43 C86,31.5957857 81.4708714,20.6568929 73.4056071,12.5943929 C65.3431071,4.52882143 54.4042143,0 43,0 Z M57.1276377,57.1034979 C55.9588387,58.298834 54.0694577,58.298834 52.897734,57.1034979 L40.8992838,44.7709097 C40.3280676,44.1928196 40.0029246,43.4070025 40,42.5820294 L40,24.0831471 C40,22.3790146 41.3416517,21 42.9996126,21 C44.6575734,21 45.9992251,22.3790146 45.9992251,24.0831471 L45.9992251,41.3171683 L57.1277877,52.7556439 C58.2907374,53.9599983 58.2907374,55.9019955 57.1277877,57.1033438 L57.1276377,57.1034979 Z" id="Shape"></path>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

9
media/img/icons/nouns/search-filled.svg Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="142px" height="142px" viewBox="0 0 142 142" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>search-filled</title>
<g id="search-filled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="noun-search-2738105-95978E" transform="translate(-0.260265, -0.288897)" fill="#95968E" fill-rule="nonzero">
<path d="M86.049,98.7923 L113.08,125.8233 C116.5995,129.3428 122.3027,129.3428 125.822,125.8233 C129.3415,122.3038 129.3415,116.6006 125.822,113.0813 L98.791,86.0503 C106.5879,74.4253 108.7637,59.9213 104.7246,46.5193 C100.6816,33.1213 90.8456,22.2383 77.9196,16.8673 C64.9936,11.4962 50.3416,12.1993 37.9936,18.7892 C25.6456,25.3751 16.8996,37.1522 14.1616,50.8792 C11.4272,64.6062 14.98582,78.8362 23.8647,89.6562 C32.7436,100.4762 46.0057,106.7462 60.0017,106.7422 C69.2832,106.753219 78.354,103.9837 86.049,98.7923 Z M8,0 L134,0 C138.418278,-8.11624501e-16 142,3.581722 142,8 L142,134 C142,138.418278 138.418278,142 134,142 L8,142 C3.581722,142 -2.12345226e-15,138.418278 0,134 L0,8 C-5.41083001e-16,3.581722 3.581722,-1.85291076e-15 8,0 Z M60.002,24.0735 C69.5293,24.0735 78.666,27.8587 85.404,34.5965 C92.142,41.3343 95.927,50.4715 95.927,60.0025 C95.927,69.5298 92.1418,78.6665 85.404,85.4045 C78.6662,92.1425 69.529,95.9275 60.002,95.9275 C50.4708,95.9275 41.334,92.1423 34.596,85.4045 C27.858,78.6667 24.073,69.5295 24.073,60.0025 C24.084718,50.4752 27.8738,41.3425 34.608,34.6075 C41.3422,27.8725 50.475,24.0845 60.003,24.0725 L60.002,24.0735 Z" id="Shape"></path>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

9
media/img/icons/nouns/search.svg Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="142px" height="142px" viewBox="0 0 142 142" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>search</title>
<g id="search" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="noun-search-2738105-95978E" transform="translate(13.000000, 13.000000)" fill="#95968E" fill-rule="nonzero">
<path d="M46.7417349,93.4526026 C56.0229349,93.4643216 65.0937349,90.6948026 72.7887349,85.5034026 L99.8197349,112.534403 C103.339235,116.053903 109.042435,116.053903 112.561735,112.534403 C116.081235,109.014903 116.081235,103.311703 112.561735,99.7924026 L85.5307349,72.7614026 C93.3276349,61.1364026 95.5034349,46.6324026 91.4643349,33.2304026 C87.4213349,19.8324026 77.5853349,8.94940262 64.6593349,3.57840262 C51.7333349,-1.79269738 37.0813349,-1.08959738 24.7333349,5.50030262 C12.3853349,12.0862026 3.63933489,23.8633026 0.901334886,37.5903026 C-1.83306511,51.3173026 1.72555489,65.5473026 10.6044349,76.3673026 C19.4833349,87.1873026 32.7454349,93.4573026 46.7414349,93.4533026 L46.7417349,93.4526026 Z M46.7417349,10.7846026 C56.2690349,10.7846026 65.4057349,14.5698026 72.1437349,21.3076026 C78.8817349,28.0454026 82.6667349,37.1826026 82.6667349,46.7136026 C82.6667349,56.2409026 78.8815349,65.3776026 72.1437349,72.1156026 C65.4059349,78.8536026 56.2687349,82.6386026 46.7417349,82.6386026 C37.2105349,82.6386026 28.0737349,78.8534026 21.3357349,72.1156026 C14.5977349,65.3778026 10.8127349,56.2406026 10.8127349,46.7136026 C10.8244529,37.1863026 14.6135349,28.0536026 21.3477349,21.3186026 C28.0819349,14.5836026 37.2147349,10.7956026 46.7427349,10.7836026 L46.7417349,10.7846026 Z" id="Shape"></path>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

9
media/img/icons/nouns/tag.svg Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="95px" height="95px" viewBox="0 0 95 95" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>tag</title>
<g id="tag" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="noun-tag-1014275-95978E" transform="translate(11.000000, 11.000000)" fill="#95968E" fill-rule="nonzero">
<path d="M69.5597091,2.43515364 C68.0004624,0.87710288 65.9532321,0 63.7096201,0 L40.7973998,0 C38.1639952,0.098123173 35.7269722,1.1685571 33.8731529,3.02095454 L3.54824505,33.3195575 C-1.03419901,37.9966022 -1.2276099,45.3050317 3.25663567,49.7860737 L22.2709295,68.7857829 C24.4163507,70.9295585 27.3413571,72 30.1680965,72 C33.19137,72 36.3097873,70.8314429 38.6518187,68.4914362 L68.9767265,38.1897886 C70.8305459,36.3373912 71.9017329,33.9022375 72,31.1757058 L71.9970246,8.28105994 C71.9970246,6.03916884 71.1192484,3.99350886 69.5600017,2.43545811 L69.5597091,2.43515364 Z M56.0746904,25.8908373 C54.7394924,27.2922256 52.935467,27.9603554 51.1313893,27.9603554 C49.3273639,27.9603554 47.5253215,27.2922777 46.1880883,25.8908373 C43.4504262,23.2204559 43.4504262,18.7496229 46.1880883,16.0120271 C48.8605195,13.2764649 53.3347844,13.2764649 56.0744817,16.0120271 C58.8121437,18.6824084 58.8121437,23.1532414 56.0744817,25.8908373 L56.0746904,25.8908373 Z" id="Shape"></path>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

4
media/img/icons/nouns/world.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 17 KiB

2
media/js/newsblur/common/modal.js
View file

@ -99,7 +99,7 @@ NEWSBLUR.Modal.prototype = {
this.folder_title = folder_title;
this.folder = this.model.get_folder(folder_title);
$('.NB-modal-subtitle .NB-modal-feed-image', this.$modal).attr('src', NEWSBLUR.Globals.MEDIA_URL + '/img/icons/circular/g_icn_folder.png');
$('.NB-modal-subtitle .NB-modal-feed-image', this.$modal).attr('src', NEWSBLUR.Globals.MEDIA_URL + '/img/icons/nouns/folder-open.svg');
$('.NB-modal-subtitle .NB-modal-feed-title', this.$modal).html(this.folder_title);
$('.NB-modal-subtitle .NB-modal-feed-subscribers', this.$modal).hide();
},

10
media/js/newsblur/models/saved_searches.js
View file

@ -13,15 +13,15 @@ NEWSBLUR.Models.SavedSearchFeed = Backbone.Model.extend({
var feed_id = this.get('feed_id');
if (feed_id == 'river:' || feed_id == 'river:infrequent') {
url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/ak-icon-allstories.png';
url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/all-stories.svg';
} else if (_.string.startsWith(feed_id, 'river:')) {
url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/g_icn_folder.png';
url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/folder-open.svg';
} else if (feed_id == "read") {
url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/g_icn_unread.png';
} else if (feed_id == "starred") {
url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/clock.png';
url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/saved-stories.svg';
} else if (_.string.startsWith(feed_id, 'starred:')) {
url = NEWSBLUR.Globals.MEDIA_URL + 'img/reader/tag.png';
url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/tag.svg';
} else if (_.string.startsWith(feed_id, 'feed:')) {
url = $.favicon(parseInt(feed_id.replace('feed:', ''), 10));
} else if (_.string.startsWith(feed_id, 'social:')) {
@ -29,7 +29,7 @@ NEWSBLUR.Models.SavedSearchFeed = Backbone.Model.extend({
}
if (!url) {
url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/g_icn_search_black.png';
url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/search.svg';
}
return url;

3
media/js/newsblur/reader/reader.js
View file

@ -43,6 +43,7 @@
$feed_link_error: $('.NB-feeds-list-error'),
$feeds_progress: $('#NB-progress'),
$dashboard: $('.NB-feeds-header-dashboard'),
$header_dashboard: $('.NB-feeds-header-river-dashboard'),
$river_sites_header: $('.NB-feeds-header-river-sites'),
$river_infrequent_header: $('.NB-feeds-header-river-infrequent'),
$river_blurblogs_header: $('.NB-feeds-header-river-blurblogs'),
@ -565,6 +566,7 @@
}
this.$s.$body.addClass('NB-show-reader');
this.flags['splash_page_frontmost'] = false;
this.$s.$header_dashboard.removeClass('NB-selected');
if (resize) {
this.$s.$layout.layout().resizeAll();
@ -581,6 +583,7 @@
this.reset_feed();
this.open_sidebar();
this.$s.$body.removeClass('NB-show-reader');
this.$s.$header_dashboard.addClass('NB-selected');
this.flags['splash_page_frontmost'] = true;
if (!skip_router) {

9
media/js/newsblur/views/sidebar.js
View file

@ -10,7 +10,8 @@ NEWSBLUR.Views.Sidebar = Backbone.View.extend({
"click .NB-feeds-header-river-infrequent": "open_river_infrequent_stories",
"click .NB-feeds-header-river-blurblogs .NB-feedlist-collapse-icon": "collapse_river_blurblog",
"click .NB-feeds-header-river-blurblogs": "open_river_blurblogs_stories",
"click .NB-feeds-header-river-global": "open_river_global_stories"
"click .NB-feeds-header-river-global": "open_river_global_stories",
"click .NB-feeds-header-river-dashboard": "show_splash_page"
},
initialize: function() {},
@ -163,6 +164,10 @@ NEWSBLUR.Views.Sidebar = Backbone.View.extend({
// = Events =
// ==========
show_splash_page: function() {
NEWSBLUR.reader.show_splash_page();
},
open_starred_stories: function() {
return NEWSBLUR.reader.open_starred_stories();
},
@ -274,4 +279,4 @@ NEWSBLUR.Views.Sidebar = Backbone.View.extend({
return NEWSBLUR.reader.open_river_blurblogs_stories({'global': true});
}
});
});

7
media/js/newsblur/views/sidebar_header_view.js
View file

@ -5,7 +5,6 @@ NEWSBLUR.Views.SidebarHeader = Backbone.View.extend({
},
events: {
'click .NB-feeds-header-user-dashboard' : 'show_splash_page',
'click .NB-feeds-header-user-interactions' : 'show_interactions_popover',
'click .NB-feeds-header-collapse-sidebar' : 'collapse_sidebar'
},
@ -114,10 +113,6 @@ NEWSBLUR.Views.SidebarHeader = Backbone.View.extend({
// = Events =
// ==========
show_splash_page: function() {
NEWSBLUR.reader.show_splash_page();
},
show_interactions_popover: function() {
NEWSBLUR.InteractionsPopover.create({});
},
@ -128,4 +123,4 @@ NEWSBLUR.Views.SidebarHeader = Backbone.View.extend({
}
}
});
});

18
media/js/vendor/jquery.newsblur.js vendored
View file

@ -233,7 +233,7 @@ NEWSBLUR.log = function(msg) {
},
favicon: function (feed, empty_on_missing) {
var empty_icon = NEWSBLUR.Globals.MEDIA_URL + '/img/icons/circular/world.png';
var empty_icon = NEWSBLUR.Globals.MEDIA_URL + '/img/icons/nouns/world.svg';
if (!feed) return empty_icon;
// console.log(['Favicon', feed]);
@ -243,23 +243,23 @@ NEWSBLUR.log = function(msg) {
else if (_.isString(feed)) {
var feed_id = feed;
if (feed_id == 'river:')
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/ak-icon-allstories.png';
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/all-stories.svg';
if (feed_id == 'river:infrequent')
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/noun_turtle.png';
if (feed_id == 'river:blurblogs')
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/ak-icon-blurblogs.png';
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/all-shares.svg';
if (feed_id == 'river:global')
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/ak-icon-global.png';
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/global-shares.svg';
if (_.string.startsWith(feed_id, 'river:'))
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/g_icn_folder.png';
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/folder-open.svg';
if (feed_id == "read")
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/g_icn_unread32.png';
if (feed_id == "starred")
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/clock.png';
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/saved-stories.svg';
if (feed_id == "searches")
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/g_icn_search_black.png';
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/search.svg';
if (_.string.startsWith(feed_id, 'starred:'))
return NEWSBLUR.Globals.MEDIA_URL + 'img/reader/tag.png';
return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/tag.svg';
if (_.string.startsWith(feed_id, 'feed:'))
return $.favicon(parseInt(feed_id.replace('feed:', ''), 10));
if (_.string.startsWith(feed_id, 'social:'))
@ -284,7 +284,7 @@ NEWSBLUR.log = function(msg) {
if (feed.get('favicon_url'))
return feed.get('favicon_url');
if (feed.is_starred())
return NEWSBLUR.Globals.MEDIA_URL + '/img/reader/tag.png';
return NEWSBLUR.Globals.MEDIA_URL + '/img/icons/nouns/tag.svg';
if (feed.get('is_newsletter'))
return NEWSBLUR.Globals.MEDIA_URL + '/img/icons/circular/email.png';

6
node/favicons.coffee
View file

@ -68,9 +68,9 @@ favicons = (app) =>
else
if ENV_DEBUG
log.debug "Redirect: #{feed_id}, etag: #{etag}/#{docs?.color} " + if err then "(err: #{err})" else ""
if ENV_DEV
res.redirect '/media/img/icons/circular/world.png'
if ENV_DEV or ENV_DOCKER
res.redirect '/media/img/icons/nouns/world.svg'
else
res.redirect 'https://www.newsblur.com/media/img/icons/circular/world.png'
res.redirect 'https://www.newsblur.com/media/img/icons/nouns/world.svg'
exports.favicons = favicons

6
node/favicons.js
View file

@ -85,10 +85,10 @@
if (ENV_DEBUG) {
log.debug(`Redirect: ${feed_id}, etag: ${etag}/${docs != null ? docs.color : void 0} ` + (err ? `(err: ${err})` : ""));
}
if (ENV_DEV) {
return res.redirect('/media/img/icons/circular/world.png');
if (ENV_DEV || ENV_DOCKER) {
return res.redirect('/media/img/icons/nouns/world.svg');
} else {
return res.redirect('https://www.newsblur.com/media/img/icons/circular/world.png');
return res.redirect('https://www.newsblur.com/media/img/icons/nouns/world.svg');
}
}
});

2
templates/reader/activities_module.xhtml
View file

@ -71,7 +71,7 @@
{% endif %}
{% if activity.category == 'star' %}
<img class="NB-interaction-photo" src="{{ MEDIA_URL }}img/icons/circular/clock.png">
<img class="NB-interaction-photo" src="{{ MEDIA_URL }}img/icons/nouns/saved-stories.svg">
<div class="NB-interaction-title">
You saved "<span class="NB-interaction-starred-story-title NB-splash-link">{{ activity.content|safe|truncatewords:6 }}</span>".
</div>

79
templates/reader/feeds_skeleton.xhtml
View file

@ -24,9 +24,6 @@
<div class="NB-feeds-header-user-interactions-badge NB-hidden"></div>
<img src="{{ MEDIA_URL }}/img/icons/circular/nav_icn_activity_active.png">
</div>
<div class="NB-feeds-header-user-dashboard" role="button">
<img src="{{ MEDIA_URL }}/img/icons/circular/nav_icn_dashboard_active.png">
</div>
<div class="NB-feeds-header-dashboard"></div>
</div>
<div class="NB-feeds-selector">
@ -42,13 +39,56 @@
Something went wrong...
<div class="NB-button NB-feeds-list-retry">Retry</div>
</div>
<div class="NB-feeds-header-wrapper">
<div class="NB-feeds-header-container NB-feeds-header-tryfeed-container">
<div class="NB-feeds-header NB-feeds-header-tryfeed">
<img class="NB-feeds-header-icon" src="" />
<div class="NB-feeds-header-title"></div>
</div>
</div>
<div class="NB-feeds-header-container NB-feeds-header-river-container NB-feeds-header-river-dashboard-container">
<div class="NB-feeds-header NB-feeds-header-river-dashboard NB-empty" role="link">
<img class="NB-feeds-header-icon" src="{{ MEDIA_URL }}img/icons/nouns/home.svg" />
<div class="NB-feeds-header-title">
NewsBlur Dashboard
</div>
</div>
</div>
<div class="NB-feeds-header-container NB-feeds-header-river-container NB-feeds-header-river-infrequent-container">
<div class="NB-feeds-header NB-feeds-header-river-infrequent NB-empty" role="link">
<div class="NB-feeds-header-count unread_count"></div>
<img class="NB-feeds-header-icon" src="" />
<div class="NB-feeds-header-title">
Infrequent Site Stories
</div>
</div>
</div>
<div class="NB-feeds-header-container NB-feeds-header-river-container NB-feeds-header-river-sites-container">
<div class="NB-feeds-header NB-feeds-header-river-sites NB-empty" role="link">
<div class="NB-feeds-header-count unread_count"></div>
<img class="NB-feeds-header-icon" src="" />
<div class="NB-feeds-header-title">
All Site Stories
</div>
</div>
</div>
</div>
<ul class="folder NB-feedlist" id="feed_list"></ul>
<div class="NB-feeds-header-container NB-feeds-header-read-container NB-hidden">
<div class="NB-feeds-header NB-feeds-header-read" role="link">
<img class="NB-feeds-header-icon" src="" />
<div class="NB-feeds-header-title">
Read Stories
</div>
</div>
</div>
<div class="NB-feeds-header-container NB-feeds-header-river-container NB-feeds-header-river-global-container">
@ -75,37 +115,6 @@
<div class="NB-socialfeeds-folder">
<ul class="NB-socialfeeds NB-feedlist"></ul>
</div>
<div class="NB-feeds-header-container NB-feeds-header-river-container NB-feeds-header-river-infrequent-container">
<div class="NB-feeds-header NB-feeds-header-river-infrequent NB-empty" role="link">
<div class="NB-feeds-header-count unread_count"></div>
<img class="NB-feeds-header-icon" src="" />
<div class="NB-feeds-header-title">
Infrequent Site Stories
</div>
</div>
</div>
<div class="NB-feeds-header-container NB-feeds-header-river-container NB-feeds-header-river-sites-container">
<div class="NB-feeds-header NB-feeds-header-river-sites NB-empty" role="link">
<div class="NB-feeds-header-count unread_count"></div>
<img class="NB-feeds-header-icon" src="" />
<div class="NB-feeds-header-title">
All Site Stories
</div>
</div>
</div>
<ul class="folder NB-feedlist" id="feed_list"></ul>
<div class="NB-feeds-header-container NB-feeds-header-read-container NB-hidden">
<div class="NB-feeds-header NB-feeds-header-read" role="link">
<img class="NB-feeds-header-icon" src="" />
<div class="NB-feeds-header-title">
Read Stories
</div>
</div>
</div>
<div class="NB-feeds-header-container NB-feeds-header-searches-container NB-hidden">
@ -187,7 +196,7 @@
<span class="NB-intelligence-label">Focus</span>
</li>
<li class="NB-intelligence-slider-control NB-intelligence-slider-blue" role="button">
<img src="{{ MEDIA_URL }}embed/icons/circular/clock.png">
<img src="{{ MEDIA_URL }}embed/icons/nouns/saved-stories.svg">
<span class="NB-intelligence-label">Saved</span>
</li>
</ul>