Merge pull request #29 from mthenw/flat-design

New colours based on twtr bootstrap
pull/31/head
Maciej Winnicki 2014-02-15 14:43:51 +01:00
commit d8355db7f4
4 changed files with 49 additions and 130 deletions

View File

@ -178,9 +178,9 @@ window.App = (function (window, document, io) {
div.className = 'line';
div.addEventListener('click', function () {
if (this.className.indexOf('selected') === -1) {
this.className += ' selected';
this.className = 'line-selected';
} else {
this.className = this.className.replace(/selected/g, '');
this.className = 'line';
}
});

View File

@ -1,79 +1,37 @@
/* Styles mainly from http://twitter.github.com/bootstrap/ */
@import url(http://fonts.googleapis.com/css?family=Ubuntu+Mono);
* {
padding: 0;
margin: 0;
}
@import "//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css";
body {
font-family: "Ubuntu Mono","Courier New",Courier;
font-size: 13px;
line-height: 18px;
color: #E0D4C2;
background:#212326;
padding: 45px 0 20px;
padding-top: 4em;
background-color: #2F3238;
}
.navbar {
background-color: #2C2C2C;
background-image: -webkit-linear-gradient(top, #333, #222);
background-repeat: repeat-x;
box-shadow: rgba(0, 0, 0, 0.246094) 0px 1px 3px 0px, rgba(0, 0, 0, 0.0976563) 0px -1px 0px 0px inset;
position: fixed;
left: 0px;
right: 0px;
top: 0px;
color: #fff;
display: block;
height: 24px;
font-size: 20px;
font-weight: 200;
padding: 8px 50px;
background-color: #26292E;
border: 0;
}
.navbar .query {
background-color: #626262;
border-color: #151515;
border-radius: 14px 14px 14px 14px;
border-style: solid;
border-width: 1px;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.098) inset, 0 1px 0 0 rgba(255, 255, 255, 0.15);
color: white;
display: inline-block;
float: right;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 13px;
height: 18px;
line-height: 13px;
margin-top: -2px;
padding: 4px 9px;
width: 160px;
}
.navbar .query:focus,
.navbar .query.focused {
padding: 5px 10px;
color: #333333;
text-shadow: 0 1px 0 #ffffff;
background-color: #ffffff;
border: 0;
-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
outline: 0;
.form-control {
border: 0;
color: #7F8289;
background-color: #2F3238;
}
.log {
white-space: pre-wrap;
color: #7F8289;
font-size: .85em;
background: inherit;
border: 0;
padding: 0;
}
.log .inner-line {
padding: 0 50px;
margin-left: 96pt;
text-indent: -96pt;
padding: 0 15px;
margin-left: 84pt;
text-indent: -84pt;
margin-bottom: 0;
}
.log .line.selected {
background-color: #412A4F;
}
.log .line-selected {
background-color: #302436;
}

View File

@ -1,76 +1,29 @@
/* Styles mainly from http://twitter.github.com/bootstrap/ */
* {
padding: 0;
margin: 0;
}
@import "//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css";
body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
line-height: 18px;
color: #333;
padding: 45px 0 20px;
padding-top: 4em;
}
.navbar {
background-color: #2C2C2C;
background-image: -webkit-linear-gradient(top, #333, #222);
background-repeat: repeat-x;
box-shadow: rgba(0, 0, 0, 0.246094) 0px 1px 3px 0px, rgba(0, 0, 0, 0.0976563) 0px -1px 0px 0px inset;
position: fixed;
left: 0px;
right: 0px;
top: 0px;
color: #fff;
display: block;
height: 24px;
font-size: 20px;
font-weight: 200;
padding: 8px 50px;
}
.navbar .query {
background-color: #626262;
border-color: #151515;
border-radius: 14px 14px 14px 14px;
border-style: solid;
border-width: 1px;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.098) inset, 0 1px 0 0 rgba(255, 255, 255, 0.15);
.navbar-inverse .navbar-brand {
color: white;
display: inline-block;
float: right;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 13px;
height: 18px;
line-height: 13px;
margin-top: -2px;
padding: 4px 9px;
width: 160px;
}
.navbar .query:focus,
.navbar .query.focused {
padding: 5px 10px;
color: #333333;
text-shadow: 0 1px 0 #ffffff;
background-color: #ffffff;
border: 0;
-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
outline: 0;
}
.log {
white-space: pre-wrap;
color: black;
font-size: .85em;
background: inherit;
border: 0;
padding: 0;
}
.log .inner-line {
padding: 0 50px;
margin-left: 96pt;
text-indent: -96pt;
padding: 0 15px;
margin-left: 84pt;
text-indent: -84pt;
margin-bottom: 0;
}
.log .line.selected {
background-color: pink;
.log .line-selected {
background-color: #ffb2b0;
}

View File

@ -3,14 +3,22 @@
<head>
<title>tail -F __TITLE__</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="/styles/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="/styles/__THEME__.css">
<link rel="icon" href="/favicon.ico">
</head>
<body>
<div class="navbar">
<span class="brand">tail -F __TITLE__</span>
<input type="text" class="query" placeholder="Filter" tabindex="1">
</div>
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container-fluid">
<span class="navbar-brand" href="#">tail -F __TITLE__</span>
<form class="navbar-form navbar-right" role="search">
<div class="form-group">
<input type="text" class="form-control query" placeholder="Filter" tabindex="1">
</div>
</form>
</div>
</nav>
<pre class="log"></pre>
<script src="/socket.io/socket.io.js"></script>