Fixed Light theme and other minor fixes

Mstiekema · Feb 23, 2017 · 2146ae2 · 2146ae2
1 parent d8f05f0
commit 2146ae2
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 8 deletions.
diff --git a/static/css/yucibot.css b/static/css/yucibot.css
@@ -4,6 +4,10 @@
   color: #a2a8b7;
 }
 
+#twitchInfo, #donations, #followers, #twitter {
+  background-color: #282828;
+}
+
 #twitchChat {
   height: 90%;
   width: 400px;

diff --git a/static/css/yucibotLight.css b/static/css/yucibotLight.css
@@ -9,8 +9,47 @@
   width: 400px;
 }
 
+#twitchInfo, #donations, #followers, #twitter {
+  background-color: #969696;
+}
+
 .tweet {
+  border: 3px solid #292e2f;
+  background-color: #7b8d90;
+}
+
+.follower {
+  border-top: 1px solid #455867;
+  border-bottom: 1px solid #455867;
+  padding: 2% 0 2% 0
+}
+
+#twitter, #followers {
+  overflow-y: auto;
+}
+
+#twitter h3, #donations h3, #followers h3 {
+  margin-top: -5px;
+  margin-bottom: 5px;
+}
 
+#streamInfo {
+  position: absolute;
+  width: 360px;
+  top: 70px;
+  padding: 20px;
+  background-color: #969696;
+  left: 440px;
+}
+
+.adminPanel {
+  width: 360px;
+  background-color: #969696;
+  border: hidden;
+  color: #d4dbdd;
+  height: 30px;
+  padding-left: 10px;
+  box-shadow: 1px 1px gray;
 }
 
 .answerRes, #answers {

diff --git a/static/js/adminHome.js b/static/js/adminHome.js
@@ -12,7 +12,6 @@ $(document).ready(function() {
     'width': '360px',
     'top': '300px',
     'padding': '20px',
-    'background-color': '#282828',
     'left': '440px'
   })
   donations.css({
@@ -21,7 +20,6 @@ $(document).ready(function() {
     'top': '70px',
     'bottom': '20px',
     'padding': '20px',
-    'background-color': '#282828',
     'left': '1270px'
   })
   followers.css({
@@ -30,7 +28,6 @@ $(document).ready(function() {
     'top': '430px',
     'bottom': '20px',
     'padding': '20px',
-    'background-color': '#282828',
     'left': '440px'
   })
   twitter.css({
@@ -39,7 +36,6 @@ $(document).ready(function() {
     'top': '70px',
     'bottom': '20px',
     'padding': '20px',
-    'background-color': '#282828',
     'left': '855px'
   })
 })

diff --git a/static/js/showPoll.js b/static/js/showPoll.js
@@ -46,7 +46,7 @@ function makeGraph() {
   google.charts.load('current', {'packages':['corechart']});
   setTimeout(function () {
     google.charts.setOnLoadCallback(drawChart);
-  }, 300);
+  }, 1000);
 
   var arrChartTable = new Array;
 

diff --git a/templates/admin/commands.html b/templates/admin/commands.html
@@ -10,8 +10,8 @@
     <% if (commands.commUse != null) { %> <b>Usage:</b><br> <%= commands.commUse %> <br> <% } %>
     <b>Cooldown type:</b> <%= commands.cdType %> <br>
     <b>Cooldown:</b> <%= commands.cd %> seconds <br>
-    <b>User level:</b> <%= commands.level %> <br><br>
-    <% if (commands.points != 0) { %> <b>Point cost:</b> <%= commands.points %> points <br> <% } %>
+    <b>User level:</b> <%= commands.level %> <br>
+    <% if (commands.points != 0) { %> <b>Point cost:</b> <%= commands.points %> points <br><br> <% } %>
     <button class="remove" id=<%= commands.commName %>>Remove command</button> <button class="edit" id=<%= commands.commName %>>Edit command</button>
   </p></div>
 <% }) %>

diff --git a/templates/admin/home.html b/templates/admin/home.html
@@ -1,7 +1,7 @@
 <% include ../header.ejs %>
 <div class="top"><h2>Admin home</h2></div>
 <div class="main" style="overflow-y: hidden;">
-<p style="background-color: #292e2f; z-index: 1000">Having problems with the bot or want to restart it? Click here: <button id="restart">Restart bot</button></p>
+<p style="z-index: 1000">Having problems with the bot or want to restart it? Click here: <button id="restart">Restart bot</button></p>
 <iframe id="twitchChat" src="https://www.twitch.tv/<%= streamer %>/chat?popout=" frameborder="0" scrolling="no" align="left"></iframe>
 <div id="streamInfo">
   <b>Stream title</b> <br> <input class="adminPanel" id="title" value="<%= title %>" type="text"><br><br>