Knah-Tsaeb
/
MyShaarli
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'private_link' into myShaarli

This commit is contained in:
Knah Tsaeb 2016-06-15 09:03:44 +02:00
parent 34b2678fd9 9a49486707
commit c29027dd1a
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@ -54,7 +54,7 @@ if (is_file($GLOBALS['config']['DATADIR'].'/options.php')) {
require $GLOBALS['config']['DATADIR'].'/options.php';
}
define('myShaarli_version', '1.1.3');
define('myShaarli_version', '1.1.4');
define('PHPPREFIX', '<?php /* '); // Prefix to encapsulate data in php code.
define('PHPSUFFIX', ' */ ?>'); // Suffix to encapsulate data in php code.
// http://server.com/x/shaarli --> /shaarli/

2
shaarli_version.txt
View File

@ -1 +1 @@
1.1.3
1.1.4

7
tpl/myShaarli/myShaarli.css
View File

@ -518,12 +518,15 @@ a, .linkdescription a {
}
#linklist li, #linklist li.private {
background: #fff;
background-color: #fff;
background-image: url('../../images/private_16x16.png');
background-repeat: no-repeat;
background-position: 10px center;
border: 1px solid #cdcdcd;
border-radius: .3em;
clear: both;
margin: 1em 0;
padding: .3em;
padding: .3em .3em .3em 32px;
}
#linklist li.publicLinkHightLight {

7
tpl/myShaarli_Columns/columns.css
View File

@ -528,7 +528,10 @@ a, .linkdescription a {
#linklist li, #linklist li.private {
box-sizing: border-box;
background: #fff;
background-color: #fff;
background-image: url('../../images/private_16x16.png');
background-repeat: no-repeat;
background-position: 10px 10px;
border: 1px solid #cdcdcd;
border-radius: .3em;
flex: 0 0 auto;
@ -1286,4 +1289,4 @@ a:hover, .linkdescription a:hover, .linktitle a:hover, .linkWallabag a:hover, .l
position: relative;
width: calc(100% - 0.6em);
}
}
}