LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Merge pull request #146 from lbryio/fix-text-link-styles

Browse source 
Fix styling of normal text links
This commit is contained in:
alexliebowitz 2017-01-26 02:41:40 -05:00 committed by GitHub
commit fe62548637
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js/component/file-actions.js
View file

@ -185,7 +185,7 @@ let FileActionsRow = React.createClass({
</div> </div>
); );
} else { } else {
linkBlock = <Link label="Open" icon="icon-folder-open" onClick={this.onOpenClick} />; linkBlock = <Link label="Open" button="text" icon="icon-folder-open" onClick={this.onOpenClick} />;
} }
return ( return (
@ -266,7 +266,7 @@ export let FileActions = React.createClass({
body="The content on LBRY is hosted by its users. It appears there are no users connected that have this file at the moment." /> body="The content on LBRY is hosted by its users. It appears there are no users connected that have this file at the moment." />
</div> </div>
<div className="button-container"> <div className="button-container">
<Link label="Try Anyway" className="button-text" onClick={this.onShowFileActionsRowClicked} /> <Link label="Try Anyway" onClick={this.onShowFileActionsRowClicked} />
</div> </div>
</div>) </div>)
} }

2
js/component/file-tile.js
View file

@ -146,7 +146,7 @@ export let FileTileStream = React.createClass({
? <div className='card-overlay'> ? <div className='card-overlay'>
<p> <p>
This content is Not Safe For Work. This content is Not Safe For Work.
To view adult content, please change your <Link href="?settings" label="Settings" />. To view adult content, please change your <Link className="button-text" href="?settings" label="Settings" />.
</p> </p>
</div> </div>
: null} : null}

2
js/component/link.js
View file

@ -28,7 +28,7 @@ export let Link = React.createClass({
/* The way the class name is generated here is a mess -- refactor */ /* The way the class name is generated here is a mess -- refactor */
const className = (this.props.className || '') + const className = (this.props.className || '') +
(!this.props.className && !this.props.button ? 'button-block button-text' : '') + // Non-button links get the same look as text buttons (!this.props.className && !this.props.button ? 'button-text' : '') + // Non-button links get the same look as text buttons
(this.props.button ? 'button-block button-' + this.props.button : '') + (this.props.button ? 'button-block button-' + this.props.button : '') +
(this.props.disabled ? ' disabled' : ''); (this.props.disabled ? ' disabled' : '');

2
js/component/menu.js
View file

@ -68,7 +68,7 @@ export let DropDownMenu = React.createClass({
} }
return ( return (
<div className="button-container"> <div className="button-container">
<Link ref={(span) => this._menuButton = span} icon="icon-ellipsis-v" onClick={this.onMenuIconClick} /> <Link ref={(span) => this._menuButton = span} button="text" icon="icon-ellipsis-v" onClick={this.onMenuIconClick} />
{this.state.menuOpen {this.state.menuOpen
? <div ref={(div) => this._menuDiv = div} className="menu"> ? <div ref={(div) => this._menuDiv = div} className="menu">
{this.props.children} {this.props.children}