friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Many small changes

This commit is contained in:
Michael 2012-02-19 20:11:36 +01:00
parent cafd400352
commit 4713069e68
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
view/theme/vier/style.css
View File

@ -200,15 +200,9 @@
.icon.s16.delete { .icon.s16.delete {
background-image: url("../../../images/icons/16/delete.png"); background-image: url("../../../images/icons/16/delete.png");
} }
<<<<<<< HEAD
/*.icon.s16.edit { /*.icon.s16.edit {
background-image: url("../../../images/icons/16/edit.png"); background-image: url("../../../images/icons/16/edit.png");
}*/ }*/
=======
.icon.s16.edit {
background-image: url("../../../images/icons/16/edit.png");
}
>>>>>>> upstream/master
.icon.s16.star { .icon.s16.star {
background-image: url("../../../images/icons/16/star.png"); background-image: url("../../../images/icons/16/star.png");
} }
@ -919,11 +913,7 @@ section {
} }
.wall-item-container .wall-item-actions-tools { .wall-item-container .wall-item-actions-tools {
float: right; float: right;
<<<<<<< HEAD
width: 80px; width: 80px;
=======
width: 60px;
>>>>>>> upstream/master
} }
.wall-item-container .wall-item-actions-tools a { .wall-item-container .wall-item-actions-tools a {
float: right; float: right;
@ -1038,7 +1028,6 @@ section {
/* contacts menu */ /* contacts menu */
.contact-photo-wrapper { .contact-photo-wrapper {
position: relative; position: relative;
<<<<<<< HEAD
width: 80px; width: 80px;
} }
@ -1046,9 +1035,6 @@ section {
width: 25px; width: 25px;
} }
=======
}
>>>>>>> upstream/master
.contact-photo { .contact-photo {
width: 48px; width: 48px;
height: 48px; height: 48px;
@ -1410,7 +1396,6 @@ ul.tabs li .active {
.field.radio .field_help { .field.radio .field_help {
margin-left: 0px; margin-left: 0px;
} }
<<<<<<< HEAD
#profile-edit-links-end { #profile-edit-links-end {
clear: both; clear: both;
@ -1439,11 +1424,6 @@ ul.tabs li .active {
color: #B20202; color: #B20202;
} }
=======
#profile-edit-links li {
list-style: none;
}
>>>>>>> upstream/master
/* oauth */ /* oauth */
.oauthapp { .oauthapp {
height: auto; height: auto;
@ -1500,7 +1480,6 @@ footer {
height: 100px; height: 100px;
display: table-row; display: table-row;
} }
<<<<<<< HEAD
blockquote { blockquote {
border-left: 1px solid #D2D2D2; border-left: 1px solid #D2D2D2;
@ -1536,5 +1515,3 @@ blockquote {
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
=======
>>>>>>> upstream/master