mirror of
https://github.com/friendica/friendica
synced 2024-12-23 23:20:16 +00:00
Merge remote-tracking branch 'upstream/develop' into 1604-cookie
This commit is contained in:
commit
ca72c5f256
3 changed files with 44 additions and 33 deletions
|
@ -118,6 +118,7 @@ function nav_info(&$a) {
|
||||||
if(count($a->apps)>0)
|
if(count($a->apps)>0)
|
||||||
$nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
|
$nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
|
||||||
|
|
||||||
|
if (local_user() OR !get_config('system','local_search')) {
|
||||||
$nav['search'] = array('search', t('Search'), "", t('Search site content'));
|
$nav['search'] = array('search', t('Search'), "", t('Search site content'));
|
||||||
|
|
||||||
$nav['searchoption'] = array(
|
$nav['searchoption'] = array(
|
||||||
|
@ -127,6 +128,7 @@ function nav_info(&$a) {
|
||||||
|
|
||||||
if (get_config('system','poco_local_search'))
|
if (get_config('system','poco_local_search'))
|
||||||
$nav['searchoption'][] = t("Forums");
|
$nav['searchoption'][] = t("Forums");
|
||||||
|
}
|
||||||
|
|
||||||
$gdirpath = 'directory';
|
$gdirpath = 'directory';
|
||||||
|
|
||||||
|
@ -140,6 +142,7 @@ function nav_info(&$a) {
|
||||||
elseif(get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
|
elseif(get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
|
||||||
$nav['community'] = array('community', t('Community'), "", t('Conversations on the network'));
|
$nav['community'] = array('community', t('Community'), "", t('Conversations on the network'));
|
||||||
|
|
||||||
|
if(local_user())
|
||||||
$nav['events'] = Array('events', t('Events'), "", t('Events and Calendar'));
|
$nav['events'] = Array('events', t('Events'), "", t('Events and Calendar'));
|
||||||
|
|
||||||
$nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
|
$nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
|
||||||
|
|
|
@ -63,6 +63,34 @@ nav ul {
|
||||||
a.desktop-view { display: none; }
|
a.desktop-view { display: none; }
|
||||||
a.mobile-view { display: initial; }
|
a.mobile-view { display: initial; }
|
||||||
#nav-apps-link { display: none; }
|
#nav-apps-link { display: none; }
|
||||||
|
|
||||||
|
.wall-item-container .wall-item-info { width: auto; }
|
||||||
|
.contact-photo-wrapper { width: 55px; }
|
||||||
|
.wwto { left: 0px; }
|
||||||
|
|
||||||
|
.type-link > a { height: 120px; width: 100%; overflow: hidden; display: block; }
|
||||||
|
.type-link > a > img { display: block; max-width: 100%!important; width: 100% !important; height: 100% !important; object-fit: cover !important; }
|
||||||
|
|
||||||
|
/** oembed **/
|
||||||
|
.embed_video {
|
||||||
|
float: none;
|
||||||
|
margin: 0px;
|
||||||
|
width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
.embed_video > img {
|
||||||
|
display: block;
|
||||||
|
width: 100% !important;
|
||||||
|
height: 100% !important;
|
||||||
|
max-width: 100% !important;
|
||||||
|
object-fit: cover !important;
|
||||||
|
}
|
||||||
|
.embed_video > div {
|
||||||
|
background-image: none !important; background-color: transparent !important;
|
||||||
|
width: 100% !important; height: 110px !important;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: 480px) {
|
@media screen and (max-width: 480px) {
|
||||||
|
@ -105,10 +133,6 @@ nav ul {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wall-item-container .wall-item-info { width: auto; }
|
|
||||||
.contact-photo-wrapper { width: 55px; }
|
|
||||||
.wwto { left: 0px; }
|
|
||||||
|
|
||||||
/* aside in/out */
|
/* aside in/out */
|
||||||
.mobile-aside-toggle {
|
.mobile-aside-toggle {
|
||||||
display: block !important;
|
display: block !important;
|
||||||
|
@ -256,25 +280,4 @@ select:focus {
|
||||||
.event-start, .event-end { width: auto; }
|
.event-start, .event-end { width: auto; }
|
||||||
.event-start .dtstart, .event-end .dtend { float: none; display: block; }
|
.event-start .dtstart, .event-end .dtend { float: none; display: block; }
|
||||||
|
|
||||||
/** oembed **/
|
|
||||||
.embed_video {
|
|
||||||
float: none;
|
|
||||||
margin: 0px;
|
|
||||||
height: 120px;
|
|
||||||
width: 100%;
|
|
||||||
overflow: hidden;
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
.embed_video > img {
|
|
||||||
display: block;
|
|
||||||
width: 100% !important;
|
|
||||||
height: auto !important;
|
|
||||||
max-width: 100% !important;
|
|
||||||
}
|
|
||||||
.embed_video > div {
|
|
||||||
background-image: none !important; background-color: transparent !important;
|
|
||||||
width: 100% !important; height: 110px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.type-link > a { height: 120px; width: 100%; overflow: hidden; display: block; }
|
|
||||||
.type-link > a > img { display: block; max-width: 100%!important; width: 100% !important; height: auto !important; }
|
|
||||||
|
|
|
@ -2378,6 +2378,11 @@ ul.tabs li .active, span.pager_current a {
|
||||||
aside form {
|
aside form {
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
}
|
}
|
||||||
|
aside form fieldset {
|
||||||
|
margin: 0px;
|
||||||
|
padding: 0px;
|
||||||
|
border: 0px none;
|
||||||
|
}
|
||||||
aside form .field label {
|
aside form .field label {
|
||||||
float: left;
|
float: left;
|
||||||
width: 170px;
|
width: 170px;
|
||||||
|
|
Loading…
Reference in a new issue