Merge remote branch 'upstream/master'

Conflicts:
	view/theme/vier/style.css

1 files changed, 23 insertions, 0 deletions

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