fixed merge

1 files changed, 58 insertions, 0 deletions

diff --git a/views/style.scss b/views/style.scss
index 9a3c9df..2c84781 100644
--- a/views/style.scss
+++ b/views/style.scss
@@ -1,3 +1,6 @@
+body {
+  background-color:#E7E7E7;
+}
 table.table-borderless tbody tr td{
   border-top: none;
 }
@@ -16,3 +19,58 @@ h4.head-back, h5.head-back{
     height: 5em;
   }
 }
+img {
+  max-width: 100%;
+  max-height: 100%;
+}
+
+.plot {
+  height: 300px;
+  width: 300px;
+}
+.faq {
+  text-align: block;
+  margin-left:15%;
+  margin-right:15%;
+  margin-top:2%;
+}
+.faq h1 {
+  text-align: center;
+}
+.tablesorter-bootstrap thead .sorter-false {
+  cursor: default;
+}
+ul.share-buttons{
+  list-style: none;
+}
+.dropdown-menu {
+  min-width: 0px !important;
+  width:60px;
+}
+.dropdown-menu a {
+  padding: 0 2px 1px 2px !important;
+}
+.page-header{
+  background-color: #fff;
+  padding:20px 0 20px 0;
+  margin: 0;
+  text-align:center;
+  display:inline-block;
+  width:100%;
+}
+.share{
+  width: 30px;
+  padding-right: 5px;
+}
+supporters{
+  background-color: white;
+  text-align:center;
+  img{
+    width: 200px;
+    margin-right: 1em;
+  }
+}
+
+.footer{
+  margin-top:3em;
+}