aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-04-27 15:56:28 -0700
committerfriendica <info@friendica.com>2012-04-27 15:56:28 -0700
commitb3750ab54e126b499bb067f39dd55bade46b3267 (patch)
tree0a0db9064f1daf25e825be01c1802e37dceee598
parentc7cbff6fbb036ec37cb4c62a89c8c8c413ecb3d8 (diff)
parent455973180b907bb83d009a108b26c3102d0957b9 (diff)
downloadvolse-hubzilla-b3750ab54e126b499bb067f39dd55bade46b3267.tar.gz
volse-hubzilla-b3750ab54e126b499bb067f39dd55bade46b3267.tar.bz2
volse-hubzilla-b3750ab54e126b499bb067f39dd55bade46b3267.zip
Merge https://github.com/friendica/friendica into pull
-rw-r--r--view/theme/cleanzero/nav.tpl46
-rw-r--r--view/theme/dispy/dark/style.css6
-rw-r--r--view/theme/dispy/dark/style.less42
-rw-r--r--view/theme/dispy/light/style.css6
-rw-r--r--view/theme/dispy/light/style.less42
5 files changed, 84 insertions, 58 deletions
diff --git a/view/theme/cleanzero/nav.tpl b/view/theme/cleanzero/nav.tpl
index 4dacf3858..9fe5ac0fe 100644
--- a/view/theme/cleanzero/nav.tpl
+++ b/view/theme/cleanzero/nav.tpl
@@ -1,23 +1,14 @@
-<nav>
+ <nav>
$langselector
<div id="site-location">$sitelocation</div>
- {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
- {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
- <span id="nav-link-wrapper" >
+ <span id="nav-commlink-wrapper">
{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
- {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
-
- {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
- <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
- <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
- {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
{{ if $nav.network }}
<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
@@ -27,7 +18,9 @@
<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
<span id="home-update" class="nav-ajax-left"></span>
{{ endif }}
-
+ {{ if $nav.community }}
+ <a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+ {{ endif }}
{{ if $nav.introductions }}
<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
<span id="intro-update" class="nav-ajax-left"></span>
@@ -36,11 +29,6 @@
<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
<span id="mail-update" class="nav-ajax-left"></span>
{{ endif }}
-
-
-
-
-
{{ if $nav.notifications }}
<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
<span id="notify-update" class="nav-ajax-left"></span>
@@ -49,7 +37,24 @@
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
<li class="empty">$emptynotifications</li>
</ul>
- {{ endif }}
+ {{ endif }}
+ </span>
+ <span id="banner">$banner</span>
+ <span id="nav-link-wrapper">
+ {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+ {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+ {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
+
+ {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+ <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+ <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+ {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+
+
+
{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
@@ -58,12 +63,9 @@
{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
- {{ if $nav.community }}
- <a id="nav-community-link" class="nav-link $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
- {{ endif }}
</span>
<span id="nav-end"></span>
- <span id="banner">$banner</span>
+
</nav>
<ul id="nav-notifications-template" style="display:none;" rel="template">
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 3b0548be2..26a21bcf1 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -103,11 +103,11 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{box-shadow:3px 3px 10px 0 #000;}
#asidemain h4{font-size:1.2em;}
#asidemain #viewcontacts{text-align:right;}
+#asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;}
.aprofile dt{background:#eec;color:#2e2f2e;font-weight:bold;box-shadow:1px 1px 5px 0 #000;margin:15px 0 5px;padding-left:5px;}
#profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;}
#dfrn-request-link{background:#3465a4 url(dark/connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#eec;display:block;font-size:1.2em;padding:0.2em 0.5em;}
#wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;}
-#netsearch-box{margin:20px 0px 30px;width:150px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
.ttright{margin:0px 0px 0px 0px;}
.contact-block-div{width:50px;height:50px;float:left;}
.contact-block-textdiv{width:150px;height:34px;float:left;}
@@ -217,7 +217,7 @@ div[id$="text"]{font-weight:bold;border-bottom:1px solid #ccc;}
div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
.profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
.icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;}
-[id$="-end"],[class$="end"]{clear:both;margin:0 0 10px 0;}
+[id$="-end"],[class$="-end"]{clear:both;margin:0 0 10px 0;}
.profile-match-end{margin:0 0 5px 0;}
.profile-match-name{font-weight:bold;margin:auto auto auto 23px;}
.profile-match-connect{font-style:italic;margin:auto auto auto 23px;}
@@ -384,7 +384,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
#side-peoplefind-url{background-color:#2e2f2e;color:#eec;border:1px #999 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;}
.nets-link,.nets-all{margin-left:0px;}
-#netsearch-box{margin-top:20px;width:150px;}#netsearch-box #search-submit{margin:5px 0px 0px 0px;}
+#netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
#pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;}
.admin.linklist{border:0;padding:0;}
.admin.link{list-style-position:inside;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index 96cdb82fa..c56adf5a1 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -693,10 +693,26 @@ nav #nav-notifications-linkmenu {
*/
#asidemain {
- h4 {
- font-size: 1.2em; }
- #viewcontacts {
- text-align: right; } }
+ h4 {
+ font-size: 1.2em; }
+ #viewcontacts {
+ text-align: right;
+ }
+ #contact-block {
+ width: 99%;
+ .contact-block-content {
+ width: 99%;
+ .contact-block-div {
+ float: left;
+ margin: 0 5px 5px 0;
+ width: 50px;
+ height: 50px;
+ padding: 3px;
+ position: relative;
+ }
+ }
+ }
+}
.aprofile dt {
background: #eec;
@@ -727,12 +743,6 @@ nav #nav-notifications-linkmenu {
font-size: 1.2em;
padding: 0.2em 0.5em; }
-#netsearch-box {
- margin: 20px 0px 30px;
- width: 150px;
- #search-submit {
- margin: 5px 5px 0px 0px; } }
-
.ttright {
margin: 0px 0px 0px 0px; }
@@ -1400,7 +1410,7 @@ div {
}
-[id$="-end"], [class$="end"] {
+[id$="-end"], [class$="-end"] {
clear: both;
margin: 0 0 10px 0; }
@@ -2206,10 +2216,12 @@ div {
margin-left: 0px; }
#netsearch-box {
- margin-top: 20px;
- width: 150px;
- #search-submit {
- margin: 5px 0px 0px 0px; } }
+ margin: 20px 0px 30px;
+ width: 135px;
+ #search-submit {
+ margin: 5px 5px 0px 0px;
+ }
+}
/**
* admin
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index fc293def8..2c95d70da 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -103,11 +103,11 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{box-shadow:3px 3px 10px 0 #000;}
#asidemain h4{font-size:1.2em;}
#asidemain #viewcontacts{text-align:right;}
+#asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;}
.aprofile dt{background:transparent;color:#666666;font-weight:bold;box-shadow:1px 1px 5px 0 #000;margin:15px 0 5px;padding-left:5px;}
#profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;}
#dfrn-request-link{background:#3465a4 url(light/connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#fff;display:block;font-size:1.2em;padding:0.2em 0.5em;}
#wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;}
-#netsearch-box{margin:20px 0px 30px;width:150px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
.ttright{margin:0px 0px 0px 0px;}
.contact-block-div{width:50px;height:50px;float:left;}
.contact-block-textdiv{width:150px;height:34px;float:left;}
@@ -217,7 +217,7 @@ div[id$="text"]{font-weight:bold;border-bottom:1px solid #ccc;}
div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
.profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
.icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;}
-[id$="-end"],[class$="end"]{clear:both;margin:0 0 10px 0;}
+[id$="-end"],[class$="-end"]{clear:both;margin:0 0 10px 0;}
.profile-match-end{margin:0 0 5px 0;}
.profile-match-name{font-weight:bold;margin:auto auto auto 23px;}
.profile-match-connect{font-style:italic;margin:auto auto auto 23px;}
@@ -384,7 +384,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
#side-peoplefind-url{background-color:#e5e0cf;color:#666;border:1px #666 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;}
.nets-link,.nets-all{margin-left:0px;}
-#netsearch-box{margin-top:20px;width:150px;}#netsearch-box #search-submit{margin:5px 0px 0px 0px;}
+#netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
#pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;}
.admin.linklist{border:0;padding:0;}
.admin.link{list-style-position:inside;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index f14284f39..18151bc27 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -694,10 +694,26 @@ nav #nav-notifications-linkmenu {
*/
#asidemain {
- h4 {
- font-size: 1.2em; }
- #viewcontacts {
- text-align: right; } }
+ h4 {
+ font-size: 1.2em; }
+ #viewcontacts {
+ text-align: right;
+ }
+ #contact-block {
+ width: 99%;
+ .contact-block-content {
+ width: 99%;
+ .contact-block-div {
+ float: left;
+ margin: 0 5px 5px 0;
+ width: 50px;
+ height: 50px;
+ padding: 3px;
+ position: relative;
+ }
+ }
+ }
+}
.aprofile dt {
background: transparent;
@@ -728,12 +744,6 @@ nav #nav-notifications-linkmenu {
font-size: 1.2em;
padding: 0.2em 0.5em; }
-#netsearch-box {
- margin: 20px 0px 30px;
- width: 150px;
- #search-submit {
- margin: 5px 5px 0px 0px; } }
-
.ttright {
margin: 0px 0px 0px 0px; }
@@ -1401,7 +1411,7 @@ div {
}
-[id$="-end"], [class$="end"] {
+[id$="-end"], [class$="-end"] {
clear: both;
margin: 0 0 10px 0; }
@@ -2207,10 +2217,12 @@ div {
margin-left: 0px; }
#netsearch-box {
- margin-top: 20px;
- width: 150px;
- #search-submit {
- margin: 5px 0px 0px 0px; } }
+ margin: 20px 0px 30px;
+ width: 135px;
+ #search-submit {
+ margin: 5px 5px 0px 0px;
+ }
+}
/**
* admin