From 92a03e6d03556bd35e04aaf462c5ef5c2c62f50e Mon Sep 17 00:00:00 2001 From: kevinkace Date: Tue, 15 May 2018 22:11:27 -0700 Subject: [PATCH] Label for tools button --- src/components/header/index.css | 11 ++++++++++- src/components/header/index.js | 9 ++++++--- src/components/lyrics/index.js | 11 ++++++----- src/components/tools/index.css | 20 ++++++++++++++------ src/components/tools/index.js | 3 ++- 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/components/header/index.css b/src/components/header/index.css index 7116553..3af5e5a 100644 --- a/src/components/header/index.css +++ b/src/components/header/index.css @@ -54,13 +54,22 @@ align-items: center; a { - display: block; + display: flex; + align-items: center; + text-decoration: none; svg { fill: colors.cta; width: auto; height: 4vh; } + + div { + margin: 0.4em 0 0 0.4em; + + font: normal 1.2em/1 fontSerif; + text-transform: uppercase; + } } } diff --git a/src/components/header/index.js b/src/components/header/index.js index 7b28791..22b2c32 100644 --- a/src/components/header/index.js +++ b/src/components/header/index.js @@ -25,9 +25,12 @@ export default { m("div", { class : css.logo }, m("a", { - href : "/", - oncreate : m.route.link, - }, m.trust(logo)) + href : "/", + oncreate : m.route.link, + }, + m.trust(logo), + m("div", "Lyrite") + ) ), state.song ? m(tools) : null diff --git a/src/components/lyrics/index.js b/src/components/lyrics/index.js index 736aa62..8e3e539 100644 --- a/src/components/lyrics/index.js +++ b/src/components/lyrics/index.js @@ -12,11 +12,12 @@ function addBr(text) { } export default { - oninit : () => { - // if(state.song.untitled) { - // state.action("OPEN TITLE MODAL"); - // } - }, + // oninit : () => { + // // todo: make this not broken + // if(state.song.untitled) { + // state.action("OPEN TITLE MODAL"); + // } + // }, view : () => m("div", { class : css.lyredit }, m("div", { diff --git a/src/components/tools/index.css b/src/components/tools/index.css index 816484b..fc108f8 100644 --- a/src/components/tools/index.css +++ b/src/components/tools/index.css @@ -36,20 +36,28 @@ bottom: 0; padding: 0 0.4em 0 0.6em; + color: #fff; + text-align: center; + border: none; border-radius: 0.3em; border-top-right-radius: 0; border-bottom-right-radius: 0; background: colors.cta; -} -.show svg { - display: block; - height: 100%; - width: 1em; + svg { + display: block; + width: 1em; + margin: 0 auto; + + fill: #fff; + } - fill: #fff; + div { + font-size: 0.75em; + text-transform: uppercase; + } } .label { diff --git a/src/components/tools/index.js b/src/components/tools/index.js index 2074ed9..0d571a0 100644 --- a/src/components/tools/index.js +++ b/src/components/tools/index.js @@ -22,7 +22,8 @@ export default { } } }, - m.trust(edit) + m.trust(edit), + m("div", "tools") ), // Style buttons