RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bitpay/mystery into test/test-p2p-sync

Browse Source
This commit is contained in:
Manuel Araoz 2014-01-16 16:49:49 -03:00
commit 87d5e43938
3 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
public/css/common.css
View File

@ -1,5 +1,7 @@
.mystery { .insight {
font-family: Ubuntu-BoldItalic; font-family: Ubuntu, sans-serif;
font-weight: 400;
font-style: italic;
font-size: 34px; font-size: 34px;
color: #FFFFFF !important; color: #FFFFFF !important;
line-height: 18px; line-height: 18px;
@ -16,6 +18,12 @@ body {
/* The html and body elements cannot have any padding or margin. */ /* The html and body elements cannot have any padding or margin. */
} }
h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
font-family: Ubuntu, sans-serif;
color: #373D42;
}
/* Wrapper for page content to push down footer */ /* Wrapper for page content to push down footer */
#wrap { #wrap {
min-height: 100%; min-height: 100%;
@ -57,11 +65,14 @@ body {
#search { #search {
color: #fff; color: #fff;
font-family: Ubuntu-Light; font-family: Ubuntu, sans-serif;
font-weight: 100;
} }
#search::-webkit-input-placeholder { #search::-webkit-input-placeholder {
font-family: Ubuntu-LightItalic; font-family: Ubuntu, sans-serif;
font-weight: 100;
font-style: italic;
font-size: 13px; font-size: 13px;
color: #BCDF7E; color: #BCDF7E;
line-height: 18px; line-height: 18px;
@ -69,7 +80,8 @@ body {
#search::-moz-placeholder { #search::-moz-placeholder {
font-family: Ubuntu-LightItalic; font-family: Ubuntu, sans-serif;
font-weight: 100;
font-size: 13px; font-size: 13px;
color: #BCDF7E; color: #BCDF7E;
line-height: 18px; line-height: 18px;
@ -116,7 +128,7 @@ body {
} }
.block-id h1 { .block-id h1 {
font-family: Ubuntu-Medium; font-weight: bold;
font-size: 24px; font-size: 24px;
color: #FFFFFF; color: #FFFFFF;
line-height: 30px; line-height: 30px;
@ -146,7 +158,7 @@ body {
background: #fff; background: #fff;
border: 2px solid #ccc; border: 2px solid #ccc;
color: #373D42; color: #373D42;
font-weight: bold; font-weight: 500;
} }
/* Set the fixed height of the footer here */ /* Set the fixed height of the footer here */

4
public/views/header.html
View File

@ -1,3 +1,4 @@
<div class="container">
<div data-ng-controller="HeaderController"> <div data-ng-controller="HeaderController">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@ -6,7 +7,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="mystery navbar-brand" href="#!">Mystery</a> <a class="insight navbar-brand" href="#!">Insight</a>
</div> </div>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
@ -25,3 +26,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>

2
server.js
View File

@ -49,6 +49,8 @@ hs.init({
}, function() { }, function() {
hs.import_history({ hs.import_history({
reverse: 1, reverse: 1,
}, function(){
console.log('historic_sync finished!');
}); });
}); });