fixed merge conflict

1 files changed, 117 insertions, 6 deletions

diff --git a/static/website/css/main.css b/static/website/css/main.css
index 27d0e10..b07b73c 100644
--- a/static/website/css/main.css
+++ b/static/website/css/main.css
@@ -1,5 +1,8 @@
 @import url(http://fonts.googleapis.com/css?family=Varela+Round);
 /* override bootstrap */
+hr {
+    border-top: 1px solid #424242;
+}
 .container>.navbar-header {
     height: 45px;
 }
@@ -9,6 +12,30 @@
 .navbar-default {
     margin-bottom: 0;
 }
+.carousel, .slick-list {
+    height: 100px;
+    margin-right: -2px;
+}
+.carousel .item {
+    border: 1px solid #333333;
+    position: relative;
+}
+.carousel .thumb {
+    text-align: center;
+    height: 75px;
+}
+.carousel .descp {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+}
+#filter-container {
+    background: #f5f5f5;
+    padding: 15px;
+}
+#filter-form {
+    margin-bottom: 0;
+}
 /* override nicEditor */
 #questionInstance {
     background: #ffffff !important;
@@ -33,7 +60,6 @@ body {
     background: #ffffff;
 }
 #header-inner {
-    
 }
 #logo {
     width: 25px;
@@ -51,6 +77,31 @@ body {
 }
 #content{
 }
+.question-critic, .answer-critic {
+    padding-left: 0;
+    padding-top: 15px;
+    text-align: center;
+}
+.question-critic {
+    font-size: 1.3em;
+}
+.answer-critic {
+    font-size: 1em;
+}
+.vote {
+    text-decoration: none;    
+    color: #cccccc;
+}
+.vote:hover {
+   text-decoration: none;
+   cursor: pointer;
+}
+.voted {
+    color: orange;
+}
+/* .question-wrapper { */
+/*     padding-left: 0; */
+/* } */
 #content .question {
     position: relative;
     padding: 15px 0 15px 0;
@@ -175,19 +226,56 @@ table .title a {
 .saved {
     background: lightgreen;
 }
-#content .reply {
+/* .answer-wrapper { */
+/*     padding-left: 0px; */
+/* } */
+#content .answer {
     position: relative;
     border-bottom: 1px solid #f5f5f5;
     padding-top: 20px;
     padding-bottom: 20px;
     margin: 10px 0px;
 }
-#content .reply .body {
+#content .answer .body {
 }
-#content .reply .user {
+#content .answer .user {
+    position: absolute;
+    right: 0px;
+    bottom: 0px;
     padding: 2px 7px;
     background: #f5f5f5;
 }
+.comments {
+    border-left: 1px solid #cccccc;
+}
+.comments .comment {
+    position: relative;
+    padding: 5px 5px;
+    border-bottom: 1px dotted #cccccc;
+}
+.comments .new-comment {
+    display: none;
+}
+.comments .add-comment {
+    margin: 2px;
+    padding: 1px 2px;
+    color: #000000;
+    background: #f5f5f5;
+}
+.comments .cancel-comment {
+    display: none;
+    margin: 2px;
+    padding: 1px 2px;
+    color: #ffffff;
+    background: #d34836;
+}
+.comments .post-comment {
+    display: none;
+    margin: 2px;
+    padding: 1px 2px;
+    color: #ffffff;
+    background: #42B449;
+}
 #footer-wrapper {
     max-width: 970px;
     margin:0 auto;
@@ -217,7 +305,7 @@ table .title a {
     top: 15px;
 }
 .my-question,
-.my-reply {
+.my-answer {
     position: relative;
     margin: 10px auto;
     padding: 15px;
@@ -225,8 +313,31 @@ table .title a {
     background: #f7f7f7;
 }
 .my-question .date,
-.my-reply .date {
+.my-answer .date {
     position: absolute;
     right: 5px;
     bottom: 5px;
 }
+#content .comment { 
+    min-height: 50px;
+}
+#content .comment .modify-wrapper {
+    display: none;
+}
+#content .comment .meta {
+    position: absolute;
+    right: 0px;
+    bottom: 0px;
+    font-size: small;
+}
+#content .comment .user {
+    padding: 2px 7px;
+    background: #f5f5f5;
+}
+/* carousel styles */
+.slick-next:before,
+.slick-prev:before,
+.slick-next:after,
+.slick-prev:after {
+    color: #a26dc8;
+}