diff options
-rw-r--r-- | css/news.css | 39 | ||||
-rw-r--r-- | img/active_star.svg | 8 | ||||
-rw-r--r-- | img/starred.svg | 78 | ||||
-rw-r--r-- | templates/main.php | 3 |
4 files changed, 115 insertions, 13 deletions
diff --git a/css/news.css b/css/news.css index 00e4c1ac9..94d886813 100644 --- a/css/news.css +++ b/css/news.css @@ -140,6 +140,7 @@ div.feed_controls { bottom: 0; } + /* #leftcontent h1 { background-color: #DBDBDB; border-bottom: 1px solid #CCCCCC; @@ -152,12 +153,12 @@ div.feed_controls { padding: 0 0.8em; text-shadow: 0 1px 0 #F8F8F8; line-height: 2.6em; - } + }*/ #feeds { background-color: #f8f8f8; position: absolute; - top: 3.3em; + top: 0; bottom: 2.8em; left: 0; right: 0; @@ -170,9 +171,34 @@ div.feed_controls { overflow: auto; } - #feeds li { + + #feeds .subscriptions, #feeds .subscriptions:hover { + background-image: url('%appswebroot%/news/img/icon.svg'); + background-repeat: no-repeat; + background-size: 16px 16px; + background-position: .8em center; } + #feeds .starred, #feeds .starred:hover { + background-image: url('%appswebroot%/news/img/starred.svg'); + background-repeat: no-repeat; + background-size: 16px 16px; + background-position: .8em center; + + } + + #feeds .folder:hover { + background-color: #d0d0d0; + -moz-transition: background-color 200ms ease 0s; + transition: background-color 200ms ease 0s; + } + + #feeds .subscriptions a, #feeds .starred a { + margin-left: 2em; + display: inline-block; + width: 75%; + } + #feeds li.feed { position: relative; text-align: right; @@ -272,7 +298,7 @@ div.feed_controls { display: none !important; } - #feeds li.collapsable_container { + #feeds li.collapsable_container, #feeds .folder { background-color: #dfdfdf; font-weight: bold; padding: 0; @@ -321,9 +347,6 @@ div.feed_controls { border-radius: 5px; } - #feeds div.collapsable:hover { - background-image: none; - } #feeds .collapsable_trigger { border: none ; @@ -349,7 +372,7 @@ div.feed_controls { transform: rotate(-90deg); } - #feeds .collapsable_title { + #feeds .collapsable_title, #feeds .folder a { padding: .5em 0 .5em .5em; line-height: 1.5em; float: none; diff --git a/img/active_star.svg b/img/active_star.svg index 6c196217e..39c608975 100644 --- a/img/active_star.svg +++ b/img/active_star.svg @@ -14,7 +14,7 @@ id="svg2" version="1.1" inkscape:version="0.48.3.1 r9886" - sodipodi:docname="inactive_star.svg"> + sodipodi:docname="active_star.svg"> <defs id="defs4" /> <sodipodi:namedview @@ -25,7 +25,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="2.8" - inkscape:cx="108.52005" + inkscape:cx="44.591479" inkscape:cy="134.37797" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -47,7 +47,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> @@ -58,7 +58,7 @@ transform="translate(-148.03866,-745.93365)"> <path sodipodi:type="star" - style="fill:#ffdd55;fill-opacity:1;stroke:none" + style="fill:#ffcc00;fill-opacity:1;stroke:none" id="path2987" sodipodi:sides="5" sodipodi:cx="330" diff --git a/img/starred.svg b/img/starred.svg new file mode 100644 index 000000000..d31fd5f6e --- /dev/null +++ b/img/starred.svg @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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" + width="322.00055" + height="306.45065" + id="svg2" + version="1.1" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="active_star.svg"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="2.8" + inkscape:cx="44.591479" + inkscape:cy="134.37797" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-width="1920" + inkscape:window-height="1021" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-148.03866,-745.93365)"> + <path + sodipodi:type="star" + style="fill:#ffcc00;fill-opacity:1;stroke:#000000;stroke-opacity:0.57894736999999996;" + id="path2987" + sodipodi:sides="5" + sodipodi:cx="330" + sodipodi:cy="1027.7194" + sodipodi:r1="169.28609" + sodipodi:r2="84.643051" + sodipodi:arg1="-1.5686866" + sodipodi:arg2="-0.94036809" + inkscape:flatsided="false" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 330.35715,858.43365 49.53914,100.91316 111.21435,16.40006 -80.66568,78.29843 18.76975,110.839 -99.39328,-52.5221 -99.61401,52.1023 19.23725,-110.7589 -80.33458,-78.63807 111.28255,-15.93065 z" + inkscape:transform-center-x="-0.11036321" + inkscape:transform-center-y="-16.060386" + transform="translate(-21.071429,-112.5)" /> + </g> +</svg> diff --git a/templates/main.php b/templates/main.php index 61cfc5ec9..e3b17264a 100644 --- a/templates/main.php +++ b/templates/main.php @@ -10,9 +10,10 @@ echo $this->inc("part.items.header"); ?> <div id="leftcontent" class="leftcontent"> - <h1><?php echo $l->t('Subscriptions'); ?></h1> <div id="feeds"> <ul> + <li data-id="-2" class="subscriptions folder"><a href="#" ><?php echo $l->t('Subscriptions'); ?></a></li> + <li data-id="-1" class="starred folder"><a href="#" ><?php echo $l->t('Starred'); ?></a></li> <?php echo $this->inc("part.feeds"); ?> </ul> </div> |