Merge pull request #433 from gv1222/3.0

CSS Cleanup + Modern theme

templates/channel.jade

@@ -38,7 +38,7 @@ html(lang="en")
           #main.row
             #chatwrap.col-lg-5.col-md-5
               #chatheader
-                i#userlisttoggle.glyphicon.glyphicon-chevron-up.pull-left.pointer(title="Show/Hide Userlist")
+                i#userlisttoggle.glyphicon.glyphicon-chevron-right.pull-left.pointer(title="Show/Hide Userlist")
                 span#usercount.pointer Not Connected
                 span#modflair.label.label-default.pull-right.pointer M
                 span#adminflair.label.label-default.pull-right.pointer A
@@ -56,7 +56,7 @@ html(lang="en")
             #leftcontrols.col-lg-5.col-md-5
               button#newpollbtn.btn.btn-sm.btn-default New Poll
             #rightcontrols.col-lg-7.col-md-7
-              #plcontrol.btn-group
+              #plcontrol.btn-group.pull-left
                 button#showsearch.btn.btn-sm.btn-default(title="Search for a video", data-toggle="collapse", data-target="#searchcontrol")
                   span.glyphicon.glyphicon-search
                 button#showmediaurl.btn.btn-sm.btn-default(title="Add video from URL", data-toggle="collapse", data-target="#addfromurl")

templates/useroptions.jade

@@ -34,6 +34,7 @@ mixin us-general
             option(value="/css/themes/bootstrap-theme.min.css") Bootstrap
             option(value="/css/themes/slate.css") Slate
             option(value="/css/themes/cyborg.css") Cyborg
+            option(value="/css/themes/modern.css") Modern
       .form-group
         label.control-label.col-sm-4(for="#us-layout") Layout
         .col-sm-8

www/css/cytube.css

@@ -1,3 +1,4 @@
+
 .container-fluid {
     padding-left: 15px;
     padding-right: 15px;
@@ -21,13 +22,9 @@
     margin-top: 10px;
 }
 
-#userlist {
-    list-style: none outside none;
-    padding: 0;
-}
-
 #messagebuffer {
     width: auto;
+    padding-left: 5px;
 }
 
 #userlist {
@@ -35,6 +32,8 @@
     float: left;
     border-right: 0;
     font-size: 9pt;
+    list-style: none outside none;
+    padding: 0;
 }
 
 #messagebuffer, #userlist {
@@ -44,14 +43,6 @@
     margin-bottom: 0;
 }
 
-#chatheader, #currenttitle {
-    border: 1px solid #cccccc;
-    border-bottom-width: 0;
-    border-radius: 5px;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
 #chatline, #guestlogin > input, #guestlogin > .input-group-addon {
     margin-top: 0;
     border-top-left-radius: 0;
@@ -89,12 +80,10 @@
 .drink {
     margin: 10px 10px;
     padding: 10px 0px;
-    border: 2px solid #0000cc;
 }
 
 #drinkcount {
-    background-color: #000000;
+
-    color: #ffffff;
     text-align: center;
     font-weight: bold;
 }
@@ -107,13 +96,6 @@
     cursor: pointer;
 }
 
-#userlist, #messagebuffer {
-    height: 347px;
-    overflow-y: scroll;
-    overflow-x: hidden;
-    border: 1px solid #aaaaaa;
-}
-
 #chatwrap, #videowrap {
     margin-bottom: 10px;
 }
@@ -173,22 +155,12 @@
     overflow-y: scroll;
 }
 
-#plmeta {
+
-    border: 1px solid #aaaaaa;
-}
 
 #pllength {
     float: right;
 }
 
-.queue_entry {
-    line-height: 22px;
-    padding: 2px;
-    font-size: 8pt;
-    border: 1px solid #aaaaaa;
-    border-top-width: 0;
-}
-
 .queue_temp {
     background-image: url(/img/stripe-diagonal.png);
 }
@@ -266,16 +238,24 @@ li.ui-sortable-helper, li.ui-sortable-placeholder + li.queue_entry {
 
 .server-msg-disconnect {
     border: 1px solid #ff0000;
-    margin: 5px;
+    padding-top: 5px;
-    padding: 5px;
+    padding-bottom: 5px;
+    margin-top: 5px;
+    margin-right: 5px;
     color: #ff0000;
+    text-align: center;
+    background-color: rgba(129, 20, 21, 0.1);
 }
 
 .server-msg-reconnect {
     border: 1px solid #009900;
-    margin: 5px;
+    padding-top: 5px;
-    padding: 5px;
+    padding-bottom: 5px;
+    margin-top: 5px;
+    margin-right: 5px;
     color: #009900;
+    text-align: center;
+    background-color: rgba(18, 100, 18, 0.1);
 }
 
 .queue_sortable li {
@@ -600,3 +580,14 @@ table td {
 #cs-chatfilters table .form-group > input {
     max-width: 100%;
 }
+
+#userlisttoggle {
+    padding-top: 2px;
+}
+
+.queue_entry {
+    line-height: 22px;
+    padding: 2px;
+    font-size: 8pt;
+    border-top-width: 0;
+}

www/css/themes/light.css

@@ -22,10 +22,6 @@ footer {
     background-color: #eeeeee !important;
 }
 
-.queue_entry {
-    background-color: #ffffff;
-}
-
 .queue_active {
     background-color: #d9edf7;
 }
@@ -37,3 +33,33 @@ footer {
 .chat-shadow {
     color: #aaaaaa;
 }
+
+.drink {
+    border: 2px solid #0000cc;
+}
+
+#drinkcount {
+    background-color: #000000;
+    color: #ffffff;
+}
+
+#plmeta {
+    border: 1px solid #aaaaaa;
+}
+
+#userlist, #messagebuffer {
+    border: 1px solid #aaaaaa;
+}
+
+#chatheader, #currenttitle {
+    border: 1px solid #cccccc;
+    border-bottom-width: 0;
+    border-radius: 5px;
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+.queue_entry {
+    border: 1px solid #aaaaaa;
+    background-color: #ffffff;
+}