mirror of
https://github.com/friendica/friendica
synced 2024-12-22 06:07:27 +01:00
Merge https://github.com/friendica/friendica into pull
This commit is contained in:
friendica
commit
c4b3ea3a73
12 changed files with 395 additions and 266 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -2006,3 +2006,4 @@ $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
|
|||
$a->strings["Profile Details"] = "Profildetails";
|
||||
$a->strings["Events and Calendar"] = "Ereignisse und Kalender";
|
||||
$a->strings["Only You Can See This"] = "Nur du kannst das sehen";
|
||||
$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<ul class="menu-profile-side">
|
||||
<li class="menu-profile-list">
|
||||
<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>
|
||||
<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
|
||||
<a style="text-decoration: none;" href="$base?nets=all" class="menu-profile-list-item">$all</a></li>
|
||||
{{ for $nets as $net }}
|
||||
<li class="menu-profile-list">
|
||||
<a href="$base?nets=$net.ref" class="menu-profile-list-item">
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
<div id="nets-sidebar" class="widget">
|
||||
<h3>$title</h3>
|
||||
<div id="nets-desc">$desc</div>
|
||||
<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
|
||||
<ul class="nets-ul">
|
||||
{{ for $nets as $net }}
|
||||
<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
</div>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<div id="nets-sidebar" class="widget">
|
||||
<h3>$title</h3>
|
||||
<div id="nets-desc">$desc</div>
|
||||
<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
|
||||
<a href="$base?nets=all" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
|
||||
<ul class="nets-ul">
|
||||
{{ for $nets as $net }}
|
||||
<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<div id="nets-desc">$desc</div>
|
||||
|
||||
<ul class="nets-ul">
|
||||
<li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="nets-link nets-all">$all</a>
|
||||
<li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base?nets=all" class="nets-link nets-all">$all</a>
|
||||
{{ for $nets as $net }}
|
||||
<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li>
|
||||
{{ endfor }}
|
||||
|
|
|
|||
BIN
view/theme/smoothly/file.gif
Normal file
BIN
view/theme/smoothly/file.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 615 B |
|
|
@ -1,7 +1,7 @@
|
|||
<div id="nets-sidebar" class="widget">
|
||||
<h3>$title</h3>
|
||||
<div id="nets-desc">$desc</div>
|
||||
<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
|
||||
<a href="$base?nets=all" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
|
||||
<ul class="nets-ul">
|
||||
{{ for $nets as $net }}
|
||||
<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
</div>
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
|
||||
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
|
||||
</div>
|
||||
{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
|
||||
<div class="wall-item-delete-end"></div>
|
||||
|
|
@ -32,6 +31,19 @@
|
|||
<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
|
||||
<div class="wall-item-title-end"></div>
|
||||
<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
|
||||
|
||||
{{ if $item.has_cats }}
|
||||
<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name
|
||||
<a href="$cat.removeurl" title="$remove">[$remove]</a>
|
||||
{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.has_folders }}
|
||||
<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name
|
||||
<a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
|
||||
</div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
<div class="wall-item-author">
|
||||
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
style.css
|
||||
Smoothly
|
||||
|
||||
Created by alex@friendica.pixelbits.de on 2012-09-25
|
||||
Created by alex@friendica.pixelbits.de on 2012-10-04
|
||||
|
||||
** Colors **
|
||||
Blue links - #1873a2
|
||||
|
|
@ -74,7 +74,7 @@ li.widget-list {
|
|||
list-style: none outside none;
|
||||
background: url("arrow.png") no-repeat scroll left center transparent;
|
||||
display: block;
|
||||
padding: 3px 24px;
|
||||
/*padding: 3px 24px;*/
|
||||
}
|
||||
|
||||
.required {
|
||||
|
|
@ -643,11 +643,11 @@ aside {
|
|||
font-style: bold;
|
||||
}
|
||||
|
||||
aside a{
|
||||
padding-bottom: 5px;
|
||||
aside a {
|
||||
/*padding-bottom: 5px;*/
|
||||
}
|
||||
|
||||
.vcard {
|
||||
.vcard .title {
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
|
|
@ -657,6 +657,9 @@ aside a{
|
|||
-webkit-margin-start: 10px;
|
||||
}
|
||||
|
||||
.fn {
|
||||
}
|
||||
|
||||
.vcard .fn {
|
||||
font-size: 1.4em;
|
||||
font-weight: bold;
|
||||
|
|
@ -894,11 +897,11 @@ ul .sidebar-group-li .icon {
|
|||
width: 12px;
|
||||
}
|
||||
|
||||
.nets-ul {
|
||||
.nets-ul, .fileas-ul, .categories-ul {
|
||||
list-style-type: none;
|
||||
}
|
||||
|
||||
.nets-ul li {
|
||||
.nets-ul li, .fileas-ul li, .categories-ul li {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
|
|
@ -909,6 +912,14 @@ ul .sidebar-group-li .icon {
|
|||
margin-left: 42px;
|
||||
}
|
||||
|
||||
.fileas-link, .categories-link {
|
||||
margin-left: 24px;
|
||||
}
|
||||
|
||||
.fileas-all, .categories-all {
|
||||
margin-left: 0px;
|
||||
}
|
||||
|
||||
.widget h3 {
|
||||
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f0edf0), color-stop(1, #e2e2e2) );
|
||||
background: -moz-linear-gradient( center top, #f0edf0 5%, #e2e2e2 100% );
|
||||
|
|
@ -975,15 +986,24 @@ ul .sidebar-group-li .icon {
|
|||
float: left;
|
||||
}
|
||||
|
||||
.contact-block-link {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.contact-block-textdiv {
|
||||
width: 150px;
|
||||
height: 34px;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.contact-block-h4,
|
||||
.contact-block-content {
|
||||
}
|
||||
|
||||
#contact-block,
|
||||
#contact-block-end {
|
||||
clear: both;
|
||||
}
|
||||
}
|
||||
|
||||
/* ======= */
|
||||
/* = Jot = */
|
||||
|
|
@ -1062,6 +1082,8 @@ ul .sidebar-group-li .icon {
|
|||
border-radius: 5px 5px 5px 5px;
|
||||
}
|
||||
|
||||
#jot-preview-form {}
|
||||
|
||||
#jot-preview-link {
|
||||
float: left;
|
||||
width: 60px;
|
||||
|
|
@ -1176,6 +1198,12 @@ ul .sidebar-group-li .icon {
|
|||
display:block!important;
|
||||
}
|
||||
|
||||
#profile-video-wrapper,
|
||||
#profile-audio-wrapper,
|
||||
#profile-location-wrapper,
|
||||
#profile-nolocation-wrapper {
|
||||
}
|
||||
|
||||
#group_allow_wrapper,
|
||||
#group_deny_wrapper,
|
||||
#acl-permit-outer-wrapper {
|
||||
|
|
@ -1217,13 +1245,20 @@ ul .sidebar-group-li .icon {
|
|||
|
||||
#profile-jot-wrapper {
|
||||
margin-top: -15px;
|
||||
padding-top: 0px;
|
||||
}
|
||||
|
||||
profile-jot-banner-wrapper {
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
}
|
||||
#profile-jot-desc,
|
||||
#profile-jot-form,
|
||||
#jot-location,
|
||||
#jot-coord,
|
||||
#jot-preview,
|
||||
#jot-title-wrap,
|
||||
#jot-category-wrap,
|
||||
#jot-text-wrap,
|
||||
#profile-jot-text-loading,
|
||||
#profile-attach-wrapper,
|
||||
#profile-link-wrapper,
|
||||
#profile-jot-banner-wrapper {}
|
||||
|
||||
.contact-h4 {
|
||||
font-size: 1.2em;
|
||||
|
|
@ -1283,6 +1318,8 @@ profile-jot-banner-wrapper {
|
|||
padding-top: 10px;
|
||||
}
|
||||
|
||||
.wall-item-comment-wrapper {}
|
||||
|
||||
.wall-item-photo-menu {
|
||||
display: none;
|
||||
}
|
||||
|
|
@ -1582,6 +1619,7 @@ profile-jot-banner-wrapper {
|
|||
float: right;
|
||||
}
|
||||
|
||||
#item-delete-selected-end,
|
||||
#item-delete-selected {
|
||||
overflow: auto;
|
||||
margin-top: 20px;
|
||||
|
|
@ -1589,16 +1627,18 @@ profile-jot-banner-wrapper {
|
|||
width: 250px;
|
||||
}
|
||||
|
||||
#item-delete-selected-icon {}
|
||||
|
||||
code {
|
||||
font-family: Courier, monospace;
|
||||
white-space: pre;
|
||||
/*white-space: pre;*/
|
||||
display: block;
|
||||
overflow: auto;
|
||||
border: 1px solid #444;
|
||||
background: #EEE;
|
||||
color: #444;
|
||||
padding: 10px;
|
||||
margin-top: 20px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
blockquote {
|
||||
|
|
@ -1617,6 +1657,8 @@ blockquote {
|
|||
margin-left: 60px;
|
||||
}
|
||||
|
||||
#tread-wrapper {}
|
||||
|
||||
.tread-wrapper {
|
||||
border: 0px solid #CDCDCD;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
|
|
@ -1743,13 +1785,13 @@ blockquote {
|
|||
|
||||
.wall-item-body code {
|
||||
font-family: Courier, monospace;
|
||||
white-space: pre;
|
||||
/*white-space: pre;*/
|
||||
display: block;
|
||||
overflow: auto;
|
||||
border: 1px solid #cccccc;
|
||||
border-width: 1px 1px 1px 10px;
|
||||
padding-left: 10px;
|
||||
margin-top: 20px;
|
||||
border-width: 1px 1px 1px 3px;
|
||||
padding-left: 5px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
/* =========== */
|
||||
|
|
@ -2097,7 +2139,6 @@ div[id$="wrapper"] br {
|
|||
}
|
||||
|
||||
select, input {
|
||||
margin-top: 0px;
|
||||
border: 1px solid #b0b0b0;
|
||||
padding: 2px;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -3150,7 +3191,9 @@ margin-left: 0px;
|
|||
/* ========== */
|
||||
/* = Events = */
|
||||
/* ========== */
|
||||
|
||||
|
||||
#events-reminder {}
|
||||
|
||||
.clear {
|
||||
clear: both;
|
||||
margin-top: 10px;
|
||||
|
|
@ -4111,3 +4154,82 @@ hr.line-dots {
|
|||
background: url("dot.png") repeat-x scroll left center transparent;
|
||||
border: medium none;
|
||||
}
|
||||
|
||||
.body-tag, .filesavetags, .categorytags {
|
||||
opacity: 0.5;
|
||||
filter:alpha(opacity=50);
|
||||
}
|
||||
|
||||
.body-tag:hover, .filesavetags:hover, .categorytags:hover {
|
||||
opacity: 1.0 !important;
|
||||
filter:alpha(opacity=100) !important;
|
||||
}
|
||||
|
||||
.item-select {
|
||||
opacity: 0.5;
|
||||
filter:alpha(opacity=10);
|
||||
float: right;
|
||||
margin-right: 10px;
|
||||
|
||||
}
|
||||
.item-select:hover, .checkeditem {
|
||||
opacity: 1;
|
||||
filter:alpha(opacity=100);
|
||||
}
|
||||
|
||||
.filer-icon {
|
||||
display: block; width: 16px; height: 16px;
|
||||
background-image: url('file.gif');
|
||||
}
|
||||
|
||||
.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
|
||||
[class^="comment-edit-bb"] {
|
||||
list-style: none;
|
||||
display: none;
|
||||
margin: 0px 0 -5px 0px;
|
||||
padding: 0px;
|
||||
width: 75%;
|
||||
}
|
||||
|
||||
.body-attach {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.grey {
|
||||
color: #888888;
|
||||
}
|
||||
|
||||
.location, .location-label, .gender-label, .marital-label, .homepage-label {
|
||||
float: left;
|
||||
text-align: left;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.adr, .x-gender, .marital-text, .homepage-url {
|
||||
float: left;
|
||||
display: block;
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
#birthday-notice {}
|
||||
#nav-notifications-template {}
|
||||
#categories-sidebar {}
|
||||
#nets-desc {}
|
||||
#status-tab {}
|
||||
#page-footer {}
|
||||
#live-profile {}
|
||||
|
||||
.city-state-zip {}
|
||||
.country-name {}
|
||||
.locality {}
|
||||
.region {}
|
||||
.postal-code {}
|
||||
.mpfriend {}
|
||||
.toplevel_item {}
|
||||
|
||||
.fc-header,
|
||||
.fc-view,
|
||||
.fc-view-basicWeek,
|
||||
.fc-grid,
|
||||
.fc-border-separate,
|
||||
.fc-content {}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
* Name: Smoothly
|
||||
* Description: Like coffee with milk. Theme works fine with iPad[2].
|
||||
* Version: Version 0.9.9
|
||||
* Version: Version 0.10.4
|
||||
* Author: Alex <https://friendica.pixelbits.de/profile/alex>
|
||||
* Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
|
||||
* Screenshot: <a href="screenshot.png">Screenshot</a>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<div id="nets-sidebar" class="widget">
|
||||
<h3>$title</h3>
|
||||
<div id="nets-desc">$desc</div>
|
||||
<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
|
||||
<a href="$base?nets=all" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
|
||||
<ul class="nets-ul">
|
||||
{{ for $nets as $net }}
|
||||
<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
|
||||
|
|
|
|||
Loading…
Reference in a new issue