Browse Source

Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Friendicaland - remove states no longer flying the Friendica banner.
  deleted:    view/theme/smoothly/categories_widget.tpl 	deleted:    view/theme/smoothly/contact_template.tpl 	deleted:    view/theme/smoothly/footer.tpl 	deleted:    view/theme/smoothly/generic_links_widget.tpl 	deleted:    view/theme/smoothly/group_drop.tpl 	deleted:    view/theme/smoothly/group_side.tpl 	deleted:    view/theme/smoothly/header.tpl 	deleted:    view/theme/smoothly/mail_head.tpl 	deleted:    view/theme/smoothly/message_side.tpl 	deleted:    view/theme/smoothly/peoplefind.tpl 	modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/login.tpl 	modified:   view/theme/smoothly/style.css
pull/515/head
Simon L'nu 10 years ago
parent
commit
1d9633b0cc
  1. 2
      js/country.js
  2. 12
      view/theme/smoothly/categories_widget.tpl
  3. 24
      view/theme/smoothly/contact_template.tpl
  4. 3
      view/theme/smoothly/footer.tpl
  5. 11
      view/theme/smoothly/generic_links_widget.tpl
  6. 8
      view/theme/smoothly/group_drop.tpl
  7. 28
      view/theme/smoothly/group_side.tpl
  8. 0
      view/theme/smoothly/header.tpl
  9. 2
      view/theme/smoothly/login.tpl
  10. 3
      view/theme/smoothly/mail_head.tpl
  11. 13
      view/theme/smoothly/message_side.tpl
  12. 15
      view/theme/smoothly/peoplefind.tpl
  13. 215
      view/theme/smoothly/style.css

2
js/country.js

