This commit is contained in:
Sean Yesmunt 2018-01-04 00:58:51 -05:00
parent 7d492ae1fc
commit 92482ee916
8 changed files with 18 additions and 87 deletions

View file

@ -1,25 +0,0 @@
0 info it worked if it ends with ok
1 verbose cli [ '/Users/seanyesmunt/.nvm/versions/node/v6.12.0/bin/node',
1 verbose cli '/Users/seanyesmunt/.nvm/versions/node/v6.12.0/bin/npm',
1 verbose cli 'config',
1 verbose cli '--loglevel=warn',
1 verbose cli 'get',
1 verbose cli 'prefix' ]
2 info using npm@3.10.10
3 info using node@v6.12.0
4 verbose exit [ 0, true ]
5 verbose stack Error: write EPIPE
5 verbose stack at exports._errnoException (util.js:1020:11)
5 verbose stack at WriteWrap.afterWrite (net.js:800:14)
6 verbose cwd /Users/seanyesmunt/Workspace/lbry/lbry-app
7 error Darwin 17.2.0
8 error argv "/Users/seanyesmunt/.nvm/versions/node/v6.12.0/bin/node" "/Users/seanyesmunt/.nvm/versions/node/v6.12.0/bin/npm" "config" "--loglevel=warn" "get" "prefix"
9 error node v6.12.0
10 error npm v3.10.10
11 error code EPIPE
12 error errno EPIPE
13 error syscall write
14 error write EPIPE
15 error If you need help, you may report this error at:
15 error <https://github.com/npm/npm/issues>
16 verbose exit [ 1, true ]

View file

@ -10,6 +10,7 @@ import NsfwOverlay from 'component/nsfwOverlay';
import * as icons from 'constants/icons';
import classnames from 'classnames';
// TODO: iron these out
type Props = {
isResolvingUri: boolean,
resolveUri: string => void,

View file

@ -57,25 +57,26 @@ export const Header = (props: Props) => {
onClick={() => navigate('/wallet')}
icon="user"
label={isUpgradeAvailable ? `${balance} LBC` : `You have ${balance} LBC`}
title={__('Wallet')}
description={__('Your wallet')}
/>
<Button
onClick={() => navigate('/publish')}
icon="cloud-upload"
label={isUpgradeAvailable ? '' : __('Publish')}
description={__('Publish content')}
/>
<Button alt onClick={() => navigate('/settings')} icon="gear" title={__('Settings')} />
<Button
alt
onClick={() => navigate('/settings')}
icon="gear"
description={__('Settings')}
/>
<Button alt onClick={() => navigate('/help')} icon="question" title={__('Help')} />
<Button alt onClick={() => navigate('/help')} icon="question" description={__('Help')} />
{isUpgradeAvailable && (
<Button
onClick={() => downloadUpgrade()}
icon="arrow-up"
label={__('Upgrade App')}
title={__('Upgrade app')}
/>
<Button onClick={() => downloadUpgrade()} icon="arrow-up" label={__('Upgrade App')} />
)}
</div>
</header>

View file

@ -85,7 +85,7 @@ const Button = (props: Props) => {
</a>
) : (
<button
aria-label={description || title}
aria-label={description || label || title}
className={combinedClassName}
onClick={extendedOnClick}
disabled={disabled}

View file

@ -11,7 +11,6 @@ const handleResponse = response =>
? Promise.resolve(response.json())
: Promise.reject(new Error(response.statusText));
// eslint-disable-next-line import/prefer-default-export
export const doSearch = rawQuery => (dispatch, getState) => {
const state = getState();
const page = selectCurrentPage(state);

View file

@ -1,6 +1,7 @@
// Generic html styles used accross the App
// component specific styling should go in the component scss file
// The actual fonts used will change ex: medium vs regular
@font-face {
font-family: 'Metropolis';
font-weight: normal;
@ -17,14 +18,6 @@
src: url('../../../static/font/metropolis/Metropolis-SemiBold.woff2') format('woff2');
}
// @font-face {
// font-family: 'Metropolis';
// font-weight: 700;
// font-style: normal;
// text-rendering: optimizeLegibility;
// src: url('../../../static/font/metropolis/Metropolis-SemiBold.woff2') format('woff2');
// }
@font-face {
font-family: 'Metropolis';
font-weight: 800;
@ -33,23 +26,6 @@
src: url('../../../static/font/metropolis/Metropolis-ExtraBold.woff2') format('woff2');
}
// TODO: use this
// @font-face {
// font-family: 'Metropolis';
// font-weight: normal;
// font-style: italic;
// text-rendering: optimizeLegibility;
// src: url('../../../static/font/metropolis/Metropolis-MediumItalic.woff2') format('woff2');
// }
//
// @font-face {
// font-family: 'Metropolis';
// font-weight: lighter;
// font-style: normal;
// text-rendering: optimizeLegibility;
// src: url('../../../static/font/metropolis/Metropolis-Light.woff2') format('woff2');
// }
html {
height: 100%;
font-size: var(--font-size);
@ -105,14 +81,14 @@ code {
background-color: var(--color-bg-alt);
}
// Why is this needed?
// Without this buttons don't have the Metropolis font
button {
font-family: inherit;
}
#window {
height: 100%;
overflow: hidden; // so the scrollbar will not extend into the header
overflow: hidden;
}
#main-content {
@ -124,7 +100,8 @@ button {
// don't use {bottom/top} here
// they cause flashes of un-rendered content when scrolling
margin-top: var(--header-height);
padding-bottom: var(--header-height); // fix this scrollbar extends beyond screen
// TODO: fix this scrollbar extends beyond screen at the bottom
padding-bottom: var(--header-height);
background-color: var(--color-bg);
}

View file

@ -1,11 +1,7 @@
// Styles for the <Button /> component
// may be a button or a html element
/*
TODO:
Determine [disabled] or .disabled
Add <a> support (probably just get rid of button prefix)
*/
button {
@ -80,21 +76,3 @@ button.btn--link {
.btn__label {
padding: 0 5px;
}
.btn--with-help + .button__help {
position: absolute;
// display: none;
transition: 0s display;
z-index: 1;
width: 120px;
// top: -5px;
left: 105%;
border-radius: 5px;
background-color: var(--color-placeholder);
box-shadow: var(--box-shadow-layer);
}
.btn--with-help:hover + .button__help {
display: block;
transition-delay: 1s;
}