Merge branch 'refactoring' of https://github.com/amadeusproject/amade…

…uslms into refactoring
amadeusproject · May 6, 2017 · c2ff223 · c2ff223
2 parents 7c07a12 + 5edc22c
commit c2ff223
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 29 deletions.
diff --git a/amadeus/static/css/.sass-cache/a7f87b90919294b62ab4f8079e31dcda8f485534/green.sassc b/amadeus/static/css/.sass-cache/a7f87b90919294b62ab4f8079e31dcda8f485534/green.sassc
diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css
@@ -1612,7 +1612,7 @@ div.dataTables_wrapper div.dataTables_paginate {
     font-size: 14px;
 }
 
-.subject-related-panel .panel {
+.subject-related-panel .panel:not(.participant) {
     margin-bottom: 0px;
 }
 

diff --git a/amadeus/static/css/base/amadeus_responsive.css b/amadeus/static/css/base/amadeus_responsive.css
@@ -7,11 +7,6 @@
 		height: 38px;
 	}
 
-	.mural .post_make .user-img img {
-	    max-width: 70px;
-	    max-height: 70px;
-	}
-
 	.mural .post_make .post-field h4 {
 		line-height: 2.6em;
 	}
@@ -35,11 +30,6 @@
 		height: 38px;
 	}
 
-	.mural .post_make .user-img img {
-	    max-width: 65px;
-	    max-height: 65px;
-	}
-
 	.mural .post_make .post-field h4 {
 		line-height: 2.3em;
 	}
@@ -134,11 +124,6 @@
 		height: 60px;
 	}
 
-    .mural .post_make .user-img img {
-	    max-width: 60px;
-	    max-height: 60px;
-	}
-
 	.mural .post_make .post-field h4 {
 		line-height: 2em;
 	}
@@ -228,11 +213,6 @@
 		height: 50px;
 	}
 
-	.mural .post_make .user-img img {
-	    max-width: 50px;
-	    max-height: 50px;
-	}
-
 	.mural .post_make .post-field h4 {
 		line-height: 1.6em;
 	}

diff --git a/amadeus/static/css/themes/green.css b/amadeus/static/css/themes/green.css
diff --git a/amadeus/static/css/themes/green.css.map b/amadeus/static/css/themes/green.css.map
diff --git a/amadeus/static/css/themes/green.sass b/amadeus/static/css/themes/green.sass
@@ -544,10 +544,6 @@ a.add-row
     background: $white
 
 
-.mural .post_make .user-img, .post .post-img, .post .post-comment .user-img div, .comment .comment-img div 
-    background: #CCCCCC
-
-
 .mural .post_make .post-field div 
     border-color: #CCCCCC