Merge pull request #491 from amadeusproject/refactoring

Refactoring
amadeusproject · May 6, 2017 · 4cba701 · 4cba701
2 parents cdbef37 + c2ff223
commit 4cba701
Show file tree

Hide file tree

Showing 45 changed files with 3,726 additions and 717 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
 

diff --git a/analytics/static/.sass-cache/9bdb779ec82a4a96f72be09b83b7c997addd0129/general.sassc b/analytics/static/.sass-cache/9bdb779ec82a4a96f72be09b83b7c997addd0129/general.sassc
diff --git a/analytics/static/analytics/general.css b/analytics/static/analytics/general.css
diff --git a/analytics/static/analytics/general.css.map b/analytics/static/analytics/general.css.map
diff --git a/analytics/static/analytics/general.sass b/analytics/static/analytics/general.sass
@@ -75,13 +75,39 @@ $title-color: #009688
         color: $title-color
 
 .selector
-    width: 80%
-    height: 40px
+    width: 90%
+    height: 20%
     color: white
     padding-left: 5px
     background-color: #009688
     margin-top: 10px
     border-radius: 0px 20px 20px 0px
     p
         padding-top: 10px
-        font-size: 16px
+        font-size: 16px
+
+
+.middle-chart
+    article
+        text-align: center
+
+.user-tooltip
+    background: linear-gradient( #0e8999, #6bf0ce)
+    color: white
+    border-radius: 10px
+    padding: 7px
+
+.most-accessed-list
+    background-color: #52b7bd
+    width: 80%
+    margin-left: 2%
+    margin-top: 2%
+    padding-left: 0
+    color: white
+    transition: width 2s, height 2s, background-color 2s, transform 2s
+
+    li
+        padding-left: 1%
+
+.most-accessed-item:hover 
+    background-color: #3aa7ad