Merge branch 'private_link' into myShaarli
This commit is contained in:
commit
c29027dd1a
4 changed files with 12 additions and 6 deletions
|
@ -54,7 +54,7 @@
|
||||||
require $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('PHPPREFIX', '<?php /* '); // Prefix to encapsulate data in php code.
|
||||||
define('PHPSUFFIX', ' */ ?>'); // Suffix to encapsulate data in php code.
|
define('PHPSUFFIX', ' */ ?>'); // Suffix to encapsulate data in php code.
|
||||||
// http://server.com/x/shaarli --> /shaarli/
|
// http://server.com/x/shaarli --> /shaarli/
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
1.1.3
|
1.1.4
|
||||||
|
|
|
@ -518,12 +518,15 @@ a, .linkdescription a {
|
||||||
}
|
}
|
||||||
|
|
||||||
#linklist li, #linklist li.private {
|
#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: 1px solid #cdcdcd;
|
||||||
border-radius: .3em;
|
border-radius: .3em;
|
||||||
clear: both;
|
clear: both;
|
||||||
margin: 1em 0;
|
margin: 1em 0;
|
||||||
padding: .3em;
|
padding: .3em .3em .3em 32px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#linklist li.publicLinkHightLight {
|
#linklist li.publicLinkHightLight {
|
||||||
|
|
|
@ -528,7 +528,10 @@ a, .linkdescription a {
|
||||||
|
|
||||||
#linklist li, #linklist li.private {
|
#linklist li, #linklist li.private {
|
||||||
box-sizing: border-box;
|
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: 1px solid #cdcdcd;
|
||||||
border-radius: .3em;
|
border-radius: .3em;
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
|
|
Loading…
Reference in a new issue