Merge branch 'master' into zykure/approved

[xonotic/xonstat.git] / xonstat / static / css / app.css

diff --git a/xonstat/static/css/app.css b/xonstat/static/css/app.css
index 11786f7af6182b8e1aaa09aa31d710609bc6eda7..6a273b50968116c01bb735629a4c94e0003b4c74 100644 (file)
--- a/xonstat/static/css/app.css
+++ b/xonstat/static/css/app.css
@@ -150,7 +150,6 @@ table td {
 /* Game scoreboard */
 .game {
   float: left;
-  margin-bottom: 30px;
   min-width: 700px;
   padding: 10px 7px;
 }
@@ -215,6 +214,7 @@ table td {
 .tabbable p { font-size: 14px; }
 .tabs-below .nav-tabs > li > a { border-radius: 4px 4px 4px 4px; }
 .nav-tabs > .active > a, .nav-tabs > .active > a:hover { background-color: #111; color: #aaa; border-color: #222; }
+.nav-tabs > .active > a, .nav-tabs > .active > a:focus { background-color: #111; color: #aaa; border-color: #222; }
 .nav-tabs > li > a { border-radius: 4px 4px 4px 4px; text-align: center; }
 .nav-tabs > li > a:hover { background-color: #111; border-color: #333; }
 .nav-tabs { border-bottom: 0px solid #000; }
@@ -239,6 +239,93 @@ table td {
   float: left;
 }
 
+
+/* Teamscores */
+.teamscores tr {
+  background-color: #000;
+}
+.teamscores td {
+  padding: 3px;
+  text-align: center;
+  font-size: 12px;
+  font-weight: bold;
+}
+.teamscores tr.red {
+  background-color: #4d0000;
+}
+.teamscores tr.blue {
+  background-color: #00004d;
+}
+.teamscores tr.yellow {
+  background-color: #4d4d00;
+}
+.teamscores tr.pink {
+  background-color: #4d004d;
+}
+
+
+/* Gametype filters */
+.btn-toolbar .nav > li a {
+    width: 80px;
+} 
+
+.btn.dropdown-toggle, .btn.dropdown-toggle:active {
+    background: none;
+    border: 1px solid transparent;
+    border-radius:4px 4px 4px 4px;
+    line-height:20px;
+    color: #428bca;
+    padding: 10px 0px 10px 0px;
+    font-size: 14px;
+    outline: 0;
+}
+.btn.dropdown-toggle:hover, .btn.dropdown-toggle:focus {
+    background-color:#111;
+    color:#2a6496;
+    border-color:#333;
+}
+
+.btn.dropdown-toggle > .caret {
+  height: 21px;
+  border-top-color: #428bca;
+  border-top-width: 8px;
+  border-left-width: 8px;
+  border-right-width: 8px;
+}
+
+.dropdown-menu {
+  width: 100px;
+}
+
+.dropdown-menu.nav-tabs {
+    padding:4px;
+    background-color: #111;
+    border: 1px solid #333;
+    width: 256px; }
+.dropdown-menu.nav-tabs > li > a {
+    width:80px;
+    color:inherit;
+}
+.dropdown-menu.nav-tabs > li > a:hover {
+    color:#222;
+}
+
+/* Player nicknames */
+.nostretch {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.player-nick {
+    width: 25%;
+}
+
+/* elo colors */
+.eloup { color: green; }
+.elodown { color: rgb(190,0,0); }
+.eloneutral { color: gray; }
+
 /* Navigation links */
 .pagination > li > a, .pagination > li > span {
     background-color: #111111;