Skip to content

Commit

Permalink
Merge pull request #20 from nodiscc/fix-typos
Browse files Browse the repository at this point in the history
Fix grammar, punctuation, spelling, trailing whitepaces and newlines; Fix typo in css
  • Loading branch information
Sbgodin committed Aug 19, 2014
2 parents 1ec633a + ad6c27b commit abc98ab
Show file tree
Hide file tree
Showing 5 changed files with 137 additions and 137 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions inc/shaarli.css
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 Stylesheet 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 @@ -408,13 +408,13 @@ div.dailyEntryDescription
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,7 +451,7 @@ 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_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;}
Expand All @@ -466,4 +466,4 @@ div.dailyEntryDescription { font-size:10pt; }
}

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

0 comments on commit abc98ab

Please sign in to comment.