From 0010c0f688c89be7a489e062a3ab96d1db94430a Mon Sep 17 00:00:00 2001 From: Gustavo Cortez Date: Tue, 29 Apr 2014 09:52:28 -0300 Subject: [PATCH] Little fixes: html and templates config support. --- config.template.js | 2 +- css/main.css | 43 ++++++++++++++++++------------------------- css/tpl-default.css | 42 +++++++++++++++++++++++++++++++++++------- index.html | 4 ++-- 4 files changed, 56 insertions(+), 35 deletions(-) diff --git a/config.template.js b/config.template.js index 683f6bee3..ea2f712b9 100644 --- a/config.template.js +++ b/config.template.js @@ -36,7 +36,7 @@ var config = { port: 3001 }, verbose: 1, - theme: ['default', 'clean'] + themes: ['default'] }; var log = function () { diff --git a/css/main.css b/css/main.css index 3304d2008..586157771 100644 --- a/css/main.css +++ b/css/main.css @@ -1,30 +1,10 @@ -@font-face { - font-family: 'Ubuntu'; - font-style: normal; - font-weight: 300; - src: local('Ubuntu Light'), local('Ubuntu-Light'), url(../font/ubuntu-light.woff) format('woff'); -} -@font-face { - font-family: 'Ubuntu'; - font-style: normal; - font-weight: 400; - src: local('Ubuntu'), url(../font/ubuntu.woff) format('woff'); -} -@font-face { - font-family: 'Ubuntu'; - font-style: normal; - font-weight: 700; - src: local('Ubuntu Bold'), local('Ubuntu-Bold'), url(../font/ubuntu-bold.woff) format('woff'); -} -@font-face { - font-family: 'Ubuntu'; - font-style: italic; - font-weight: 700; - src: local('Ubuntu Bold Italic'), local('Ubuntu-BoldItalic'), url(../font/ubuntu-bold-italic.woff) format('woff'); -} +/* + * + * Copay main CSS + * + */ * { - font-family: 'Ubuntu', Helvetica, sans-serif !important; margin:0; padding:0; } @@ -81,6 +61,19 @@ html, body {height: 100%;} font-size: 0.9rem; } +.header h1, h5, p { + font-weight: 100; + margin-bottom: 0; +} + +.header button, .button { + margin-bottom: 0; +} + +.header h6 { + font-weight: 100; +} + .top-bar { height: auto; width: 100%; diff --git a/css/tpl-default.css b/css/tpl-default.css index 0fd93aa15..52db7e78a 100644 --- a/css/tpl-default.css +++ b/css/tpl-default.css @@ -1,3 +1,38 @@ +/* + * + * Copay Default Template + * + */ + +@font-face { + font-family: 'Ubuntu'; + font-style: normal; + font-weight: 300; + src: local('Ubuntu Light'), local('Ubuntu-Light'), url(../font/ubuntu-light.woff) format('woff'); +} +@font-face { + font-family: 'Ubuntu'; + font-style: normal; + font-weight: 400; + src: local('Ubuntu'), url(../font/ubuntu.woff) format('woff'); +} +@font-face { + font-family: 'Ubuntu'; + font-style: normal; + font-weight: 700; + src: local('Ubuntu Bold'), local('Ubuntu-Bold'), url(../font/ubuntu-bold.woff) format('woff'); +} +@font-face { + font-family: 'Ubuntu'; + font-style: italic; + font-weight: 700; + src: local('Ubuntu Bold Italic'), local('Ubuntu-BoldItalic'), url(../font/ubuntu-bold-italic.woff) format('woff'); +} + +* { + font-family: 'Ubuntu', Helvetica, sans-serif !important; +} + body { background: #F5F5F5; } @@ -32,17 +67,10 @@ body { .header h1, h5, p { color: #93A9BD; - font-weight: 100; - margin-bottom: 0; -} - -.header button, .button { - margin-bottom: 0; } .header h6 { color: #fff; - font-weight: 100; } .header .line-dashed-v { diff --git a/index.html b/index.html index 2461b4cfc..6c7f95a10 100644 --- a/index.html +++ b/index.html @@ -14,10 +14,10 @@
-
+
-
+
{{$root.wallet.id}} Wallet: {{$root.wallet.name}} <{{$root.wallet.id}}>