]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of https://github.com/inthepoche/poche into dev
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Tue, 10 Sep 2013 12:44:59 +0000 (14:44 +0200)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Tue, 10 Sep 2013 12:44:59 +0000 (14:44 +0200)
1  2 
inc/poche/Poche.class.php
tpl/css/style.css

Simple merge
index d644814d195a4002cdd015eaf09b1459cc200443,5f7fd77da48bf0ebaf70fd3985ab3794f674b48a..c056429defbf7fe7f9b15ea6ffb1df51ed76ff33
@@@ -257,17 -267,3 +267,17 @@@ footer 
  .reading-time {
      font-size: 0.8em;
  }
- }
 +
 +#inputform {
 +    display: none;
 +    text-align:center;
 +    max-width:300px;
 +    margin-left:auto;
 +    margin-right:auto;
 +    margin-top:5px;
 +    padding-bottom: 5px;
 +    background-color: rgba(0, 0, 0, 0.9);
 +    opacity:0.8;
 +    color:white;
 +    border-radius: 3px;
++}