mirror of https://github.com/friendica/friendica
Merge branch 'pull'
This commit is contained in:
friendica
commit
9df67e5cfe
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 28 KiB |
|
|
@ -51,9 +51,9 @@
|
|||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1.9403009"
|
||||
inkscape:cx="100.08061"
|
||||
inkscape:cy="113.21269"
|
||||
inkscape:zoom="1.3859292"
|
||||
inkscape:cx="105.02551"
|
||||
inkscape:cy="107.90767"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="true"
|
||||
|
|
@ -107,7 +107,7 @@
|
|||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
<dc:title />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
|
|
@ -572,7 +572,7 @@
|
|||
inkscape:connector-curvature="0"
|
||||
id="rect4428-4"
|
||||
d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
<path
|
||||
inkscape:export-ydpi="90"
|
||||
inkscape:export-xdpi="90"
|
||||
|
|
@ -580,7 +580,7 @@
|
|||
inkscape:connector-curvature="0"
|
||||
id="path4440-4"
|
||||
d="m 124.78127,905.73727 -1.9375,-0.063"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
<path
|
||||
inkscape:export-ydpi="90"
|
||||
inkscape:export-xdpi="90"
|
||||
|
|
@ -589,7 +589,7 @@
|
|||
inkscape:connector-curvature="0"
|
||||
id="path4442-9"
|
||||
d="m 117.59377,901.20597 6.4375,0"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
<rect
|
||||
inkscape:export-ydpi="90"
|
||||
inkscape:export-xdpi="90"
|
||||
|
|
@ -599,12 +599,12 @@
|
|||
height="0.375"
|
||||
width="1.0625"
|
||||
id="rect4446-9"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
<rect
|
||||
inkscape:export-ydpi="90"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
id="rect4448-3"
|
||||
width="1.0625"
|
||||
height="0.375"
|
||||
|
|
@ -619,12 +619,12 @@
|
|||
height="0.375"
|
||||
width="1.0625"
|
||||
id="rect4450-6"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
<rect
|
||||
inkscape:export-ydpi="90"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
id="rect4452-0"
|
||||
width="1.0625"
|
||||
height="0.375"
|
||||
|
|
@ -639,12 +639,12 @@
|
|||
height="0.375"
|
||||
width="1.0625"
|
||||
id="rect4454-5"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
<rect
|
||||
inkscape:export-ydpi="90"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
id="rect4456-0"
|
||||
width="1.0625"
|
||||
height="0.375"
|
||||
|
|
@ -659,12 +659,12 @@
|
|||
height="0.375"
|
||||
width="1.0625"
|
||||
id="rect4458-2"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
<rect
|
||||
inkscape:export-ydpi="90"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
id="rect4460-9"
|
||||
width="1.0625"
|
||||
height="0.375"
|
||||
|
|
@ -679,12 +679,12 @@
|
|||
height="0.375"
|
||||
width="1.0625"
|
||||
id="rect4462-4"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
<rect
|
||||
inkscape:export-ydpi="90"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
id="rect4464-3"
|
||||
width="1.0625"
|
||||
height="0.375"
|
||||
|
|
@ -699,12 +699,12 @@
|
|||
height="0.375"
|
||||
width="1.0625"
|
||||
id="rect4466-5"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
<rect
|
||||
inkscape:export-ydpi="90"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
id="rect4468-1"
|
||||
width="1.0625"
|
||||
height="0.375"
|
||||
|
|
@ -719,12 +719,12 @@
|
|||
height="0.375"
|
||||
width="1.0625"
|
||||
id="rect4470-7"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
<rect
|
||||
inkscape:export-ydpi="90"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
id="rect4472-4"
|
||||
width="1.0625"
|
||||
height="0.375"
|
||||
|
|
@ -739,12 +739,12 @@
|
|||
height="0.375"
|
||||
width="1.0625"
|
||||
id="rect4474-3"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
<rect
|
||||
inkscape:export-ydpi="90"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
id="rect4476-1"
|
||||
width="1.0625"
|
||||
height="0.375"
|
||||
|
|
@ -759,12 +759,12 @@
|
|||
height="0.375"
|
||||
width="1.0625"
|
||||
id="rect4478-4"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
|
||||
<rect
|
||||
inkscape:export-ydpi="90"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
|
||||
style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
id="rect4480-6"
|
||||
width="1.0625"
|
||||
height="0.375"
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 117 KiB |
|
|
@ -57,14 +57,6 @@ works -->
|
|||
</li>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $userinfo }}
|
||||
<ul id="nav-user-menu" class="menu-popup">
|
||||
{{ for $nav.usermenu as $usermenu }}
|
||||
<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $nav.contacts }}
|
||||
<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
|
||||
{{ endif }}
|
||||
|
|
@ -94,6 +86,14 @@ works -->
|
|||
</ul>
|
||||
</div>
|
||||
|
||||
{{ if $userinfo }}
|
||||
<ul id="nav-user-menu" class="menu-popup">
|
||||
{{ for $nav.usermenu as $usermenu }}
|
||||
<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
{{ endif }}
|
||||
|
||||
<div id="notifications">
|
||||
{{ if $nav.home }}
|
||||
<a id="home-update" class="nav-ajax-left" href="$nav.home.0" title="$nav.home.1"></a>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
</div>
|
||||
|
||||
<div id="photo-photo-end"></div>
|
||||
<div id="photo-caption" >$desc</div>
|
||||
<div id="photo-caption">$desc</div>
|
||||
{{ if $tags }}
|
||||
<div id="in-this-photo-text">$tags.0</div>
|
||||
<div id="in-this-photo">$tags.1</div>
|
||||
|
|
|
|||
|
|
@ -6,13 +6,17 @@
|
|||
<div class="title">$profile.pdesc</div>
|
||||
{{ endif }}
|
||||
<div id="profile-photo-wrapper">
|
||||
<img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name" />
|
||||
<img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name" />
|
||||
<div class="profile-edit-side-div">
|
||||
<a class="profile-edit-side-link icon edit" title="$profile.$editprofile" href="profiles/$profile.id" ></a>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
||||
{{ if $location }}
|
||||
<div class="location">
|
||||
<span class="location-label">$location</span>
|
||||
<div class="adr">
|
||||
<address class="adr">
|
||||
{{ if $profile.address }}
|
||||
<div class="street-address">$profile.address</div>{{ endif }}
|
||||
<span class="city-state-zip">$profile.zip</span>
|
||||
|
|
@ -20,7 +24,7 @@
|
|||
<span class="region">$profile.region</span>
|
||||
<span class="postal-code">$profile.postal-code</span>
|
||||
{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
|
||||
</div>
|
||||
</address>
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
|
|
|
|||
|
|
@ -520,11 +520,13 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
|
|||
position: fixed;
|
||||
left: 28px;
|
||||
bottom: 6px;
|
||||
z-index: 10;
|
||||
}
|
||||
#language-selector {
|
||||
position: fixed;
|
||||
bottom: 2px;
|
||||
left: 52px;
|
||||
z-index: 10;
|
||||
}
|
||||
.menu-popup {
|
||||
position: absolute;
|
||||
|
|
@ -810,6 +812,9 @@ aside #viewcontacts {
|
|||
border-bottom: 0;
|
||||
padding: 5px;
|
||||
}
|
||||
#profile-jot-net {
|
||||
margin: 5px 0;
|
||||
}
|
||||
#jot-preview-link {
|
||||
margin: 0 0 0 10px;
|
||||
border: 0;
|
||||
|
|
@ -831,12 +836,12 @@ aside #viewcontacts {
|
|||
background-color: #555753;
|
||||
height: 22px;
|
||||
width: 20px;
|
||||
-webkit-border-radius: 5px 0px 0px 5px;
|
||||
-moz-border-radius: 5px 0px 0px 5px;
|
||||
border-radius: 5px 0px 0px 5px;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
overflow: hidden;
|
||||
border: 0px;
|
||||
margin: 0 -4px 0 10px;
|
||||
margin: 0 10px 0 10px;
|
||||
}
|
||||
#profile-jot-plugin-wrapper {
|
||||
width: 1px;
|
||||
|
|
@ -854,23 +859,21 @@ aside #viewcontacts {
|
|||
height: 22px;
|
||||
background-color: #555753;
|
||||
color: #eeeeec;
|
||||
-webkit-border-radius: 0 5px 5px 0;
|
||||
-moz-border-radius: 0 5px 5px 0;
|
||||
border-radius: 0 5px 5px 0;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
border: 0;
|
||||
margin: 0;
|
||||
float: right;
|
||||
}
|
||||
#jot-perms-icons {
|
||||
background-color: #555753;
|
||||
#jot-perms-icon {
|
||||
height: 22px;
|
||||
width: 20px;
|
||||
-webkit-border-radius: 0 5px 5px 0;
|
||||
-moz-border-radius: 0 5px 5px 0;
|
||||
border-radius: 0 5px 5px 0;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
overflow: hidden;
|
||||
border: 0;
|
||||
margin: 0 0 0 94.4%;
|
||||
}
|
||||
#profile-jot-acl-wrapper {
|
||||
margin: 0 10px;
|
||||
|
|
@ -916,7 +919,8 @@ aside #viewcontacts {
|
|||
color: #cccccc;
|
||||
}
|
||||
#profile-jot-desc {
|
||||
color: #a00;
|
||||
color: #ff2000;
|
||||
margin: 5px 0;
|
||||
}
|
||||
#jot-title-wrapper {
|
||||
margin-bottom: 5px;
|
||||
|
|
@ -1503,20 +1507,26 @@ div[id$="wrapper"] br {
|
|||
}
|
||||
.mail-list-sender-name {
|
||||
display: inline;
|
||||
font-size: 1.1em;
|
||||
}
|
||||
.mail-list-date {
|
||||
display: inline;
|
||||
font-size: 0.8em;
|
||||
font-size: 0.9em;
|
||||
padding-left: 10px;
|
||||
}
|
||||
.mail-list-sender-name, .mail-list-date {
|
||||
font-style: italic;
|
||||
}
|
||||
.mail-list-subject {
|
||||
font-size: 1.5em;
|
||||
font-size: 1.2em;
|
||||
font-weight: bold;
|
||||
}
|
||||
.mail-list-delete-wrapper {
|
||||
float: right;
|
||||
}
|
||||
.mail-list-outside-wrapper-end {
|
||||
clear: both;
|
||||
border-bottom: 1px #eec dotted;
|
||||
}
|
||||
.mail-conv-sender {
|
||||
float: left;
|
||||
|
|
@ -1734,11 +1744,21 @@ div[id$="wrapper"] br {
|
|||
margin: 30px 0px;
|
||||
}
|
||||
.profile-edit-side-div {
|
||||
margin: 5px 2px 0 0;
|
||||
background: #2e2f2e;
|
||||
border-radius: 5px 5px 0 0;
|
||||
width: 175px;
|
||||
height: 20px;
|
||||
position: relative;
|
||||
margin: -25px -30px 0px 0px;
|
||||
display: none;
|
||||
}
|
||||
.profile-edit-side-div:hover {
|
||||
/*margin: 0px 0px 0px 0px;*/
|
||||
display: inline;
|
||||
}
|
||||
.profile-edit-side-link {
|
||||
margin: 0 20px -18px 0;
|
||||
float: right;
|
||||
margin: 0 0px 0px 155px;
|
||||
/*float: right;*/
|
||||
}
|
||||
.profile-listing {
|
||||
float: left;
|
||||
|
|
@ -1749,6 +1769,9 @@ div[id$="wrapper"] br {
|
|||
padding: 0;
|
||||
list-style: none;
|
||||
}
|
||||
.marital {
|
||||
margin-top: 5px;
|
||||
}
|
||||
#register-sitename {
|
||||
display: inline;
|
||||
font-weight: bold;
|
||||
|
|
@ -1970,6 +1993,9 @@ div[id$="wrapper"] br {
|
|||
background: #88a9d2;
|
||||
font-weight: bold;
|
||||
}
|
||||
.group-selected:hover, .nets-selected:hover {
|
||||
color: #2e2f2e;
|
||||
}
|
||||
.groupsideedit {
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
|
@ -2115,11 +2141,16 @@ div[id$="wrapper"] br {
|
|||
width: 16px; height: 16px;
|
||||
}
|
||||
#adminpage table tr:hover {
|
||||
background-color:#bbc7d7;
|
||||
color: #2e2f2e;
|
||||
background-color: #eec;
|
||||
}
|
||||
#adminpage .selectall {
|
||||
text-align: right;
|
||||
}
|
||||
#adminpage #users a {
|
||||
color: #2e2f2e;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
/**
|
||||
* Form fields
|
||||
|
|
@ -2397,7 +2428,7 @@ div[id$="wrapper"] br {
|
|||
background-position: -70px -40px;
|
||||
}
|
||||
.unlock {
|
||||
background-position: -90px -40px;
|
||||
background-position: -88px -40px;
|
||||
}
|
||||
.video {
|
||||
background-position: -110px -40px;
|
||||
|
|
@ -2481,8 +2512,8 @@ footer {
|
|||
}
|
||||
#profile-jot-text {
|
||||
height: 20px;
|
||||
color: #666;
|
||||
border: 1px solid #ccc;
|
||||
color: #eec;
|
||||
border: 1px solid #eec;
|
||||
border-radius: 5px;
|
||||
width: 99.5%;
|
||||
}
|
||||
|
|
@ -2493,113 +2524,117 @@ footer {
|
|||
#photos-upload-permissions-wrapper,
|
||||
#profile-jot-acl-wrapper {
|
||||
display: block !important;
|
||||
background: #2e2f2e;
|
||||
color: #eec;
|
||||
}
|
||||
#acl-wrapper {
|
||||
width: 690px;
|
||||
float: left;
|
||||
width: 660px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
#acl-search {
|
||||
float: right;
|
||||
background: #fff url("../../../images/search_18.png") no-repeat right center;
|
||||
padding-right: 20px;
|
||||
margin: 6px;
|
||||
}
|
||||
#acl-showall {
|
||||
float:left;
|
||||
display:block;
|
||||
width:auto;
|
||||
height:18px;
|
||||
background-color:#CCC;
|
||||
background-image:url("../../../images/show_all_off.png");
|
||||
background-position:7px 7px;
|
||||
background-repeat:no-repeat;
|
||||
padding:7px 10px 7px 30px;
|
||||
-webkit-border-radius:5px;
|
||||
-moz-border-radius:5px;
|
||||
border-radius:5px;
|
||||
color:#999;
|
||||
float: left;
|
||||
display: block;
|
||||
width: auto;
|
||||
height: 18px;
|
||||
background: #eec url("../../../images/show_all_off.png") 8px 8px no-repeat;
|
||||
padding: 7px 10px 7px 30px;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
color: #999;
|
||||
margin: 5px 0;
|
||||
}
|
||||
#acl-showall.selected {
|
||||
color:#000;
|
||||
background-color:#F90;
|
||||
background-image:url(../../../images/show_all_on.png);
|
||||
color: #000;
|
||||
background: #f90 url(../../../images/show_all_on.png) 8px 8px no-repeat;
|
||||
}
|
||||
#acl-list {
|
||||
height:210px;
|
||||
border:1px solid #ccc;
|
||||
clear:both;
|
||||
margin-top:30px;
|
||||
overflow:auto;
|
||||
}
|
||||
#acl-list-content {
|
||||
height: 210px;
|
||||
border: 1px solid #ccc;
|
||||
clear: both;
|
||||
margin-top: 30px;
|
||||
overflow: auto;
|
||||
}
|
||||
/*#acl-list-content {*/
|
||||
/*}*/
|
||||
.acl-list-item {
|
||||
display:block;
|
||||
width:150px;
|
||||
height:30px;
|
||||
border:1px solid #ccc;
|
||||
margin:5px;
|
||||
float:left;
|
||||
border: 1px solid #eec;
|
||||
display: block;
|
||||
float: left;
|
||||
height: 110px;
|
||||
margin: 3px 0 5px 5px;
|
||||
width: 120px;
|
||||
}
|
||||
.acl-list-item img {
|
||||
width:22px;
|
||||
height:22px;
|
||||
float:left;
|
||||
margin:4px;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
float: left;
|
||||
margin: 5px 5px 20px;
|
||||
}
|
||||
.acl-list-item p {
|
||||
height: 12px;
|
||||
font-size: 10px;
|
||||
margin: 0;
|
||||
margin: 0 0 22px;
|
||||
padding: 2px 0 1px;
|
||||
}
|
||||
.acl-list-item a {
|
||||
font-size:8px;
|
||||
display:block;
|
||||
width:40px;
|
||||
height:10px;
|
||||
float:left;
|
||||
color:#999;
|
||||
background-color:#CCC;
|
||||
background-position:3px 3px;
|
||||
background-repeat:no-repeat;
|
||||
margin-right:5px;
|
||||
-webkit-border-radius:2px;
|
||||
-moz-border-radius:2px;
|
||||
border-radius:2px;
|
||||
padding-left:15px;
|
||||
background: #eec 3px 3px no-repeat;
|
||||
-webkit-border-radius: 2px;
|
||||
-moz-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
clear: both;
|
||||
font-size: 10px;
|
||||
display: block;
|
||||
width: 55px;
|
||||
height: 20px;
|
||||
color: #2e2f2e;
|
||||
margin: 5px auto 0;
|
||||
padding: 0 3px;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
}
|
||||
#acl-wrapper a:hover {
|
||||
text-decoration:none;
|
||||
color:#000;
|
||||
text-decoration: none;
|
||||
color: #2e2f2e;
|
||||
border: 0;
|
||||
}
|
||||
.acl-button-show {
|
||||
background-image:url('../../../images/show_off.png');
|
||||
background-image: url('../../../images/show_off.png');
|
||||
margin: 0 auto;
|
||||
}
|
||||
.acl-button-hide {
|
||||
background-image:url('../../../images/hide_off.png');
|
||||
background-image: url('../../../images/hide_off.png');
|
||||
margin: 0 auto;
|
||||
}
|
||||
.acl-button-show.selected {
|
||||
color:#000;
|
||||
background-color:#9ade00;
|
||||
background-image:url(../../../images/show_on.png);
|
||||
color: #2e2f2e;
|
||||
background-color: #9ade00;
|
||||
background-image: url(../../../images/show_on.png);
|
||||
}
|
||||
.acl-button-hide.selected {
|
||||
color:#000;
|
||||
background-color:#ff4141;
|
||||
background-image:url(../../../images/hide_on.png);
|
||||
color: #2e2f2e;
|
||||
background-color: #ff4141;
|
||||
background-image: url(../../../images/hide_on.png);
|
||||
}
|
||||
.acl-list-item.groupshow {
|
||||
border-color:#9ade00;
|
||||
border-color: #9ade00;
|
||||
}
|
||||
.acl-list-item.grouphide {
|
||||
border-color:#ff4141;
|
||||
border-color: #ff4141;
|
||||
}
|
||||
/** /acl **/
|
||||
|
||||
|
||||
/* autocomplete popup */
|
||||
.acpopup {
|
||||
max-height: 150px;
|
||||
max-height: 175px;
|
||||
max-width: 42%;
|
||||
background-color: #555753;
|
||||
color: #fff;
|
||||
overflow: auto;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,17 @@
|
|||
<?php
|
||||
$a->theme_info = array();
|
||||
|
||||
/*
|
||||
* Name: Dispy Dark
|
||||
* Description: Dispy Dark, Friendica theme
|
||||
* Version: 0.9
|
||||
* Author: Simon <http://simon.kisikew.org/>
|
||||
* Maintainer: Simon <http://simon.kisikew.org/>
|
||||
*/
|
||||
|
||||
|
||||
$a->theme_info = array(
|
||||
'extends' => 'dispy-dark'
|
||||
);
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
|
|
@ -52,6 +64,26 @@ $(document).ready(function() {
|
|||
$('#drop-' + id).addClass('iconspacer'); }
|
||||
);
|
||||
|
||||
// notifications
|
||||
$('html').click(function() {
|
||||
$('#nav-notifications-linkmenu').removeClass('selected');
|
||||
document.getElementById("nav-notifications-menu").style.display = "none";
|
||||
});
|
||||
|
||||
$('#nav-notifications-linkmenu').click(function(event) {
|
||||
event.stopPropagation();
|
||||
});
|
||||
|
||||
// usermenu
|
||||
//$('html').click(function() {
|
||||
// $('#user-menu-popup').css('display: none');
|
||||
//document.getElementById("usermenu-popup").style.display = "none";
|
||||
//});
|
||||
|
||||
//$('#user-menu').click(function(event) {
|
||||
// event.stopPropagation();
|
||||
//});
|
||||
|
||||
function toggleToolbar() {
|
||||
if ( $('#nav-floater').is(':visible') ) {
|
||||
$('#nav-floater').slideUp('fast');
|
||||
|
|
@ -69,9 +101,17 @@ $(document).ready(function() {
|
|||
toggleToolbar();
|
||||
return false;
|
||||
});
|
||||
|
||||
$('#profile-jot-text').focusin(function() {
|
||||
$(this).css({color: '#eec'});
|
||||
});
|
||||
|
||||
$('#profile-photo-wrapper').mouseover(function() {
|
||||
$('#profile-edit-side-div').css({display: 'block'});
|
||||
}).mouseout(function() {
|
||||
$('#profile-edit-side-div').css({display: 'none'});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
EOT;
|
||||
|
||||
$a->page['footer'] .= <<<EOFooter
|
||||
EOFooter;
|
||||
|
|
|
|||
|
|
@ -2593,7 +2593,8 @@ footer {
|
|||
|
||||
/* autocomplete popup */
|
||||
.acpopup {
|
||||
max-height: 150px;
|
||||
max-height: 175px;
|
||||
max-width: 42%;
|
||||
background-color: #555753;
|
||||
color: #fff;
|
||||
overflow: auto;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,17 @@
|
|||
<?php
|
||||
$a->theme_info = array();
|
||||
|
||||
/*
|
||||
* Name: Dispy
|
||||
* Description: Dispy, Friendica theme
|
||||
* Version: 0.9
|
||||
* Author: unknown
|
||||
* Maintainer: Simon <http://simon.kisikew.org/>
|
||||
*/
|
||||
|
||||
|
||||
$a->theme_info = array(
|
||||
'extends' => 'dispy'
|
||||
);
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
|
|
@ -52,6 +64,26 @@ $(document).ready(function() {
|
|||
$('#drop-' + id).addClass('iconspacer'); }
|
||||
);
|
||||
|
||||
// notifications
|
||||
$('html').click(function() {
|
||||
$('#nav-notifications-linkmenu').removeClass('selected');
|
||||
document.getElementById("nav-notifications-menu").style.display = "none";
|
||||
});
|
||||
|
||||
$('#nav-notifications-linkmenu').click(function(event) {
|
||||
event.stopPropagation();
|
||||
});
|
||||
|
||||
// usermenu
|
||||
$('html').click(function() {
|
||||
$('#nav-user-linkmenu').removeClass('selected');
|
||||
document.getElementById("nav-user-menu").style.display = "none";
|
||||
});
|
||||
|
||||
$('#nav-user-linkmenu').click(function(event) {
|
||||
event.stopPropagation();
|
||||
});
|
||||
|
||||
function toggleToolbar() {
|
||||
if ( $('#nav-floater').is(':visible') ) {
|
||||
$('#nav-floater').slideUp('fast');
|
||||
|
|
@ -71,6 +103,13 @@ $(document).ready(function() {
|
|||
});
|
||||
});
|
||||
</script>
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
$('#profile-jot-text').focusin(function() {
|
||||
$(this).css('color: #eec;');
|
||||
});
|
||||
});
|
||||
</script>
|
||||
EOT;
|
||||
|
||||
$a->page['footer'] .= <<<EOFooter
|
||||
|
|
|
|||
Loading…
Reference in New Issue