mirror of
https://github.com/owncloudarchive/contacts.git
synced 2024-11-29 11:24:11 +01:00
Hide upload iframe and fix merge flaws
This commit is contained in:
parent
a9ade3079d
commit
0129e59024
@ -87,6 +87,7 @@
|
||||
#app-navigation li.active[data-type="category"] > .utils > * {
|
||||
display: inline-block;
|
||||
float: left;
|
||||
background-color: rgba(0,0,0,0);
|
||||
}
|
||||
#app-navigation li > .utils > .numcontacts {
|
||||
padding-right: 5px;
|
||||
@ -865,6 +866,10 @@ tbody tr.contact.active, tbody tr.contact:hover {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
#file_upload_target {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@media screen and (min-width: 1201px) {
|
||||
#contactlist tr td.categories { display: none; }
|
||||
#contactsHeader tr td.categories { display: none; }
|
||||
|
@ -248,7 +248,7 @@ class ImportController extends Controller {
|
||||
foreach ($favourites as $favourite) {
|
||||
if ($favourite->getValue() == 'yes') {
|
||||
$tagMgr = \OC::$server->getTagManager()->load('contact');
|
||||
$this->tags->addToFavorites($id);
|
||||
$tagMgr->addToFavorites($id);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user