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

Merge remote-tracking branch 'nicolasdanelon/master' into next

Browse source
This commit is contained in:
nodiscc 2015-06-23 20:45:15 +02:00
parent c68da3ffbf 38eb1e7770
commit 4c68c20cdd
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
inc/awesomplete.css
View file

@ -8,7 +8,6 @@
div.awesomplete { div.awesomplete {
display: inline-block; display: inline-block;
position: relative; position: relative;
width: 100%;
} }
div.awesomplete > input { div.awesomplete > input {
@ -94,4 +93,4 @@ div.awesomplete li:hover mark {
div.awesomplete li[aria-selected="true"] mark { div.awesomplete li[aria-selected="true"] mark {
background: hsl(86, 102%, 21%); background: hsl(86, 102%, 21%);
color: inherit; color: inherit;
} }

11
inc/shaarli.css
View file

@ -221,12 +221,7 @@ h1 {
margin-left:24px; margin-left:24px;
} }
.tagfilter div.awesomplete {
width: inherit;
}
.tagfilter #tagfilter_value { .tagfilter #tagfilter_value {
width: 100%;
display: inline; display: inline;
} }
@ -349,6 +344,7 @@ h1 {
} }
#headerform label { #headerform label {
cursor: pointer;
margin-right: 10px; margin-right: 10px;
} }
@ -976,6 +972,11 @@ div.dailyNoEntry {
@media handheld, only screen and (max-width: 480px), only screen and (max-device-width: 854px) { @media handheld, only screen and (max-width: 480px), only screen and (max-device-width: 854px) {
/* A few fixes for mobile devices (far from perfect). */ /* A few fixes for mobile devices (far from perfect). */
.tagfilter div.awesomplete {
width: 70%;
}
.nomobile { .nomobile {
display: none; display: none;
} }