Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix grammar, punctuation, spelling and some white-space #103

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Fix grammar, punctuation, spelling and some white-space #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b6c0c1c
Fix grammar, punctuation and spelling
respencer Jul 4, 2013
063a26e
Further grammar and spacing fixes
respencer Jul 4, 2013
f80e77b
Delete trailing whitespace
respencer Jul 12, 2013
66f2801
IDs should only be used once, changed to class
respencer Jul 20, 2013
0a516eb
Filter HTML through HTML tidy and tweak
respencer Jul 22, 2013
4673979
IDs should only be used once, changed to class
respencer Jul 22, 2013
26bb166
CSS bug fix
respencer Jul 22, 2013
87a5f72
Filter CSS through CSS tidy and tweak
respencer Jul 22, 2013
88d9553
Undo CSS and HTML tidy changes
respencer Aug 8, 2014
0f76ed6
Merge remote-tracking branch 'upstream/master'
respencer Aug 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions COPYING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ In no event will the authors be held liable for any damages arising from
the use of this software.

Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would
be appreciated but is not required.
Expand Down
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Shaarli, the personal, minimalist, super-fast, no-database delicious clone.

You want to share the links you discover ? Shaarli is a minimalist delicious clone you can install on your own website.
It is designed to be personal (single-user), fast and handy.
It is designed to be personal (single-user), fast and handy.


Features:
Expand All @@ -12,12 +12,12 @@ Features:
* **FAST**
* Dead-simple installation: Drop the files, open the page. No database required.
* Easy to use: Single button in your browser to bookmark a page
* Save url, title, description (unlimited size). Classify links with tags (with autocomplete)
* Save URL, title, description (unlimited size). Classify links with tags (with autocomplete)
* Tag renaming, merging and deletion.
* Automatic thumbnails for various services (imgur, imageshack.us, flickr, youtube, vimeo, dailymotion…)
* Automatic conversion of URLs to clickable links in descriptions. Support for http/ftp/file/apt/magnet protocols.
* Save links as public or private
* 1-clic access to your private links/notes
* 1-click access to your private links/notes
* Browse links by page, filter by tag or use the full text search engine
* Permalinks (with QR-Code) for easy reference
* RSS and ATOM feeds (which can be filtered by tag or text search)
Expand Down Expand Up @@ -55,10 +55,10 @@ In no event will the authors be held liable for any damages arising from
the use of this software.

Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would
be appreciated but is not required.
Expand Down
64 changes: 32 additions & 32 deletions inc/shaarli.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* CSS Stylsheet for Shaarli - http://sebsauvage.net/wiki/doku.php?id=php:shaarli */
/* Cascading Style Sheet for Shaarli - http://sebsauvage.net/wiki/doku.php?id=php:shaarli */

