diff options
20 files changed, 841 insertions, 3 deletions
diff --git a/data/templates/default/bookmarks.tpl.php b/data/templates/default/bookmarks.tpl.php index 818eea0..20b5336 100644 --- a/data/templates/default/bookmarks.tpl.php +++ b/data/templates/default/bookmarks.tpl.php @@ -112,6 +112,7 @@ if($userservice->isLoggedOn()) { window.onload = playerLoad; </script> +<?php if (count($bookmarks) > 1) { ?> <p id="sort"><?php echo $total.' '.T_("bookmark(s)"); ?> - <?php echo T_("Sort by:"); ?> <?php $titleArrow = ''; @@ -162,6 +163,7 @@ default: <a href="?sort=<?php echo $votingSort ?>"><?php echo T_("Voting").$votingArrow; ?></a> <span>/</span> <?php } ?> +<?php } ?> <?php if ($currenttag!= '') { @@ -275,6 +277,12 @@ if ($currenttag!= '') { break; } + // Add username in case bookmark was loaded using getBookmark() + if (!isset($row['username']) && isset($row['uId'])) { + $userinfo = $userservice->getObjectUser($row['uId']); + $row['username'] = $userinfo->username; + } + $cats = ''; $tagsForCopy = ''; $tags = $row['tags']; @@ -310,12 +318,13 @@ if ($currenttag!= '') { $update = ' <small title="'. T_('Last update') .'">('. date($GLOBALS['shortdate'], strtotime($row['bModified'])). ') </small>'; // User attribution - $copy = ' ' . T_('by') . ' '; if ($userservice->isLoggedOn() && $currentUser->getUsername() == $row['username'] ) { + $copy = ' ' . T_('by') . ' '; $copy .= T_('you'); - } else { + } else if (isset($row['username'])) { + $copy = ' ' . T_('by') . ' '; $copy .= '<a href="' . createURL('bookmarks', $row['username']) . '">' . SemanticScuttle_Model_UserArray::getName($row) . '</a>'; @@ -506,6 +515,7 @@ if ($currenttag!= '') { . $edit . "\n" . $update . "\n" . $cacheLink ."\n" + . ' | <a href="/permalink/'. $row['bId'] . '">Permalink</a>' ."\n" . " </div>\n"; echo $privateNoteField != '' ? ' <div class="privateNote" title="'. T_('Private Note on this bookmark') .'">'.$privateNoteField."</div>\n" @@ -524,8 +534,10 @@ if ($currenttag!= '') { if(getPerPageCount($currentUser)>7) { echo '<p class="backToTop"><a href="#header" title="'.T_('Come back to the top of this page.').'">'.T_('Top of the page').'</a></p>'; } - echo $pagesBanner; // display previous and next links pages + RSS link + if (isset($bookmarks) && count($bookmarks) > 1) { + echo $pagesBanner; // display previous and next links pages + RSS link + } } else { echo '<p class="error">'.T_('No bookmarks available').'</p>'; diff --git a/data/templates/default/top.inc.php b/data/templates/default/top.inc.php index 55be4a7..79cc2e2 100644 --- a/data/templates/default/top.inc.php +++ b/data/templates/default/top.inc.php @@ -3,6 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" /> + <meta name="viewport" content="width=device-width,initial-scale=1"> <title><?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' ยป ' . $pagetitle : '')); ?></title> <link rel="icon" type="image/png" href="<?php echo $theme->resource('icon.png');?>" /> <link rel="stylesheet" type="text/css" href="<?php echo $theme->resource('scuttle.css');?>" /> diff --git a/www/permalink.php b/www/permalink.php new file mode 100644 index 0000000..d389294 --- /dev/null +++ b/www/permalink.php @@ -0,0 +1,122 @@ +<?php +/*************************************************************************** + Copyright (C) 2004 - 2006 Scuttle project + http://sourceforge.net/projects/scuttle/ + http://scuttle.org/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ***************************************************************************/ + +require_once 'www-header.php'; + +/* Service creation: only useful services are created */ +$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); +$cacheservice =SemanticScuttle_Service_Factory::get('Cache'); + +/* Managing all possible inputs */ +isset($_GET['action']) ? define('GET_ACTION', $_GET['action']): define('GET_ACTION', ''); +isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0); +isset($_GET['sort']) ? define('GET_SORT', $_GET['sort']): define('GET_SORT', ''); + + +// Logout action +if (GET_ACTION == "logout") { + $userservice->logout(); + $tplVars['currentUser'] = null; + $tplvars['msg'] = T_('You have now logged out'); +} + + +// Header variables +$tplVars['loadjs'] = true; +$tplVars['rsschannels'] = array( + array( + sprintf(T_('%s: Recent bookmarks'), $sitename), + createURL('rss') . '?sort=' . getSortOrder() + ) +); + +if ($userservice->isLoggedOn()) { + if ($userservice->isPrivateKeyValid($currentUser->getPrivateKey())) { + $currentUsername = $currentUser->getUsername(); + array_push( + $tplVars['rsschannels'], + array( + sprintf( + T_('%s: Recent bookmarks (+private %s)'), + $sitename, $currentUsername + ), + createURL('rss') + . '?sort=' . getSortOrder() + . '&privateKey=' . $currentUser->getPrivateKey() + ) + ); + } +} + +if ($usecache) { + // Generate hash for caching on + $hashtext = $_SERVER['REQUEST_URI']; + if ($userservice->isLoggedOn()) { + $hashtext .= $userservice->getCurrentUserID(); + } + $hash = md5($hashtext); + + // Cache for 15 minutes + $cacheservice->Start($hash, 900); +} + +// Pagination +$perpage = getPerPageCount($currentUser); +if (intval(GET_PAGE) > 1) { + $page = intval(GET_PAGE); + $start = ($page - 1) * $perpage; +} else { + $page = 0; + $start = 0; +} + +$tplVars['page'] = $page; +$tplVars['start'] = $start; +$tplVars['popCount'] = 30; +$tplVars['sidebar_blocks'] = $GLOBALS["index_sidebar_blocks"]; +$tplVars['range'] = 'all'; +$tplVars['pagetitle'] = T_('Store, share and tag your favourite links'); +$tplVars['subtitle'] = T_('All Bookmarks'); +$tplVars['bookmarkCount'] = $start + 1; + +//$bookmarks = $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, 0, NULL); +list ($url, $bid) = explode('/', $_SERVER['PATH_INFO']); +$bookmark = $bookmarkservice->getBookmark($bid, TRUE); +$bookmarks = array('bookmarks' => array($bookmark)); +$tplVars['pagetitle'] = $bookmark['bTitle']; + +$tplVars['total'] = $bookmarks['total']; +$tplVars['bookmarks'] = $bookmarks['bookmarks']; +$tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s'); +//$tplVars['cat_url'] = createURL('tags', '%2$s'); +$tplVars['nav_url'] = createURL('index', '%3$s'); +$tplVars['summarizeLinkedTags'] = true; +$tplVars['pageName'] = PAGE_BOOKMARKS; +$tplVars['user'] = ''; +$tplVars['currenttag'] = ''; + +$templateservice->loadTemplate('bookmarks.tpl', $tplVars); + +if ($usecache) { + // Cache output if existing copy has expired + $cacheservice->End($hash); +} +?> diff --git a/www/themes/mono/icon.png b/www/themes/mono/icon.png Binary files differnew file mode 100644 index 0000000..713f1eb --- /dev/null +++ b/www/themes/mono/icon.png diff --git a/www/themes/mono/images/b_edit.png b/www/themes/mono/images/b_edit.png Binary files differnew file mode 100644 index 0000000..05711a0 --- /dev/null +++ b/www/themes/mono/images/b_edit.png diff --git a/www/themes/mono/images/bg_admin.png b/www/themes/mono/images/bg_admin.png Binary files differnew file mode 100644 index 0000000..c707779 --- /dev/null +++ b/www/themes/mono/images/bg_admin.png diff --git a/www/themes/mono/images/bg_bar.png b/www/themes/mono/images/bg_bar.png Binary files differnew file mode 100644 index 0000000..7152ba1 --- /dev/null +++ b/www/themes/mono/images/bg_bar.png diff --git a/www/themes/mono/images/bg_header.png b/www/themes/mono/images/bg_header.png Binary files differnew file mode 100644 index 0000000..6fa4161 --- /dev/null +++ b/www/themes/mono/images/bg_header.png diff --git a/www/themes/mono/images/bg_sidebar.png b/www/themes/mono/images/bg_sidebar.png Binary files differnew file mode 100644 index 0000000..0edb153 --- /dev/null +++ b/www/themes/mono/images/bg_sidebar.png diff --git a/www/themes/mono/images/loading.gif b/www/themes/mono/images/loading.gif Binary files differnew file mode 100644 index 0000000..859126e --- /dev/null +++ b/www/themes/mono/images/loading.gif diff --git a/www/themes/mono/images/logo-empty.png b/www/themes/mono/images/logo-empty.png Binary files differnew file mode 100644 index 0000000..4590098 --- /dev/null +++ b/www/themes/mono/images/logo-empty.png diff --git a/www/themes/mono/images/logo.png b/www/themes/mono/images/logo.png Binary files differnew file mode 100644 index 0000000..4afe565 --- /dev/null +++ b/www/themes/mono/images/logo.png diff --git a/www/themes/mono/images/logo_24.gif b/www/themes/mono/images/logo_24.gif Binary files differnew file mode 100644 index 0000000..d5af64d --- /dev/null +++ b/www/themes/mono/images/logo_24.gif diff --git a/www/themes/mono/images/rss.gif b/www/themes/mono/images/rss.gif Binary files differnew file mode 100644 index 0000000..094ba10 --- /dev/null +++ b/www/themes/mono/images/rss.gif diff --git a/www/themes/mono/images/thumbs_up.orig.png b/www/themes/mono/images/thumbs_up.orig.png Binary files differnew file mode 100644 index 0000000..1a89d0e --- /dev/null +++ b/www/themes/mono/images/thumbs_up.orig.png diff --git a/www/themes/mono/images/vote-against-voted.png b/www/themes/mono/images/vote-against-voted.png Binary files differnew file mode 100644 index 0000000..740dfc8 --- /dev/null +++ b/www/themes/mono/images/vote-against-voted.png diff --git a/www/themes/mono/images/vote-against.png b/www/themes/mono/images/vote-against.png Binary files differnew file mode 100644 index 0000000..f15ea4d --- /dev/null +++ b/www/themes/mono/images/vote-against.png diff --git a/www/themes/mono/images/vote-for-voted.png b/www/themes/mono/images/vote-for-voted.png Binary files differnew file mode 100644 index 0000000..5abd43e --- /dev/null +++ b/www/themes/mono/images/vote-for-voted.png diff --git a/www/themes/mono/images/vote-for.png b/www/themes/mono/images/vote-for.png Binary files differnew file mode 100644 index 0000000..5973ae9 --- /dev/null +++ b/www/themes/mono/images/vote-for.png diff --git a/www/themes/mono/scuttle.css b/www/themes/mono/scuttle.css new file mode 100644 index 0000000..7f2e50e --- /dev/null +++ b/www/themes/mono/scuttle.css @@ -0,0 +1,703 @@ +/* Watch out. This file bugs (in the header) when it is formated with Eclipse (Ctrl+Shift+F)*/ + +/* BASE */ + +* { + font-family: fixed, monospace; +} +a { + color: #005fff; + /*color: #5b5b5b;*/ + text-decoration: none; +} +a:hover { + color: #258; + text-decoration: underline; +} +a img { + border: 0; +} + + +body { + margin: 0; + padding: 0; +} +input[type=text], +input[type=password], +select, +textarea { + border: 1px solid #AAA; + padding: 0.1em; +} +input[type=text], +input[type=password], +textarea { + padding: 0.2em; +} +input[type=text]:focus, +input[type=password]:focus, +select:focus, +textarea:focus { + border-color: #666; +} +p.tipMsg, +p.error, +p.success { + border: 1px solid; + font-size: small; + margin: 0.5em; + padding: 0.5em; + width: 70%; +} +p.tipMsg { + background: #FFFF99; + border-color: #CC9900; + color: #CC9900; +} +p.error { + background: #FCC; + border-color: #966; + color: #633; +} +p.success { + background: #CFC; + border-color: #696; + color: #363; +} +td#availability { + color: #285; + font-weight: bold; +} +td#availability.not-available { + color: #F00; +} +textarea { + font-size: small; + padding: 0.2em; +} +th { + padding-right: 1em; + text-align: right; +} + +/* HEADER */ + +/* +div#header { + background: #FFF url('images/bg_header.png') bottom repeat-x; + border-bottom: 3px solid #9CD; + clear: both; +} +*/ +div#header:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} +* html div#header { + height: 1%; +} +h1 { + float: left; + font-size: x-large; + font-weight: bold; + letter-spacing: 0.25em; + margin: 0; + padding: 1em; +} + +/* +html > body h1 { + background: url('images/logo.png') no-repeat 10px; + padding-left: 75px; +} +*/ + +html > body div#header.popup h1 { + background: url('images/logo.png') no-repeat 10px; + background-size: 24px; + padding: 0.5em 0.5em 0.5em 50px; +} +/*html > body div#header #welcome { + position:absolute; + left:75px; +}*/ +#welcome { + border: 10px solid #5b5b5b; + width: 66%; + padding: 10px; + text-align:center; + font-size: medium; +} +#bottom { + padding-top: 10px; + text-align: center; + font-size: xx-small; +} +h1 a { + color: #000; +} +h1 a:hover { + color: #000; +} +h2 { + /*background: #000 url('images/bg_bar.png') center center repeat-x;*/ + background: #5b5b5b; + border-bottom: 3px solid #5b5b5b; + clear: both; + color: #FFF; + font-size: medium; + letter-spacing: 0.1em; + margin: 0 0 1em 0; + padding: 0.5em 1em; +} +h2 a, h2 a:hover { + color: #DDD; +} + +/*sup { + color: #77ABE0; + font-weight: bold; +}*/ + +/* NAVIGATION */ + +ul#navigation { + list-style-type: none; + margin: 0; + padding: 1.75em 1em; + width: auto; +} +ul#navigation a { + font-size: medium; + font-weight: bold; + padding: 0.2em 0.5em; +} +ul#navigation a:hover { + background: #7AD; + color: #FFF; +} +ul#navigation li { + float: left; +} +ul#navigation li.access { + float: right; +} + +/* BOOKMARKS */ + +ol#bookmarks { + list-style-type: none; + margin: 0; + padding: 0 1em; + width: 70%; +} +html > body ol#bookmarks { + margin: 0 1em; + padding: 0; +} +img.thumbnail { + float: left; + padding: 1px; + margin-right: 6px; + margin-bottom:4px; + border:1px solid #AAA; +} +div.link a { + /*color: #5b5b5b;*/ + color: #005fff; + text-decoration: none; + font-size: medium; +} +div.link a:hover { + text-decoration: underline; +} +div.link a:visited { + color: purple; +} +div.address { + color: #5b5b5b; +} +div.meta { + color: #5b5b5b; +} +div.meta span { + color: #F00; +} +div.privateNote { + font-variant: small-caps; + font-size: small; + text-align: right; +} +li.xfolkentry { + border-bottom: 1px solid #DDD; + margin-bottom: 0; + padding: 1em 0.5em; + overflow: auto; +} +html > body li.xfolkentry { + border-bottom: 1px dotted #AAA; +} +li.xfolkentry div { + padding: 0.1em; +} +li.xfolkentry.deleted { + opacity: 0.5; +} +li.xfolkentry.private { + border-left: 3px solid #F00; +} +li.xfolkentry.shared { + border-left: 3px solid #FA0; +} +li.below-threshold > div { + border-right: 5px dotted #F00; +} + +li.xfolkentry div div.description span.anchorBookmark { + /*font-family:monospace;*/ +} + +/* bookmark voting */ +.vote-badge { + float: left; + width: 3em; + margin: 5px; + border: 1px solid #CCCC88; + font-weight: bold; + /*border-radius: 10px;*/ + -moz-border-radius: 10px; +} +.vote-badge span, .vote-badge a { + display: block; + text-align: center; +} +.vote-badge a:hover { + text-decoration: none; +} +.vote-badge .vote-for { + /*border-top-right-radius: 10px;*/ + /*border-top-left-radius: 10px;*/ + -moz-border-radius-topright: 10px; + -moz-border-radius-topleft: 10px; +} +.vote-badge .vote-against { + /*border-bottom-right-radius: 10px;*/ + /*border-bottom-left-radius: 10px;*/ + -moz-border-radius-bottomright: 10px; + -moz-border-radius-bottomleft: 10px; +} +.vote-badge a.vote-for:hover { + background-color: #ccffbb; +} +.vote-badge a.vote-against:hover { + background-color: #ffcccc; +} +.vote-badge-for .vote-for-inactive { + color: transparent; + background-color: #ccffbb; +} +.vote-badge-against .vote-against-inactive { + color: transparent; + background-color: #ffcccc; +} + +/* bookmark voting horizontal */ +div.vote-horiz .voting { + font-weight: bold; +} +li.xfolkentry div.vote-horiz-for { +/* border-left: 1em solid #ccffbb;*/ +/* padding-left: 0.5em;*/ +} +li.xfolkentry div.vote-horiz-against { +/* border-left: 1em solid #ffcccc;*/ +/* padding-left: 0.5em;*/ +} +.vote-horiz a, .vote-horiz .vote-for-inactive, +.vote-horiz .vote-against-inactive { + padding-left: 1.5em; + margin-left: 0.7em; +} +.vote-horiz a.vote-for:hover { + background-color: #ccffbb; +} +.vote-horiz a.vote-against:hover { + background-color: #ffcccc; +} +.vote-horiz .vote-for-inactive, .vote-horiz .vote-against-inactive { + color: #AAA; +} +.vote-horiz .vote-for { + background: url(images/vote-for.png) no-repeat; +} +.vote-horiz .vote-against { + background: url(images/vote-against.png) no-repeat; +} +.vote-horiz .vote-for-inactive { + background: url(images/vote-for-voted.png) no-repeat; +} +.vote-horiz .vote-against-inactive { + background: url(images/vote-against-voted.png) no-repeat; +} + + +/* SIDEBAR */ + +div#sidebar { + font-size: small; + position: absolute; + right: 1em; + top: 10em; + width: 25%; +} +/* +div#sidebar a { + color: #995; +} +*/ +div#sidebar a:hover { + color: #000; +} +div#sidebar>div { + /*background: #FFF url('images/bg_sidebar.png') bottom repeat-x;*/ + border: 1px solid #000; + color: #555; + margin-bottom: 1em; +} +div#sidebar h2 { + background: transparent; + border: 0; + color: #000000; + letter-spacing: 0; + margin: 0; + padding: 0.5em 0; +} +div#sidebar hr { + display: none; +} +div#sidebar p { + margin: 1em; +} +div#sidebar p.tags a { + margin: 0; +} +div#sidebar table { + margin: 0.5em 0.5em 0 0.5em; +} +div#sidebar table td { + padding-bottom: 0.25em; + padding-right: 0.5em; +} +/* +div#sidebar ul { + list-style-type: none; + margin: 0; + padding: 0.5em; +} +div#sidebar ul li { + margin: 0.5em 0; +}*/ + +div#related { + padding: 0.5em; +} + +.crossTags { + padding:0px 3px; + border: 1px solid #000000; +} + +div#sidebar>div#maintagsmenu { + padding: 0.5em; + border: 5px solid #999955 +} + + + +/* TAGS */ + +p.commondescription { + padding-left:5px; + color: #555; + font-weight: bold; + font-size: medium; + border-left: 1px solid #CC8; + width: 70%; +} + +p.tags { + line-height: 2.25em; + /*margin: 2em 10%;*/ + text-align: justify; + vertical-align: middle; + width: 70%; +} +p.tags a, +p.tags span { + color: #47A; + margin-right: 0.5em; +} +p.tags span:hover { + cursor: pointer; + text-decoration: underline; +} +p.tags span.selected { + background: #CEC; +} + +.anchor { + cursor: pointer; + text-decoration: underline; +} + +.treeTag { + color: #999955; +} +.treeTag:hover { + cursor: pointer; + text-decoration: underline; +} +.treeTag.selected { + background: #CEC; +} + +/* PROFILE */ + +table.profile th { + width: 10em; +} + +table tr.ssl-current td { + background-color: #AFA; +} + +/* OTHER GUFF */ + +dd { + background: #CEC; + border-right: 4px solid #ACA; + color: #464; + padding: 6px; +} +dd a { + color: #464; +} +dd a:hover { + color: #000 !important; + text-decoration: underline !important; +} + +dl { + font-size: small; + margin: 1em; + width: 70%; +} +dl#profile dd { + background: #CDE; + border-color: #ABC; + color: #247; +} +dl#profile dt { + background: #BCE; + border-color: #9AC; + color: #245; + display: block; + font-weight: bold; + padding: 6px; +} +dl#profile a { + color: #446; +} +dl#profile a:hover { + color: #000 !important; + text-decoration: underline !important; +} +dl#meta dd { + line-height: 1.5em; +} +dl#meta dt { + background: #BDB; + color: #353; + display: block; + font-weight: bold; + padding: 6px; +} +dt { + border-right: 4px solid #9B9; +} +dt a { + background: #BDB; + color: #353; + display: block; + font-weight: bold; + padding: 6px; +} +dt a:hover { + background: #ACA; + border: 0; +} +form { + margin: 0; +} +form#search { + margin-right: 0.75em; + color: #CCC; + font-size: small; + float: right; + margin: 0; + position: absolute; + right: 0; + top: 6.4em; +} +form label, +form td, +form th { + font-size: small; +} +form table { + margin: 0 1em; +} +h3 { + background: #DDD; + color: #555; + font-size: small; + letter-spacing: 0.2em; + margin: 2em 1em 1em 1em; + padding: 0.25em 0.75em; +} +li { + font-size: small; + margin-bottom: 0.5em; +} +p { + font-size: small; + margin: 1em; +} +p#sort { + /*color: #CCC;*/ + font-size: small; + /*float: right;*/ + /*margin: 0;*/ + /*position: absolute;*/ + right: 0; + top: 7em; +} +html > body p#sort { + /*margin-right: 0.75em;*/ +} +p#sort a { + background: #AAA; + color: #555; + font-weight: normal; + margin-right: 0.5em; + padding: 0 1em; +} +html > body p#sort a { + margin-right: 0; +} +p#sort a:hover { + background: #CCC; + text-decoration: none !important; +} +p#sort span { + display: none; +} + +p.backToTop{ + text-align:center; +} + +p.paging { + font-size: small; + margin-left: 1em; + text-align:center; +} +p.paging a, +p.paging span.disable { + background: #888; + color: #FFF; + display: inline; + margin-right: 0.5em; + padding: 0.25em 1em; +} +p.paging a:hover { + background: #666; +} +p.paging span { + display: none; +} +p.paging span.disable { + background: #DDD; + color: #AAA; +} +div.collapsible p.tags { + line-height: 2.25em; + margin: 1em 2em; +} +th label { + padding-right: 1em; +} +ul { + margin-right: 1em; + width: 75%; +} + +.adminBackground { + /*background: #FFFFFF url(images/logo_24.png) no-repeat scroll center right;*/ + /*border-top: 1px solid; + border-color: #CC9900;*/ +} + +.adminBackground { + background: #FFF url('images/bg_admin.png') repeat-y top right; +} + +a.bookmarklet { + padding: 2px; + background-color: #AAFAEE; +} + +/* tree styles */ +#related-content.jstree-default.jstree-focused { + background: none !important; +} + + +/* add/edit bookmark */ +.ui-autocomplete { + width: 458px; +} + +/* Mobile First behavior */ + +#search, #sidebar { + visibility: hidden; + display: none; +} + +ol#bookmarks { + width: 95%; +} + +#welcome { + width: 80%; +} + +@media only screen and (min-width : 800px) { + #search, #sidebar { + visibility: inherit; + display: inherit; + } + + ol#bookmarks { + width: inherit; + } + + #welcome { + width: inherit; + } +} |