@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw
aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|Chaos Friends|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Pplsnet|Recolutionari.es|SilverLips|Sparkling Network|SPRACI|Styliztique|Sysfu Social Club|Trevena|theshi.re|Tumpambae|Uzmiac|Other";
aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|Chaos Friends|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Pplsnet|Recolutionari.es|SPRACI|Styliztique|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other";
/*
* gArCountryInfo
* (0) Country name

12
view/theme/smoothly/categories_widget.tpl

@ -1,12 +0,0 @@
<div id="categories-sidebar" class="widget">
<h3>$title</h3>
<div id="nets-desc">$desc</div>
<ul class="categories-ul">
<li class="widget-list"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li>
{{ for $terms as $term }}
<li class="widget-list"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
{{ endfor }}
</ul>
</div>

24
view/theme/smoothly/contact_template.tpl

@ -1,24 +0,0 @@
<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
<div class="contact-entry-photo-wrapper" >
<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')"
onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
{{ if $contact.photo_menu }}
<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
<div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
<ul>
$contact.photo_menu
</ul>
</div>
{{ endif }}
</div>
</div>
<div class="contact-entry-photo-end" ></div>
<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
<div class="contact-entry-end" ></div>
</div>

3
view/theme/smoothly/footer.tpl

@ -1,3 +0,0 @@
<div id="footerbox" style="display:none">
<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
</div>

11
view/theme/smoothly/generic_links_widget.tpl

@ -1,11 +0,0 @@
<div class="widget{{ if $class }} $class{{ endif }}">
{{if $title}}<h3>$title</h3>{{endif}}
{{if $desc}}<div class="desc">$desc</div>{{endif}}
<ul>
{{ for $items as $item }}
<li class="widget-list"><a href="$item.url" class="{{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
{{ endfor }}
</ul>
</div>

8
view/theme/smoothly/group_drop.tpl

@ -1,8 +0,0 @@
<div class="group-delete-wrapper" id="group-delete-wrapper-$id" >
<a href="group/drop/$id"
onclick="return confirmDelete();"
title="$delete"
id="group-delete-icon-$id"
class="drophide group-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >Delete Group</a>
</div>
<div class="group-delete-end"></div>

28
view/theme/smoothly/group_side.tpl

@ -1,28 +0,0 @@
<div class="widget" id="group-sidebar">
<h3>$title</h3>
<div id="sidebar-group-list">
<ul id="sidebar-group-ul">
{{ for $groups as $group }}
<li class="sidebar-group-li">
{{ if $group.cid }}
<input type="checkbox"
class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action"
onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
{{ if $group.ismember }}checked="checked"{{ endif }}
/>
{{ endif }}
{{ if $group.edit }}
<a class="groupsideedit" href="$group.edit.href"><span class="icon small-pencil"></span></a>
{{ endif }}
<a class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
</li>
{{ endfor }}
</ul>
</div>
<div id="sidebar-new-group">
<a href="group/new">$createtext</a>
</div>
</div>

0
view/theme/smoothly/header.tpl

2
view/theme/smoothly/login.tpl

@ -1,4 +1,4 @@
<img style="float:left; margin-right:20px" src="/images/friendica-128.png" title="friendica">
<img style="float:left; margin:5px 20px 0 0" src="/images/friendica-128.png" title="friendica">
<div class="login-form">
<form action="$dest_url" method="post" >

3
view/theme/smoothly/mail_head.tpl

@ -1,3 +0,0 @@
<h3>$messages</h3>
$tab_content

13
view/theme/smoothly/message_side.tpl

@ -1,13 +0,0 @@
<div id="message-sidebar" class="widget">
<br />
<div id="side-invite-link" class="side-link" ><a href="$new.url" class="{{ if $new.sel }}newmessage-selected{{ endif }}">$new.label</a> </div>
<ul class="message-ul">
{{ for $tabs as $t }}
<li class="tool">
<a href="$t.url" class="message-link{{ if $t.sel }}message-selected{{ endif }}">$t.label</a>
</li>
{{ endfor }}
</ul>
</div>

15
view/theme/smoothly/peoplefind.tpl

@ -1,15 +0,0 @@
<div id="peoplefind-sidebar" class="widget">
<h3>$findpeople</h3>
<div id="peoplefind-desc">$desc</div>
<form action="dirfind" method="post" >
<input id="side-peoplefind-url" type="text-sidebar" name="search" size="24" title="$hint" />
<input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" />
</form>
<div class="side-link" id="side-invite-link"><a href="match" >$similar</a></div>
<div class="side-link" id="side-invite-link"><a href="suggest" >$suggest</a></div>
<div class="side-link" id="side-invite-link"><a href="randprof" target="extlink" >$random</a></div>
{{ if $inv }}
<div class="side-link" id="side-invite-link"><a href="invite" >$inv</a></div>
{{ endif }}
</div>

215
view/theme/smoothly/style.css

@ -215,12 +215,18 @@ section {
}
#login_standard {
width: 210px;
width: 250px;
float: left;
border: 1px solid #7C7D7B;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
padding: 10px;
margin: 10px 0 0 0;
}
#login_openid {
width: 210px;
width: 300px;
margin-left: 150px;
}
@ -249,6 +255,10 @@ section {
margin-left: 75px;
}
#login-submit-button {
width: 271px;
}
.login-form,
margin-top: 10px;
}
@ -351,7 +361,7 @@ nav #banner {
display: block;
position: absolute;
margin-left: 3px;
margin-top: 3px;
/*margin-top: 2px;*/
padding-bottom: 5px;
}
@ -385,6 +395,22 @@ nav #user-menu {
text-decoration: none;
text-align: center;
}
nav #user-menu:hover {
border: 1px solid #7C7D7B;
box-shadow: 0 0 8px #BDBDBD;
-moz-box-shadow: 3px 3px 4px #959494;
-webkit-box-shadow: 3px 3px 4px #959494;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
background-color: #1873a2;
color: #efefef;
}
nav #user-menu-label::after {
content: url("menu-user-pin.png") no-repeat;
padding-left: 15px;
@ -461,7 +487,7 @@ ul#user-menu-popup li a:hover {
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) );
background: -moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% );
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2');
background-color: #6da6c4;
background-color: #1873a2;
}
ul#user-menu-popup li a.nav-sep {
@ -717,6 +743,29 @@ h3 #search:before {
padding-bottom: 10px;
}
#message-sidebar {
vertical-align: middle;
margin-top: 40px;
}
#message-new {
padding: 7px;
width: 165px;
margin: 10px;
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
background-color: #bdbdbd;
display: inline-block;
color: #efefef;
text-decoration: none;
text-align: center;
border: 1px solid #7C7D7B;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
#peoplefind-desc {
margin-left: 10px;
}
@ -726,6 +775,10 @@ h3 #search:before {
margin-right: 30px;
}
#sidebar-ungrouped {
margin: 10px;
}
#sidebar-group-list a {
}
@ -740,6 +793,11 @@ h3 #search:before {
margin: 10px;
}
#side-peoplefind-url {
margin: 10px;
width: 175px;
}
#sidebar-page-list {}
.widget {
@ -964,6 +1022,7 @@ ul .sidebar-group-li .icon {
.contact-block-h4,
.contact-block-content {
margin: 0;
}
#contact-block,
@ -1307,10 +1366,6 @@ ul .sidebar-group-li .icon {
margin-left: 10px;
}
.wall-item-photo-menu {
display: none;
}
.wall-item-photo-menu-button {
display: none;
text-indent: -99999px;
@ -1537,6 +1592,7 @@ ul .sidebar-group-li .icon {
}
.wall-item-photo-menu {
display: none;
min-width: 92px;
color: #2e3436;
border-top: 1px;
@ -1545,7 +1601,7 @@ ul .sidebar-group-li .icon {
border-left: 1px solid #dddddd;
border-bottom: 1px solid #dddddd;
position: absolute;
left: -2px;
left: -1px;
top: 101px;
display: none;
z-index: 10000;
@ -1599,7 +1655,7 @@ ul .sidebar-group-li .icon {
.icon.drop,
.icon.drophide {
float: right;
float: left;
}
#item-delete-selected-end,
@ -1885,10 +1941,12 @@ div[id$="wrapper"] br {
}
.profile-match-wrapper {
width: 82%;
padding: 5px;
float:left;
height:120px;
padding:10px;
width:120px;
margin-bottom: 10px;
margin-left: 20px;
/*margin-left: 20px;*/
background-color: #f6f6f6;
border: 1px solid #dddddd;
box-shadow: 3px 3px 4px #959494;
@ -2231,9 +2289,9 @@ input #photo_edit_form {
.mail-conv-detail,
.mail-list-detail {
position: relative;
width: 500px;
width: 550px;
padding: 50px;
margin: 20px auto;
margin: 20px 0 0 0;
background-color: #fff;
-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
@ -2584,10 +2642,18 @@ margin-left: 0px;
}
#contact-edit-update-now:hover {
color: #efefef;
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
background-color: #1873a2;
border: 1px solid #7C7D7B;
box-shadow: 0 0 8px #BDBDBD;
-moz-box-shadow: 3px 3px 4px #959494;
-webkit-box-shadow: 3px 3px 4px #959494;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
#contact-edit-update-now:active {
@ -2696,50 +2762,10 @@ margin-left: 0px;
text-align: center;
}
#side-invite-link,
#side-random-profile-link,
#side-suggest-link,
#side-match-link {
width: 158px;
padding: 10px;
margin: auto 10px 20px;
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
background-color: #bdbdbd;
padding: 5px 10px 5px 10px;
color: #efefef;
font-size: 1.1em;
text-align: center;
border: 1px solid #7C7D7B;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
#side-match-link:hover {
color: #efefef;
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
background-color: #1873a2;
border: 1px solid #7C7D7B;
box-shadow: 0 0 8px #BDBDBD;
-moz-box-shadow: 3px 3px 4px #959494;
-webkit-box-shadow: 3px 3px 4px #959494;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
#side-match-link:active {
background-color: #1873a2;
position: relative;
top: 1px;
}
#side-match-link a {
color: #efefef;
}
#side-invite-link {
width: 80%;
padding: 10px;
margin: auto;
@ -2758,7 +2784,10 @@ margin-left: 0px;
-webkit-border-radius: 5px;
}
#side-invite-link:hover {
#side-invite-link:hover,
#side-random-profile-link:hover,
#side-suggest-link:hover,
#side-match-link:hover {
color: #efefef;
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
@ -2774,59 +2803,22 @@ margin-left: 0px;
}
#side-invite-link:active {
#side-invite-link:active,
#side-random-profile-link:active,
#side-suggest-link:active,
#side-match-link:active {
background-color: #1873a2;
position: relative;
top: 1px;
}
#side-invite-link a {
#side-invite-link a,
#side-random-profile-link a,
#side-suggest-link a,
#side-match-link a {
color: #efefef;
}
#side-suggest-link {
width: 80%;
padding: 10px;
margin: auto;
margin-bottom: 20px;
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
background-color: #bdbdbd;
padding: 5px 10px 5px 10px;
color: #efefef;
font-size: 1.1em;
text-align: center;
border: 1px solid #7C7D7B;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
#side-suggest-link:hover {
color: #efefef;
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
background-color: #1873a2;
border: 1px solid #7C7D7B;
box-shadow: 0 0 8px #BDBDBD;
-moz-box-shadow: 3px 3px 4px #959494;
-webkit-box-shadow: 3px 3px 4px #959494;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
#side-suggest-link:active {
background-color: #1873a2;
position: relative;
top: 1px;
}
#side-suggest-link a {
color: #efefef;
}
#invite-message,
#invite-recipients,
@ -2913,7 +2905,7 @@ margin-left: 0px;
background: url(login-bg.gif) no-repeat;
background-position: 0 50%;
padding-left: 18px;
width: 220px!important;
width: 250px!important;
}
.openid:hover {
@ -4289,7 +4281,6 @@ div #datebrowse-sidebar.widget {
color: #1873a2;
cursor: pointer;
margin-bottom: 10px;
margin-left: 5px;
/*background: url("down.png") no-repeat scroll left center transparent;*/
}
@ -4349,3 +4340,15 @@ div #datebrowse-sidebar.widget {
#collapsed-comments-page-widget {}
.tool {}
#logo-text {
}
#logo-img {
margin: 3px 0 0 0;
}
.bigwidget {}
#remote-friends-in-common {}

Loading…
Cancel
Save