/* CSS Reset from Yahoo to cope with browsers CSS inconsistencies. */
/*
Expand Down Expand Up @@ -69,9 +69,9 @@ h1 { font-size:20pt; font-weight:bold; font-style:italic; margin-bottom:20px; }

/* Small tab on the left of each link with edit/delete buttons. */
.button_edit, .button_delete { border-radius:0; box-shadow:none; border-style:none; border-width:0; padding:0; background:none; }
.linkeditbuttons {
position:absolute;
left:-1px;
.linkeditbuttons {
position:absolute;
left:-1px;
padding:4px 2px 2px 2px;
background-color:#f0f0f0;

Expand Down Expand Up @@ -111,7 +111,7 @@ cursor:pointer;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
width:auto;
padding:0 10px 5px 10px;
margin: auto;
margin: auto;
}

#pageheader a
Expand Down Expand Up @@ -200,9 +200,9 @@ cursor:pointer;
.paging a:visited { color:#ccc; }
.paging a:hover { color:#FFFFC9; }
.paging a:active { color:#fff; }
#paging_privatelinks { float:left; }
#paging_linksperpage { float:right; padding-right:5px; }
#paging_current { display:inline; color:#fff; padding:0 20 0 20; }
.paging_privatelinks { float:left; }
.paging_linksperpage { float:right; padding-right:5px; }
.paging_current { display:inline; color:#fff; padding:0 20 0 20; }
#paging_older { margin-right:15px; }
#paging_newer { margin-left:15px; }

Expand Down Expand Up @@ -292,7 +292,7 @@ font-size:9pt;
.picwall_pictureframe img { max-width: 100%;height: auto; } /* Adapt the width of the image */
.picwall_pictureframe a {text-decoration:none;}

/* CSS to show title when hovering an image - no javascript required. */
/* CSS to show title when hovering an image - no JavaScript required. */
.picwall_pictureframe span.info {display: none;}
.picwall_pictureframe:hover span.info {
display:block;
Expand All @@ -305,7 +305,7 @@ font-size:9pt;
background-color: transparent;
background-color: rgba(0, 0, 0, 0.4); /* FF3+, Saf3+, Opera 10.10+, Chrome, IE9 */
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#66000000,endColorstr=#66000000); /* IE6–IE9 */
text-shadow:2px 2px 1px #000000;
text-shadow:2px 2px 1px #000000;
}

/* Minimal customisation for jQuery widgets */
Expand Down Expand Up @@ -337,7 +337,7 @@ box-shadow:2px 2px 20px 2px #333333;

div.daily
{
font-family: Georgia, 'DejaVu Serif', Norasi, serif;
font-family: Georgia, 'DejaVu Serif', Norasi, serif;
background-color: #E6D6BE;
/* Background paper texture by BashCorpo:
http://www.bashcorpo.dk/textures.php
Expand All @@ -356,29 +356,29 @@ div.daily
#daily_col3 { float:left;position:relative; width:33%;}

div.dailyAbout
{
{
float:left;
border: 1px solid black;
font-size: 8pt;
position:absolute;
left:10px;
top: 15px;
padding: 5px 5px 5px 5px;
text-align:center;
text-align:center;
}
div.dailyAbout a { color: #890500; }
div.dailyTitle
{
{
font-weight: bold;
font-size: 44pt;
text-align:center;
text-align:center;
padding:10px 20px 0px 20px;
}
div.dailyDate
{
{
font-size: 12pt;
font-weight:bold;
text-align:center;
font-weight:bold;
text-align:center;
padding:0px 20px 30px 20px;
}

Expand All @@ -392,29 +392,29 @@ div.dailyEntry
div.dailyEntry a { text-decoration:none; color: #890500; }
div.dailyEntryTags { font-size:7.75pt; }
div.dailyEntryTitle { font-size:18pt; font-weight:bold;}
div.dailyEntryThumbnail
{
width:100%;
text-align:center;
background-color:rgb(128,128,128);
div.dailyEntryThumbnail
{
width:100%;
text-align:center;
background-color:rgb(128,128,128);
background:url(../images/50pc_transparent.png);
padding:4px 0px 2px 0px;
}
div.dailyEntryDescription
{
{
margin-top: 10px;
margin-bottom: 30px;
text-align:justify;
margin-bottom: 30px;
text-align:justify;
overflow:auto;
}

/* Common css screwdriver */
/* Common CSS screwdriver */
.clear{
clear:both;
}

/* For lazy images loading in picture wall.
using http://www.appelsiini.net/projects/lazyload
Using http://www.appelsiini.net/projects/lazyload
*/
.lazyimage { display:none; }

Expand Down Expand Up @@ -451,9 +451,9 @@ a {color:#000!important;text-decoration:none!important;}
#searchform_value { width:70% !important; }
#tagfilter_value { width:70% !important; }
div.qrcode { position:relative; float:left; top:-10px; left:0px; }
#paging_privatelinks { float;none; }
#paging_linksperpage { float:none; margin-bottom:10px; font-size:smaller;}
#paging_older,#paging_newer,#paging_linksperpage a { border: 1px solid black; padding:3px 5px 3px 5px; background-color:#666; color:#fff; border-radius: 5px 5px 5px 5px;}
.paging_privatelinks { float:none; }
.paging_linksperpage { float:none; margin-bottom:10px; font-size:smaller;}
#paging_older,#paging_newer,.paging_linksperpage a { border: 1px solid black; padding:3px 5px 3px 5px; background-color:#666; color:#fff; border-radius: 5px 5px 5px 5px;}
.thumbnail { float:none; height:auto; margin: 0px; text-align:center;}
#cloudtag { padding:0px; }
div.dailyAbout { float:none; position:relative; width:100%; clear:both; padding:0px; top:0px; left:0px; }
Expand All @@ -463,7 +463,7 @@ div.dailyDate { font-size: 11pt;padding:0px; display:block; }
div.dailyEntryTitle { font-size:16pt; font-weight:bold;}
div.dailyEntryDescription { font-size:10pt; }

}
}

/* Highlight search results */
.highlight { background-color: #FFFF33; }
Loading