summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--css/news.css4
-rw-r--r--img/rss.svg72
-rw-r--r--templates/main.php4
3 files changed, 78 insertions, 2 deletions
diff --git a/css/news.css b/css/news.css
index 1e8598f73..338e60903 100644
--- a/css/news.css
+++ b/css/news.css
@@ -15,6 +15,9 @@ li { padding-right: 0px !important; }
/* #dropdownBtn { background: url('%webroot%/core/img/actions/triangle-s.svg') no-repeat right center; } */
#dropdownBtn { width: 9em; padding-left: 0; padding-right:20px; background: url('%webroot%/core/img/actions/triangle-s.svg') no-repeat right center; }
+#addfolder { background: url('%webroot%/core/img/places/folder.svg') no-repeat left center; padding-left: 20px; }
+#addfeed { background: url('%appswebroot%/apps/news/img/rss.svg') no-repeat left center; padding-left: 20px; }
+
ul.controls li { float: left; }
.accordion .title_unread { background: #DCDCDC; font-size: 12px; border-bottom:1px solid #ccc; font-weight:bold;}
@@ -37,6 +40,7 @@ ul#dropdownmenu { left: 0em; }
ul#fademenu { left: -0.3em; margin-left: 0.3em; top: -4.5em; }
ul#fademenu :after {
+ text-align:left;
content:"";
position:absolute;
bottom:-1em; /* value = - border-top-width - border-bottom-width */
diff --git a/img/rss.svg b/img/rss.svg
new file mode 100644
index 000000000..ca9f859ba
--- /dev/null
+++ b/img/rss.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.0"
+ id="Layer_1"
+ x="0px"
+ y="0px"
+ width="16"
+ height="16"
+ viewBox="0 0 16 16"
+ enable-background="new 0 0 98.918 100"
+ xml:space="preserve"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="rss.svg"><metadata
+ id="metadata13"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+ id="defs11" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1680"
+ inkscape:window-height="976"
+ id="namedview9"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="4.72"
+ inkscape:cx="-86.538136"
+ inkscape:cy="20.436284"
+ inkscape:window-x="-3"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="Layer_1" />
+<ellipse
+ cx="13.566"
+ cy="86.286003"
+ rx="13.566"
+ ry="13.714"
+ id="ellipse3"
+ sodipodi:cx="13.566"
+ sodipodi:cy="86.286003"
+ sodipodi:rx="13.566"
+ sodipodi:ry="13.714"
+ transform="matrix(0.14557513,0,0,0.144,0.8,0.7999996)"
+ style="fill:#282828;opacity:1;fill-opacity:0.88235295" />
+<path
+ d="M 10.345216,15.2 H 7.5474071 C 7.5474071,11.473424 4.526432,8.4524476 0.8,8.4524476 l 0,0 v -2.797488 c 5.2718571,0 9.545216,4.2733444 9.545216,9.5450404 z"
+ id="path5"
+ inkscape:connector-curvature="0"
+ style="fill:#282828;opacity:1;fill-opacity:0.88235295" />
+<path
+ d="M 12.320087,15.2 C 12.320087,8.8376476 7.1625059,3.6799996 0.8,3.6799996 v -2.88 c 7.9529148,0 14.4,6.447168 14.4,14.4000004 h -2.879913 z"
+ id="path7"
+ inkscape:connector-curvature="0"
+ style="fill:#282828;opacity:1;fill-opacity:0.88235295" />
+</svg> \ No newline at end of file
diff --git a/templates/main.php b/templates/main.php
index a52c4235e..3562518dc 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -10,8 +10,8 @@
<li>
<button class="svg" id="addfeedfolder" title="<?php echo $l->t('Add Feed/Folder'); ?>" onclick="News.DropDownMenu.fade(this)"><img class="svg" src="<?php echo OCP\Util::linkTo('news', 'img/add.svg'); ?>" alt="<?php echo $l->t('Add Feed/Folder'); ?>" /></button>
<ul class="menu" id="fademenu">
- <li class="menuItem" id="addfeed"><?php echo $l->t('Add Feed'); ?></li>
- <li class="menuItem" id="addfolder"><?php echo $l->t('Add Folder'); ?></li>
+ <li class="menuItem" id="addfeed"><?php echo $l->t('Feed'); ?></li>
+ <li class="menuItem" id="addfolder"><?php echo $l->t('Folder'); ?></li>
</ul>
</li>
<li><button class="sv" title="<?php echo $l->t('Change View'); ?>">Eye</button></li>