harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-08-28 16:57:43 -07:00
commit b27e21472b
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/manage.apd
View File

@ -1,4 +1,4 @@
url: $baseurl/manage url: $baseurl/manage
requires: local_user requires: local_user
name: Channel Select name: Channel Manager
photo: $baseurl/app/manage.png photo: $baseurl/app/manage.png

12
view/theme/redbasic/css/style.css
View File

@ -366,11 +366,6 @@ aside li {
font-weight: bold; font-weight: bold;
} }
#profile-vcard-break {
clear: both;
}
#profile-edit-wrapper .field label { #profile-edit-wrapper .field label {
margin-top: 20px; margin-top: 20px;
width: 175px; width: 175px;
@ -446,11 +441,6 @@ aside li {
margin-bottom: 0px; margin-bottom: 0px;
} }
.vcard-profile-edit-icon:hover {
text-decoration: none;
}
#profile-extra-links { #profile-extra-links {
clear: both; clear: both;
margin-top: 10px; margin-top: 10px;
@ -468,6 +458,7 @@ aside li {
.profile-edit-side-link { .profile-edit-side-link {
padding: 3px 0px;
opacity: 0; opacity: 0;
filter:alpha(opacity=30); filter:alpha(opacity=30);
float: right; float: right;
@ -787,6 +778,7 @@ aside li {
} }
#contact-block { #contact-block {
width: 100%;
float: left; float: left;
background-color: $comment_item_colour; background-color: $comment_item_colour;
border-bottom: 1px solid $widget_brdrcolour; border-bottom: 1px solid $widget_brdrcolour;