Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hides superluous details on small screens #2175

Merged
merged 2 commits into from
Apr 21, 2017
Merged

Hides superluous details on small screens #2175

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c9d967
Hides superluous details on small screans.
ashfurrow Apr 19, 2017
63efcbe
Addressed feedback from #2175.
ashfurrow Apr 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/assets/javascripts/components/features/getting_started/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ const GettingStarted = ({ intl, me }) => {
}

return (
<Column icon='asterisk' heading={intl.formatMessage(messages.heading)}>
<Column icon='asterisk' heading={intl.formatMessage(messages.heading)} hideHeadingOnMobile={true}>
<div style={{ position: 'relative' }}>
<ColumnLink icon='users' text={intl.formatMessage(messages.community_timeline)} to='/timelines/public/local' />
<ColumnLink icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' />
<ColumnLink icon='users' hideOnMobile={true} text={intl.formatMessage(messages.community_timeline)} to='/timelines/public/local' />
<ColumnLink icon='globe' hideOnMobile={true} text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' />
<ColumnLink icon='cog' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />
<ColumnLink icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />
{followRequests}
Expand Down
7 changes: 4 additions & 3 deletions app/assets/javascripts/components/features/ui/components/column.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ const Column = React.createClass({
heading: React.PropTypes.string,
icon: React.PropTypes.string,
children: React.PropTypes.node,
active: React.PropTypes.bool
active: React.PropTypes.bool,
hideHeadingOnMobile: React.PropTypes.bool
},

mixins: [PureRenderMixin],
Expand All @@ -55,12 +56,12 @@ const Column = React.createClass({
},

render () {
const { heading, icon, children, active } = this.props;
const { heading, icon, children, active, hideHeadingOnMobile } = this.props;

let header = '';

if (heading) {
header = <ColumnHeader icon={icon} active={active} type={heading} onClick={this.handleHeaderClick} />;
header = <ColumnHeader icon={icon} active={active} type={heading} onClick={this.handleHeaderClick} hideOnMobile={hideHeadingOnMobile} />;
}

return (
Expand Down
7 changes: 4 additions & 3 deletions app/assets/javascripts/components/features/ui/components/column_header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ const ColumnHeader = React.createClass({
icon: React.PropTypes.string,
type: React.PropTypes.string,
active: React.PropTypes.bool,
onClick: React.PropTypes.func
onClick: React.PropTypes.func,
hideOnMobile: React.PropTypes.bool
},

mixins: [PureRenderMixin],
Expand All @@ -16,7 +17,7 @@ const ColumnHeader = React.createClass({
},

render () {
const { type, active } = this.props;
const { type, active, hideOnMobile } = this.props;

let icon = '';

Expand All @@ -25,7 +26,7 @@ const ColumnHeader = React.createClass({
}

return (
<div role='button' tabIndex='0' aria-label={type} className={`column-header ${active ? 'active' : ''}`} onClick={this.handleClick}>
<div role='button' tabIndex='0' aria-label={type} className={`column-header ${active ? 'active' : ''} ${hideOnMobile ? 'hidden-on-mobile' : ''}`} onClick={this.handleClick}>
{icon}
{type}
</div>
Expand Down
10 changes: 5 additions & 5 deletions app/assets/javascripts/components/features/ui/components/column_link.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Link } from 'react-router';

const outerStyle = {
display: 'block',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what I wasn't clear on; I don't know why the style is inline but I had to move the display property to CSS to be able to override it from within the stylesheet. If more/all of these should be moved over, or if there's a better way to do any of this, let me know 👍

padding: '15px',
fontSize: '16px',
textDecoration: 'none'
Expand All @@ -12,17 +11,17 @@ const iconStyle = {
marginRight: '5px'
};

const ColumnLink = ({ icon, text, to, href, method }) => {
const ColumnLink = ({ icon, text, to, href, method, hideOnMobile }) => {
if (href) {
return (
<a href={href} style={outerStyle} className='column-link' data-method={method}>
<a href={href} style={outerStyle} className={`column-link ${hideOnMobile ? 'hidden-on-mobile' : ''}`} data-method={method}>
<i className={`fa fa-fw fa-${icon}`} style={iconStyle} />
{text}
</a>
);
} else {
return (
<Link to={to} style={outerStyle} className='column-link'>
<Link to={to} style={outerStyle} className={`column-link ${hideOnMobile ? 'hidden-on-mobile' : ''}`}>
<i className={`fa fa-fw fa-${icon}`} style={iconStyle} />
{text}
</Link>
Expand All @@ -35,7 +34,8 @@ ColumnLink.propTypes = {
text: React.PropTypes.string.isRequired,
to: React.PropTypes.string,
href: React.PropTypes.string,
method: React.PropTypes.string
method: React.PropTypes.string,
hideOnMobile: React.PropTypes.bool
};

export default ColumnLink;
13 changes: 13 additions & 0 deletions app/assets/stylesheets/components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,10 +1182,17 @@ a.status__content__spoiler-link {
.column-link {
background: lighten($color1, 8%);
color: $color5;
display: block;

&:hover {
background: lighten($color1, 11%);
}

&.hidden-on-mobile {
@media screen and (max-width: 600px) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "mobile" layout begins at 1024px, atm.

display: none;
}
}
}

.autosuggest-textarea, .spoiler-input {
Expand Down Expand Up @@ -1381,6 +1388,12 @@ button.icon-button.active i.fa-retweet {
color: $color4;
text-shadow: 0 0 10px rgba($color4, 0.4);
}

&.hidden-on-mobile {
@media screen and (max-width: 600px) {
display: none;
}
}
}

.loading-indicator {
Expand Down