From 90584316b8f275fcad904b644676544eb0322636 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Mon, 19 May 2014 02:22:02 +0200 Subject: add test for firstrun page --- css/addnew.css | 16 +- css/app.css | 13 ++ css/content.css | 474 +++++++++++++++++++++++++++++++++++++++++++++++++++++ css/feeds.css | 290 -------------------------------- css/firstrun.css | 41 ----- css/items.css | 463 --------------------------------------------------- css/navigation.css | 295 +++++++++++++++++++++++++++++++++ css/owncloud6.css | 11 +- 8 files changed, 791 insertions(+), 812 deletions(-) create mode 100644 css/app.css create mode 100644 css/content.css delete mode 100644 css/feeds.css delete mode 100644 css/firstrun.css delete mode 100644 css/items.css create mode 100644 css/navigation.css (limited to 'css') diff --git a/css/addnew.css b/css/addnew.css index 24cdd6000..d289ecb4e 100644 --- a/css/addnew.css +++ b/css/addnew.css @@ -31,11 +31,11 @@ } .add-new input[type=text] { - width: 120px; + width: 170px; } .add-new select { - width: 133px; + width: 170px; margin-top: 1px !important; height: 30px; background-color: #eee; @@ -46,7 +46,7 @@ box-sizing: border-box; } -.add-new input, +.add-new input, .add-new select { margin: 0 0 5px 0; display: inline-block; @@ -69,7 +69,7 @@ .add-new .action-button { width: 30px; background-position: center; - background-repeat: no-repeat; + background-repeat: no-repeat; } .add-new .back-button { @@ -80,15 +80,15 @@ .add-new .new-button { border-radius: 0; background-image: url('../img/add.svg'); - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; + border-top-right-radius: 5px; + border-bottom-right-radius: 5px; } .add-new .create-button { border-radius: 0; background-image: url('../img/mark_read.svg'); - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; + border-top-right-radius: 5px; + border-bottom-right-radius: 5px; } .add-new .error { diff --git a/css/app.css b/css/app.css new file mode 100644 index 000000000..bf1e695a1 --- /dev/null +++ b/css/app.css @@ -0,0 +1,13 @@ +.loading-icon { + background-image: url('../img/loading.gif'); + background-position: center; + background-repeat: no-repeat; +} + +#global-loading { + width: 100%; + height: 100%; +} + + + diff --git a/css/content.css b/css/content.css new file mode 100644 index 000000000..4c071451b --- /dev/null +++ b/css/content.css @@ -0,0 +1,474 @@ +/** + * ownCloud - News + * + * @author Bernhard Posselt + * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see . + * + */ + +#first-run { + height: 100%; + width: 100%; + display: table; +} + +#first-run h1 { + color: #888888; + font-size: 1.5em; + font-weight: bold; + text-shadow: 0 1px 0 #FFFFFF; + display: table-cell; + text-align: center; + vertical-align: middle; +} + +#app-content:after { + content: ''; + display: block; + height: 100%; +} + +#app-content.autopaging:after { + content: ''; + background-image: url('../img/loading.gif'); + background-position: center; + background-repeat: no-repeat; + background-size: 18px; + display: block; + height: 100%; +} + + +#app-content.loading > ul { + display: none; +} + + +.pull-refresh { + -webkit-transition: height 0.5s; + -moz-transition: height 0.5s; + transition: height 0.5s; + background-image: url('../img/loading.gif'), linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%); + background-image: url('../img/loading.gif'), -o-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%); + background-image: url('../img/loading.gif'), -moz-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%); + background-image: url('../img/loading.gif'), -webkit-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%); + background-image: url('../img/loading.gif'), -ms-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%); + background-position: center 45px, center; + background-repeat: no-repeat; + background-size: 18px, 100%; + height: 0; + width: 100%; +} + +.refresh { + height: 80px; +} + +/** + * Rules for a single feed item + */ +.feed_item { + border-top: 1px solid #ccc; + min-height: 120px; + background-image: linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 84px); + background-image: -o-linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 84px); + background-image: -moz-linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 84px); + background-image: -webkit-linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 84px); + background-image: -ms-linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 84px); + padding: 35px 0 0 0; + cursor: default; +} + +.feed_item.viewed { + border-right: 5px solid #F28627; +} + + +.feed_item:first-child { + border-top: 0; +} + + /** + * Utils panel + */ + .feed_item .item_utils { + height: 28px; + margin: 0 0 0 8px; + float: left; + } + + /** + * Primary feed utils which are always shown + */ + .feed_item .primary_item_utils { + float: left; + } + + .feed_item .primary_item_utils li { + display: inline-block; + line-height: 21px; + font-size: 14px; + color: #aaa; + float: left; + margin-left: ; + cursor: default; + } + + .feed_item .primary_item_utils li:first-child { margin: 0} + .feed_item .star, + .feed_item .external { + background: none; + background-repeat: no-repeat; + background-position: center center; + background-size: 24px 24px; + width: 24px; + height: 24px; + border: none; + display: block; + margin: 0; + padding: 0; + } + + .feed_item .star { + background-image: url('../img/inactive_star.svg'); + } + + .feed_item .external { + background-image: url('../img/link.svg'); + opacity: 0.4; + } + + .feed_item .external:hover { + opacity: 1; + } + + .feed_item .star.important, + .feed_item .star:hover { + background-image: url('../img/active_star.svg'); + } + .feed_item .star.important:hover { + opacity:1; + } + .feed_item .star:hover { + opacity:0.5; + } + + /** + * Heading for compact view + */ + .feed_item.compact .item_body, + .feed_item.compact .item_title, + .feed_item.compact .item_author, + .feed_item.compact .item_date, + .feed_item.compact .item_utils, + .feed_item.compact .item_bottom_utils, + .feed_item .item_heading, + .feed_item .item_link { + display: none; + } + .feed_item.compact.open .item_body, + .feed_item.compact.open .item_author, + .feed_item.compact.open .item_bottom_utils, + .feed_item.compact .item_heading, + .feed_item .item_link { + display: block; + } + + .item_heading { + padding: 5px 20px; + background-color: #fafafa; + } + + .item_heading h1 a { + font-weight: bold; + font-size: 13pt; + padding: 0 5px; + margin: 0; + line-height: 40px; + } + + .read .item_heading h1 a { + color: #888; + } + + .feed_item.compact { + padding: 0 !important; + min-height: 0; + } + + .feed_item.compact .item_body { + padding-bottom: 40px; + } + + .feed_item.compact.open .item_heading { + margin-bottom: 15px; + border-bottom: 1px dashed #ddd; + } + + .item_heading .star { + float: left; + margin: 7px 12px 0 0; + } + + .item_heading .external { + float: left; + margin: 8px 12px 0 0; + } + + .item_heading .timeago { + display: block; + float: right; + line-height: 40px; + } + + + /** + * Feed title + */ + .feed_item .item_title { + font-size: 19px; + margin: 0 182px 0 42px; + font-weight: bold; + word-wrap: break-word; + } + + .feed_item .item_title a { + color: #222; + } + .feed_item .item_title a:hover { + color: #222; + text-decoration: underline; + } + + /** + * Feed title when read + */ + .feed_item.read .item_title { + font-weight: normal; + } + + .feed_item.read .item_title a { + color: #888; + } + + /** + * Title of the feed to which the item belongs + */ + .feed_item .item_feed_title { + color: #aaa; + font-size: 15px; + margin-left: 42px; + } + + /** + * Author of the item + */ + .feed_item .item_author { + color: #aaa; + font-size: 15px; + margin: 3px 0 0 42px; + } + + .feed_item .item_author a { + color: inherit; + } + + .feed_item .item_author a:hover { + text-decoration: underline; + } + + .timestamp { + display: none; + } + + /** + * Feed timestamp + */ + .timeago { + float: right; + color: #aaa; + margin: 0 17px 0 0; + font-size: 15px; + } + + /** + * Body of the feed item + */ + .feed_item .enclosure { + padding: 14px 42px 0 49px; + } + + .feed_item .item_body { + padding: 10px 42px 0 42px; + max-width: 770px; + font-size: 14px; + clear: both; + overflow-x: auto; + /*overflow-y: hidden; + height: 80px;*/ + } + + .feed_item .item_body.opened { + + } + + .feed_item .item_body p { + line-height: 1.5; + margin: 7px 0 14px 0; + } + + .feed_item .item_body img, .feed_item .item_body table { + max-width: 100%; + height: auto; + overflow: auto; + word-wrap: break-word; + white-space:normal; + } + + .feed_item .item_body > img:first-child, + .feed_item .item_body > div:first-child > img:first-child { + padding: 0 14px 0 0; + float: left; + } + + .feed_item .item_body h1, .feed_item .item_body h2 { + font-size: 17px; + font-weight: bold; + color: #222; + margin: 21px 0 0 0; + } + + .feed_item .item_body h3 { + font-size: 15px; + font-weight: bold; + color: #222; + margin: 21px 0 0 0; + text-decoration: underline; + } + + .feed_item .item_body > div { + margin: 7px 0; + } + + .feed_item .item_body a { + color: #0000ff; + text-decoration: underline; + } + + .feed_item .item_body ul { + margin: 7px 0; + padding-left: 14px; + list-style-type: disc; + } + + .feed_item .item_body ol { + margin: 7px 0; + padding-left: 21px; + } + + .feed_item .item_body ul li { + cursor: default; + line-height: 21px; + } + + .feed_item .item_body pre { + padding: 7px 7px 7px 14px; + background-color: #dadada; + border: 1px solid #ccc; + margin: 7px 0 14px 0; + overflow-y: auto; + } + .feed_item .item_body pre::-webkit-scrollbar { + height: 10px; + } + + .feed_item .item_body pre::-webkit-scrollbar-thumb { + background: #333; + } + + .feed_item .item_body pre::-webkit-scrollbar-track-piece { + background: #ddd; + } + + .feed_item .item_body code, + .feed_item .item_body pre { + font-family: monospace; + font-size: 16px; + } + + .feed_item .item_body blockquote { + border-left: 1px solid rgb(210,210,210); + margin: 25px 0; + padding: 0 0 0 15px; + font-style: italic; + } + + +/** + * Line with utils at the bottom + */ +.item_bottom_utils { + width: 100%; + height: 35px; + margin: 0; + padding: 0; + box-sizing: border-box; + -moz-box-sizing: border-box; +} + + /** + * Secondary feed items which are only shown on hover + */ + .feed_item .secondary_item_utils { + float: right; + margin: 0 17px; + } + + + .feed_item .secondary_item_utils, .feed_item .secondary_item_utils a { + color: #000; + } + + .feed_item:hover .secondary_item_utils li { + display: inline-block; + } + + .feed_item .secondary_item_utils li { + padding-left: 25px; + display: none; + } + + /** + * Secondary feed items which are only shown on hover + */ + .feed_item .show_keep_unread .keep_unread{ + display: block; + } + + .feed_item li.share_link { + background-image: url('../img/share.svg'); + background-repeat: no-repeat; + background-position: right center; + padding-right: 20px; + } + + .feed_item:hover .secondary_item_utils li.keep_unread { + cursor: pointer; + } + + .feed_item .secondary_item_utils li input[type=checkbox]{ + margin-left: 5px; + } diff --git a/css/feeds.css b/css/feeds.css deleted file mode 100644 index 9b17cd973..000000000 --- a/css/feeds.css +++ /dev/null @@ -1,290 +0,0 @@ -/** - * ownCloud - News - * - * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . - * - */ - -#undo-container { - position: fixed; - top: 0px; - width: 100%; - text-align: center; - z-index: 101; - line-height: 1.2; -} - -#undo { - z-index:101; - background-color:#fc4; - border:0; - padding:0 .7em .3em; - display:none; - position: relative; - top:0; - -moz-border-radius-bottomleft:1em; - -webkit-border-bottom-left-radius:1em; - border-bottom-left-radius:1em; - -moz-border-radius-bottomright:1em; - -webkit-border-bottom-right-radius:1em; - border-bottom-right-radius:1em; -} - -#undo a { - font-weight: bold; -} - -#undo a:hover { - text-decoration: underline; -} - - -.starred-icon { - background-image: url('../img/starred.png'); -} - -.subscriptions-icon { - background-image: url('../img/rss.svg'); -} - -.unread > a, -.unread > .utils .unread-counter { - font-weight: bold; -} - -#app-navigation .with-icon .list-title { - padding-left:16px; -} - -#app-navigation .with-icon .list-title span { - display:none; - margin-left:6px; -} - -#app-navigation .with-icon .list-title:hover span { - display:inline; -} - -#app-navigation .with-icon .opened span { - display:inline; -} - -#app-navigation .unread > a { - padding-right: 32px; -} - -#app-navigation .active > a { - padding-right: 40px; -} - -#app-navigation .active.unread > a { - padding-right: 80px; -} - -#app-navigation li:hover > a { - padding-right: 60px; -} - -#app-navigation .add-new:hover > a { - padding-right: 0px; -} - -#app-navigation .utils { - position: absolute; - right: 0; - top: 0; - bottom: 0; -} - -#app-navigation .utils > * { - float: right; -} - -#app-navigation .utils button { - margin: 0; - background-position: center; - background-repeat: no-repeat; - background-color: transparent; - border: 0; - box-shadow: none; - display: none; - height: 30px; - width: 22px; -} - -#app-navigation li:hover > .utils button { - display: block; -} - -/* only display the delete button when the feed is active */ -#app-navigation li:hover > .utils .delete-button { - display: none; -} - -#app-navigation li.active > .utils .delete-button { - display: block; -} - -.folder { - text-transform: uppercase; -} - -.feed { - text-transform: none; -} - -.unread-counter { - padding: 8px 6px 8px 5px; - overflow: hidden; - text-overflow: ellipsis; - text-align: center; - font-size: 9pt; - display: none; -} - - -.unread .unread-counter { - display: block; -} -.starred .unread-counter { - font-weight: normal !important; -} - - -button.action { - opacity: .5; -} - -button.action:hover { - opacity: 1; -} - - -#app-navigation li:hover > .utils { - display: block; -} - -#app-navigation li:hover > .utils .unread-counter { - padding-left: 0; -} - -#app-navigation .rename-feed > input { - width: 155px; - height: 15px; -} - -#app-navigation .folder-input { - text-transform: uppercase; -} - -.delete-icon { - background-image: url('../img/delete.svg'); -} - -.rename-feed-icon { - background-image: url('../img/rename.svg'); -} - -.mark-read-icon { - background-image: url('../img/mark_read.svg'); -} - -.rename-feed input { - margin: 1px 0 0px 5px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-right: 0; -} - -.rename-feed button { - margin: 5px 0 5px 0; - display: inline-block; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - width: 30px !important; - height: 30px !important; - padding: 0.6em; -} - -.rename-feed .action-button { - background-position: center; - background-repeat: no-repeat; -} - -.rename-feed .back-button { - border-radius: 3px; - background-image: url('../img/delete.svg'); -} - -.rename-feed .create-button { - border-radius: 0; - background-image: url('../img/mark_read.svg'); -} - -.rss-icon { - background-image: url('../img/rss.svg'); -} - -#app-navigation .ui-draggable-dragging { - width: 249px; -} - -#app-navigation .multiselect { - height:20px; -} - -.progress-icon { - background-image: url('../img/loading.gif'); -} - -.problem-icon { - background-image: url('../img/problem.svg') !important; -} - -.failed { - background-color: #F2FF63 !important; - text-shadow: none !important; - font-weight: bold; -} - - .failed .title { - background-color: #F2FF63 !important; - width: 299px !important; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - display: inline-block !important; - } - - .failed a:hover, - .failed:hover a { - background-color: #F2FF63 !important; - } - - .failed .message { - font-weight: normal; - padding: 5px 20px 5px 32px; - } - - .folder .feed.failed .message { - padding-left: 48px; - } - -.tooltip { - text-shadow: none; - text-transform: none; -} \ No newline at end of file diff --git a/css/firstrun.css b/css/firstrun.css deleted file mode 100644 index 7467a7b2b..000000000 --- a/css/firstrun.css +++ /dev/null @@ -1,41 +0,0 @@ -/** -* ownCloud - News -* -* @author Alessandro Cosentino -* @author Bernhard Posselt -* @copyright 2013 Alessandro Cosentino cosenal@gmail.com -* @copyright 2013 Bernhard Posselt dev@bernhard-posselt.com -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see . -* -*/ - -#firstrun { - height: 100%; - margin-left: 300px; - position: relative; -} - -#firstrun .message { - color: #888888; - font-size: 1.5em; - font-weight: bold; - text-shadow: 0 1px 0 #FFFFFF; - position: absolute; - top: 50%; - text-align: center; - width: 100%; - margin-top: -0.75em; -} - diff --git a/css/items.css b/css/items.css deleted file mode 100644 index 04cd0ac63..000000000 --- a/css/items.css +++ /dev/null @@ -1,463 +0,0 @@ -/** - * ownCloud - News - * - * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . - * - */ - -#app-content:after { - content: ''; - display: block; - height: 100%; -} - -#app-content.autopaging:after { - content: ''; - background-image: url('../img/loading.gif'); - background-position: center; - background-repeat: no-repeat; - background-size: 18px; - display: block; - height: 100%; -} - -#app-content.loading { - background-image: url('../img/loading.gif'); - background-position: center; - background-repeat: no-repeat; -} - -#app-content.loading > ul { - display: none; -} - - -.pull-refresh { - -webkit-transition: height 0.5s; - -moz-transition: height 0.5s; - transition: height 0.5s; - background-image: url('../img/loading.gif'), linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%); - background-image: url('../img/loading.gif'), -o-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%); - background-image: url('../img/loading.gif'), -moz-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%); - background-image: url('../img/loading.gif'), -webkit-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%); - background-image: url('../img/loading.gif'), -ms-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%); - background-position: center 45px, center; - background-repeat: no-repeat; - background-size: 18px, 100%; - height: 0; - width: 100%; -} - -.refresh { - height: 80px; -} - -/** - * Rules for a single feed item - */ -.feed_item { - border-top: 1px solid #ccc; - min-height: 120px; - background-image: linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 84px); - background-image: -o-linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 84px); - background-image: -moz-linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 84px); - background-image: -webkit-linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 84px); - background-image: -ms-linear-gradient(top, rgb(248,248,248) 0, rgb(255,255,255) 84px); - padding: 35px 0 0 0; - cursor: default; -} - -.feed_item.viewed { - border-right: 5px solid #F28627; -} - - -.feed_item:first-child { - border-top: 0; -} - - /** - * Utils panel - */ - .feed_item .item_utils { - height: 28px; - margin: 0 0 0 8px; - float: left; - } - - /** - * Primary feed utils which are always shown - */ - .feed_item .primary_item_utils { - float: left; - } - - .feed_item .primary_item_utils li { - display: inline-block; - line-height: 21px; - font-size: 14px; - color: #aaa; - float: left; - margin-left: ; - cursor: default; - } - - .feed_item .primary_item_utils li:first-child { margin: 0} - .feed_item .star, - .feed_item .external { - background: none; - background-repeat: no-repeat; - background-position: center center; - background-size: 24px 24px; - width: 24px; - height: 24px; - border: none; - display: block; - margin: 0; - padding: 0; - } - - .feed_item .star { - background-image: url('../img/inactive_star.svg'); - } - - .feed_item .external { - background-image: url('../img/link.svg'); - opacity: 0.4; - } - - .feed_item .external:hover { - opacity: 1; - } - - .feed_item .star.important, - .feed_item .star:hover { - background-image: url('../img/active_star.svg'); - } - .feed_item .star.important:hover { - opacity:1; - } - .feed_item .star:hover { - opacity:0.5; - } - - /** - * Heading for compact view - */ - .feed_item.compact .item_body, - .feed_item.compact .item_title, - .feed_item.compact .item_author, - .feed_item.compact .item_date, - .feed_item.compact .item_utils, - .feed_item.compact .item_bottom_utils, - .feed_item .item_heading, - .feed_item .item_link { - display: none; - } - .feed_item.compact.open .item_body, - .feed_item.compact.open .item_author, - .feed_item.compact.open .item_bottom_utils, - .feed_item.compact .item_heading, - .feed_item .item_link { - display: block; - } - - .item_heading { - padding: 5px 20px; - background-color: #fafafa; - } - - .item_heading h1 a { - font-weight: bold; - font-size: 13pt; - padding: 0 5px; - margin: 0; - line-height: 40px; - } - - .read .item_heading h1 a { - color: #888; - } - - .feed_item.compact { - padding: 0 !important; - min-height: 0; - } - - .feed_item.compact .item_body { - padding-bottom: 40px; - } - - .feed_item.compact.open .item_heading { - margin-bottom: 15px; - border-bottom: 1px dashed #ddd; - } - - .item_heading .star { - float: left; - margin: 7px 12px 0 0; - } - - .item_heading .external { - float: left; - margin: 8px 12px 0 0; - } - - .item_heading .timeago { - display: block; - float: right; - line-height: 40px; - } - - - /** - * Feed title - */ - .feed_item .item_title { - font-size: 19px; - margin: 0 182px 0 42px; - font-weight: bold; - word-wrap: break-word; - } - - .feed_item .item_title a { - color: #222; - } - .feed_item .item_title a:hover { - color: #222; - text-decoration: underline; - } - - /** - * Feed title when read - */ - .feed_item.read .item_title { - font-weight: normal; - } - - .feed_item.read .item_title a { - color: #888; - } - - /** - * Title of the feed to which the item belongs - */ - .feed_item .item_feed_title { - color: #aaa; - font-size: 15px; - margin-left: 42px; - } - - /** - * Author of the item - */ - .feed_item .item_author { - color: #aaa; - font-size: 15px; - margin: 3px 0 0 42px; - } - - .feed_item .item_author a { - color: inherit; - } - - .feed_item .item_author a:hover { - text-decoration: underline; - } - - .timestamp { - display: none; - } - - /** - * Feed timestamp - */ - .timeago { - float: right; - color: #aaa; - margin: 0 17px 0 0; - font-size: 15px; - } - - /** - * Body of the feed item - */ - .feed_item .enclosure { - padding: 14px 42px 0 49px; - } - - .feed_item .item_body { - padding: 10px 42px 0 42px; - max-width: 770px; - font-size: 14px; - clear: both; - overflow-x: auto; - /*overflow-y: hidden; - height: 80px;*/ - } - - .feed_item .item_body.opened { - - } - - .feed_item .item_body p { - line-height: 1.5; - margin: 7px 0 14px 0; - } - - .feed_item .item_body img, .feed_item .item_body table { - max-width: 100%; - height: auto; - overflow: auto; - word-wrap: break-word; - white-space:normal; - } - - .feed_item .item_body > img:first-child, - .feed_item .item_body > div:first-child > img:first-child { - padding: 0 14px 0 0; - float: left; - } - - .feed_item .item_body h1, .feed_item .item_body h2 { - font-size: 17px; - font-weight: bold; - color: #222; - margin: 21px 0 0 0; - } - - .feed_item .item_body h3 { - font-size: 15px; - font-weight: bold; - color: #222; - margin: 21px 0 0 0; - text-decoration: underline; - } - - .feed_item .item_body > div { - margin: 7px 0; - } - - .feed_item .item_body a { - color: #0000ff; - text-decoration: underline; - } - - .feed_item .item_body ul { - margin: 7px 0; - padding-left: 14px; - list-style-type: disc; - } - - .feed_item .item_body ol { - margin: 7px 0; - padding-left: 21px; - } - - .feed_item .item_body ul li { - cursor: default; - line-height: 21px; - } - - .feed_item .item_body pre { - padding: 7px 7px 7px 14px; - background-color: #dadada; - border: 1px solid #ccc; - margin: 7px 0 14px 0; - overflow-y: auto; - } - .feed_item .item_body pre::-webkit-scrollbar { - height: 10px; - } - - .feed_item .item_body pre::-webkit-scrollbar-thumb { - background: #333; - } - - .feed_item .item_body pre::-webkit-scrollbar-track-piece { - background: #ddd; - } - - .feed_item .item_body code, - .feed_item .item_body pre { - font-family: monospace; - font-size: 16px; - } - - .feed_item .item_body blockquote { - border-left: 1px solid rgb(210,210,210); - margin: 25px 0; - padding: 0 0 0 15px; - font-style: italic; - } - - -/** - * Line with utils at the bottom - */ -.item_bottom_utils { - width: 100%; - height: 35px; - margin: 0; - padding: 0; - box-sizing: border-box; - -moz-box-sizing: border-box; -} - - /** - * Secondary feed items which are only shown on hover - */ - .feed_item .secondary_item_utils { - float: right; - margin: 0 17px; - } - - - .feed_item .secondary_item_utils, .feed_item .secondary_item_utils a { - color: #000; - } - - .feed_item:hover .secondary_item_utils li { - display: inline-block; - } - - .feed_item .secondary_item_utils li { - padding-left: 25px; - display: none; - } - - /** - * Secondary feed items which are only shown on hover - */ - .feed_item .show_keep_unread .keep_unread{ - display: block; - } - - .feed_item li.share_link { - background-image: url('../img/share.svg'); - background-repeat: no-repeat; - background-position: right center; - padding-right: 20px; - } - - .feed_item:hover .secondary_item_utils li.keep_unread { - cursor: pointer; - } - - .feed_item .secondary_item_utils li input[type=checkbox]{ - margin-left: 5px; - } diff --git a/css/navigation.css b/css/navigation.css new file mode 100644 index 000000000..79f27d094 --- /dev/null +++ b/css/navigation.css @@ -0,0 +1,295 @@ +/** + * ownCloud - News + * + * @author Bernhard Posselt + * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see . + * + */ + +#undo-container { + position: fixed; + top: 0px; + width: 100%; + text-align: center; + z-index: 101; + line-height: 1.2; +} + +#undo { + z-index:101; + background-color:#fc4; + border:0; + padding:0 .7em .3em; + display:none; + position: relative; + top:0; + -moz-border-radius-bottomleft:1em; + -webkit-border-bottom-left-radius:1em; + border-bottom-left-radius:1em; + -moz-border-radius-bottomright:1em; + -webkit-border-bottom-right-radius:1em; + border-bottom-right-radius:1em; +} + +#undo a { + font-weight: bold; +} + +#undo a:hover { + text-decoration: underline; +} + + +.starred-icon { + background-image: url('../img/starred.png'); +} + +.subscriptions-icon { + background-image: url('../img/rss.svg'); +} + +.unread > a, +.unread > .utils .unread-counter { + font-weight: bold; +} + +#app-navigation .with-icon .list-title { + padding-left:16px; +} + +#app-navigation .with-icon .list-title span { + display:none; + margin-left:6px; +} + +#app-navigation .with-icon .list-title:hover span { + display:inline; +} + +#app-navigation .with-icon .opened span { + display:inline; +} + +#app-navigation .unread > a { + padding-right: 32px; +} + +#app-navigation .active > a { + padding-right: 40px; +} + +#app-navigation .active.unread > a { + padding-right: 80px; +} + +#app-navigation li:hover > a { + padding-right: 60px; +} + +#app-navigation .add-new:hover > a { + padding-right: 0px; +} + +#app-navigation .utils { + position: absolute; + right: 0; + top: 0; + bottom: 0; +} + +#app-navigation .utils > * { + float: right; +} + +#app-navigation .utils button { + margin: 0; + background-position: center; + background-repeat: no-repeat; + background-color: transparent; + border: 0; + box-shadow: none; + display: none; + height: 30px; + width: 22px; +} + +#app-navigation li:hover > .utils button { + display: block; +} + +/* only display the delete button when the feed is active */ +#app-navigation li:hover > .utils .delete-button { + display: none; +} + +#app-navigation li.active > .utils .delete-button { + display: block; +} + +.folder { + text-transform: uppercase; +} + +.feed { + text-transform: none; +} + +.unread-counter { + padding: 8px 6px 8px 5px; + overflow: hidden; + text-overflow: ellipsis; + text-align: center; + font-size: 9pt; + display: none; +} + + +.unread .unread-counter { + display: block; +} +.starred .unread-counter { + font-weight: normal !important; +} + + +button.action { + opacity: .5; +} + +button.action:hover { + opacity: 1; +} + + +#app-navigation li:hover > .utils { + display: block; +} + +#app-navigation li:hover > .utils .unread-counter { + padding-left: 0; +} + +#app-navigation .folder-input { + text-transform: uppercase; +} + +.delete-icon { + background-image: url('../img/delete.svg'); +} + +.rename-feed-icon { + background-image: url('../img/rename.svg'); +} + +.mark-read-icon { + background-image: url('../img/mark_read.svg'); +} + +.rename-feed input { + margin: 1px 0 0px 5px; + border-right: 1px solid #ddd; + border-radius: 2px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-right: 0; + width: 208px; + height: 32px; +} + +.rename-feed button { + margin: 5px 0 5px 0; + display: inline-block; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + width: 30px !important; + height: 30px !important; + padding: 0.6em; +} + +.rename-feed .action-button { + background-position: center; + background-repeat: no-repeat; +} + +.rename-feed .back-button { + border-radius: 3px; + background-image: url('../img/delete.svg'); +} + +.rename-feed .create-button { + border-radius: 0; + background-image: url('../img/mark_read.svg'); +} + +.rss-icon { + background-image: url('../img/rss.svg'); +} + +#app-navigation .ui-draggable-dragging { + width: 100%; +} + +#app-navigation .multiselect { + height:20px; +} + +#app-navigation .progress-icon, +#app-navigation .problem-icon { + width: 299px; + line-height: 44px; +} + +.progress-icon { + background-image: url('../img/loading.gif'); +} + +.problem-icon { + background-image: url('../img/problem.svg') !important; +} + +.failed { + background-color: #F2FF63 !important; + text-shadow: none !important; + font-weight: bold; +} + + .failed .title { + background-color: #F2FF63 !important; + width: 299px !important; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + display: inline-block !important; + } + + .failed a:hover, + .failed:hover a { + background-color: #F2FF63 !important; + } + + .failed .message { + font-weight: normal; + padding: 5px 20px 5px 32px; + } + + .folder .feed.failed .message { + padding-left: 48px; + } + +.tooltip { + text-shadow: none; + text-transform: none; +} \ No newline at end of file diff --git a/css/owncloud6.css b/css/owncloud6.css index 5d3445cd9..1dbab96c5 100644 --- a/css/owncloud6.css +++ b/css/owncloud6.css @@ -1,13 +1,4 @@ /* Feeds */ -#app-navigation .add-new input, -#app-navigation .add-new select { - width: 170px; -} - -#app-navigation .ui-draggable-dragging { - width: 299px; -} - #app-navigation .rename-feed > input { width: 208px; height: 32px; @@ -15,7 +6,7 @@ border-radius: 2px; } -#app-navigation .progress-icon, +#app-navigation .progress-icon, #app-navigation .problem-icon { width: 299px; line-height: 44px; -- cgit v1.2.3