Merge branch 'master' into feature/add-communities-page

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 67f7be123568d9b07b71a638b6c8c4dea612ae18..f8cd32438fc1a5e329de2fbca71b7aa3f00b87b2 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -791,7 +791,6 @@ tr.turn:hover {
   }
 
   .comments {
-    float: right;
     color: $darkgrey;
   }
 
@@ -1101,21 +1100,6 @@ tr.turn:hover {
   width: 100%;
 }
 
-.activity-details p {
-  margin-left: 70px;
-  margin-bottom: 0;
-}
-
-.dashboards-show {
-  p#no_home_location {
-    margin: $lineheight;
-  }
-  .user_thumbnail {
-    margin-top: $lineheight/4;
-    float: left;
-  }
-}
-
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {
@@ -1458,6 +1442,12 @@ img.user_thumbnail {
   margin-right: $lineheight;
 }
 
+img.user_thumbnail_no_margins {
+  max-width: 50px;
+  max-height: 50px;
+  border: 1px solid $grey;
+}
+
 img.user_thumbnail_tiny {
   width: auto;
   height: auto;