mirror of
https://git.friendi.ca/friendica/friendica.git
synced 2025-06-17 01:25:21 +02:00
Merge remote-tracking branch 'upstream/master'
Conflicts: mod/crepair.php
This commit is contained in:
Michael Vogel
commit
aed28a24f1
35 changed files with 9339 additions and 8738 deletions
|
|
@ -91,6 +91,7 @@ nav {
|
|||
display: block;
|
||||
margin: 0px 10%;
|
||||
border-bottom: 1px solid #babdb6;
|
||||
position: relative;
|
||||
}
|
||||
nav #site-location {
|
||||
color: #888a85;
|
||||
|
|
@ -1616,6 +1617,9 @@ input#dfrn-url {
|
|||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.contact-select { position: absolute; top: 64px; left:64px; display:none; }
|
||||
.contact-select:checked,
|
||||
.contact-entry-photo:hover .contact-select { display:block; }
|
||||
|
||||
.contact-photo-menu-button {
|
||||
position: absolute;
|
||||
|
|
@ -2905,6 +2909,8 @@ aside input[type='text'] {
|
|||
|
||||
.field.radio .field_help { margin-left: 0px; }
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* ADMIN
|
||||
*/
|
||||
|
|
@ -3252,7 +3258,7 @@ ul.menu-popup {
|
|||
list-style: none;
|
||||
z-index: 100000;
|
||||
top: 90px;
|
||||
left: 400px;
|
||||
left: 200px;
|
||||
}
|
||||
#nav-notifications-menu {
|
||||
width: 320px;
|
||||
|
|
@ -3328,3 +3334,63 @@ ul.menu-popup {
|
|||
.shared_header span {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
/* small screens */
|
||||
@media all and (max-width: 1089px) {
|
||||
.field label { width: 90%; }
|
||||
.field input, .field textarea, .field select { width: 90%; }
|
||||
.field input[type="checkbox"],.field input[type="radio"] {
|
||||
width: 2em;
|
||||
}
|
||||
#id_openid_url { width: 85%; }
|
||||
.field_help { margin-left: 0px; }
|
||||
textarea { width: 100%; }
|
||||
}
|
||||
@media all and (max-width: 760px) {
|
||||
body { background-image: none; }
|
||||
nav, aside, section, footer {
|
||||
margin: 0px;
|
||||
float: none;
|
||||
position: relative;
|
||||
width: 100%;
|
||||
padding: 0.5em;
|
||||
height: auto;
|
||||
}
|
||||
aside:before {
|
||||
content: ">>";
|
||||
display: block;
|
||||
background-color: #eee;
|
||||
}
|
||||
aside { overflow: hidden; min-height: 0; height: 1em;}
|
||||
aside:hover, aside:focus { height: auto; }
|
||||
|
||||
nav .nav-link {
|
||||
float: left;
|
||||
width: 23%;
|
||||
min-width: 100px;
|
||||
height: 15px;
|
||||
display: block;
|
||||
margin: 0.4em 2px 0 0;
|
||||
|
||||
padding: 6px 3px;
|
||||
border-width: 1px 1px 0px;
|
||||
border-style: solid solid none;
|
||||
border-color: rgb(186, 189, 182);
|
||||
background-color: rgb(174, 192,211)!important;
|
||||
}
|
||||
.nav-commlink.selected,
|
||||
.nav-commlink {
|
||||
border-bottom: 0px;
|
||||
padding: 6px 3px;
|
||||
min-width: 100px;
|
||||
float: left;
|
||||
margin-top: 0.4em;
|
||||
width: 23%;
|
||||
bottom: auto;
|
||||
}
|
||||
.nav-ajax-left {margin-left: -1em; margin-top: 0px; }
|
||||
nav #site-location,
|
||||
nav #banner { position: relative; clear:both; }
|
||||
ul.menu-popup { left: 0px; top 20px; }
|
||||
|
||||
}
|
||||
|
|
@ -1349,6 +1349,19 @@ span[id^="showmore-wrap"] {
|
|||
.contact-photo-wrapper {
|
||||
position: relative;
|
||||
}
|
||||
.contact-select {
|
||||
position: absolute;
|
||||
top: 64px;
|
||||
left: 64px;
|
||||
display: none;
|
||||
}
|
||||
.contact-select:checked,
|
||||
.contact-photo:hover .contact-select {
|
||||
display: block;
|
||||
}
|
||||
#contats-actions {
|
||||
clear: both;
|
||||
}
|
||||
.contact-photo {
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
|
|
|
|||
|
|
@ -1349,6 +1349,19 @@ span[id^="showmore-wrap"] {
|
|||
.contact-photo-wrapper {
|
||||
position: relative;
|
||||
}
|
||||
.contact-select {
|
||||
position: absolute;
|
||||
top: 64px;
|
||||
left: 64px;
|
||||
display: none;
|
||||
}
|
||||
.contact-select:checked,
|
||||
.contact-photo:hover .contact-select {
|
||||
display: block;
|
||||
}
|
||||
#contats-actions {
|
||||
clear: both;
|
||||
}
|
||||
.contact-photo {
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
|
|
|
|||
|
|
@ -1349,6 +1349,19 @@ span[id^="showmore-wrap"] {
|
|||
.contact-photo-wrapper {
|
||||
position: relative;
|
||||
}
|
||||
.contact-select {
|
||||
position: absolute;
|
||||
top: 64px;
|
||||
left: 64px;
|
||||
display: none;
|
||||
}
|
||||
.contact-select:checked,
|
||||
.contact-photo:hover .contact-select {
|
||||
display: block;
|
||||
}
|
||||
#contats-actions {
|
||||
clear: both;
|
||||
}
|
||||
.contact-photo {
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
|
|
|
|||
|
|
@ -527,7 +527,8 @@ section {
|
|||
.contact-photo-wrapper { margin-left: 16px; }
|
||||
.contact-photo {
|
||||
width: 32px; height: 32px;
|
||||
}
|
||||
}
|
||||
|
||||
.contact-photo-menu-button {
|
||||
top: 15px !important;
|
||||
left: 0px !important;
|
||||
|
|
@ -738,6 +739,10 @@ span[id^="showmore-wrap"] {
|
|||
|
||||
|
||||
.contact-photo-wrapper { position: relative; }
|
||||
.contact-select { position: absolute; top:64px; left:64px; display:none; }
|
||||
.contact-select:checked,
|
||||
.contact-photo:hover .contact-select { display:block; }
|
||||
#contats-actions { clear: both; }
|
||||
.contact-photo {
|
||||
width: 48px; height: 48px;
|
||||
img { width: 48px; height: 48px; }
|
||||
|
|
|
|||
|
|
@ -1,8 +1,3 @@
|
|||
{{*
|
||||
* AUTOMATICALLY GENERATED TEMPLATE
|
||||
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
|
||||
*
|
||||
*}}
|
||||
|
||||
<div class="contact-wrapper" id="contact-entry-wrapper-{{$id}}" >
|
||||
<div class="contact-photo-wrapper" >
|
||||
|
|
@ -12,6 +7,7 @@
|
|||
|
||||
<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
|
||||
|
||||
<input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
|
||||
{{if $contact.photo_menu}}
|
||||
<a href="#" rel="#contact-photo-menu-{{$contact.id}}" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-{{$contact.id}}">menu</a>
|
||||
<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-{{$contact.id}}">
|
||||
|
|
|
|||
|
|
@ -291,7 +291,9 @@ blockquote.shared_content {
|
|||
body {
|
||||
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 14px;
|
||||
background-color: #ffffff;
|
||||
/* background-color: #ffffff; */
|
||||
background-color: #FAFAFA;
|
||||
/* background-color: rgb(252, 252, 252); */
|
||||
color: #2d2d2d;
|
||||
margin: 0px 0px 0px 0px;
|
||||
display: table;
|
||||
|
|
@ -1087,7 +1089,9 @@ section {
|
|||
width: 766px;
|
||||
max-width: 766px;
|
||||
padding: 10px 10px 10px 10px;
|
||||
background-color: white;
|
||||
/* background-color: white; */
|
||||
/* background-color: rgb(252, 252, 252); */
|
||||
background-color: #FAFAFA;
|
||||
border-bottom: 1px solid lightgray;
|
||||
border-right: 1px solid lightgray;
|
||||
border-left: 1px solid lightgray;
|
||||
|
|
@ -1410,6 +1414,31 @@ border-bottom: 1px solid #D2D2D2;
|
|||
padding-right: 12px; */
|
||||
}
|
||||
|
||||
.twit {
|
||||
background-color: #FFFAFA;
|
||||
}
|
||||
.pump {
|
||||
background-color: #FAFFFA;
|
||||
}
|
||||
.face {
|
||||
background-color: #FAFAFF;
|
||||
}
|
||||
.feed {
|
||||
background-color: #FFFFFA;
|
||||
}
|
||||
.dspr {
|
||||
background-color: #FFFAFF;
|
||||
}
|
||||
.dfrn {
|
||||
background-color: #FAFFFF;
|
||||
}
|
||||
.stat {
|
||||
background-color: #FAFAFA;
|
||||
}
|
||||
.mail {
|
||||
background-color: #FFFFF9;
|
||||
}
|
||||
|
||||
#profile-jot-form #profile-jot-text {
|
||||
height: 2.0em;
|
||||
/* width: 99%; */
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
{{foreach $threads as $thread}}
|
||||
|
||||
<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}} {{$thread.toplevel}}">
|
||||
<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}} {{$thread.toplevel}} {{$thread.network}}">
|
||||
|
||||
|
||||
{{if $thread.type == tag}}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
|
||||
</div>
|
||||
|
||||
<div class="wall-item-container {{$item.indent}} {{$item.shiny}} " id="item-{{$item.id}}">
|
||||
<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}}" id="item-{{$item.id}}">
|
||||
<div class="wall-item-item">
|
||||
<div class="wall-item-info">
|
||||
<div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue