scalie-business
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #393 from ticky/qol-for-four-inch-phones 

Improve experience on 4-inch phones
This commit is contained in:
Eugen 2017-01-05 02:57:13 +01:00 committed by GitHub
parent 98b83aca37 aaee8c9b5d
commit db21724a5a
4 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/features/compose/components/navigation_bar.jsx
View File

@ -16,7 +16,7 @@ const NavigationBar = React.createClass({
render () { render () {
return ( return (
<div style={{ padding: '10px', display: 'flex', cursor: 'default' }}> <div style={{ padding: '10px', display: 'flex', flexShrink: '0', cursor: 'default' }}>
<Permalink href={this.props.account.get('url')} to={`/accounts/${this.props.account.get('id')}`} style={{ textDecoration: 'none' }}><Avatar src={this.props.account.get('avatar')} size={40} /></Permalink> <Permalink href={this.props.account.get('url')} to={`/accounts/${this.props.account.get('id')}`} style={{ textDecoration: 'none' }}><Avatar src={this.props.account.get('avatar')} size={40} /></Permalink>
<div style={{ flex: '1 1 auto', marginLeft: '8px', color: '#9baec8' }}> <div style={{ flex: '1 1 auto', marginLeft: '8px', color: '#9baec8' }}>

4
app/assets/javascripts/components/features/getting_started/index.jsx
View File

@ -43,13 +43,11 @@ const GettingStarted = ({ intl, me }) => {
{followRequests} {followRequests}
</div> </div>
<div className='static-content'> <div className='static-content getting-started'>
<p><FormattedMessage id='getting_started.about_addressing' defaultMessage='You can follow people if you know their username and the domain they are on by entering an e-mail-esque address into the form at the top of the sidebar.' /></p> <p><FormattedMessage id='getting_started.about_addressing' defaultMessage='You can follow people if you know their username and the domain they are on by entering an e-mail-esque address into the form at the top of the sidebar.' /></p>
<p><FormattedMessage id='getting_started.about_shortcuts' defaultMessage='If the target user is on the same domain as you, just the username will work. The same rule applies to mentioning people in statuses.' /></p> <p><FormattedMessage id='getting_started.about_shortcuts' defaultMessage='If the target user is on the same domain as you, just the username will work. The same rule applies to mentioning people in statuses.' /></p>
<p><FormattedMessage id='getting_started.about_developer' defaultMessage='The developer of this project can be followed as Gargron@mastodon.social' /></p> <p><FormattedMessage id='getting_started.about_developer' defaultMessage='The developer of this project can be followed as Gargron@mastodon.social' /></p>
</div> </div>
<div className='getting-started__illustration' />
</Column> </Column>
); );
}; };

5
app/assets/javascripts/components/features/ui/components/tabs_bar.jsx
View File

@ -3,15 +3,14 @@ import { FormattedMessage } from 'react-intl';
const outerStyle = { const outerStyle = {
background: '#373b4a', background: '#373b4a',
margin: '10px',
flex: '0 0 auto', flex: '0 0 auto',
marginBottom: '0' overflowY: 'auto'
}; };
const tabStyle = { const tabStyle = {
display: 'block', display: 'block',
flex: '1 1 auto', flex: '1 1 auto',
padding: '10px', padding: '10px 5px',
color: '#fff', color: '#fff',
textDecoration: 'none', textDecoration: 'none',
textAlign: 'center', textAlign: 'center',

39
app/assets/stylesheets/components.scss
View File

@ -331,11 +331,15 @@
} }
.columns-area { .columns-area {
margin: 10px;
margin-left: 0;
flex-direction: row; flex-direction: row;
} }
@media screen and (min-width: 360px) {
.columns-area {
margin: 10px;
}
}
.column { .column {
width: 330px; width: 330px;
position: relative; position: relative;
@ -346,11 +350,20 @@
} }
.column, .drawer { .column, .drawer {
margin-left: 10px; margin-left: 5px;
margin-right: 5px;
flex: 0 0 auto; flex: 0 0 auto;
overflow: hidden; overflow: hidden;
} }
.column:first-child, .drawer:first-child {
margin-left: 0;
}
.column:last-child, .drawer:last-child {
margin-right: 0;
}
@media screen and (max-width: 1024px) { @media screen and (max-width: 1024px) {
.column, .drawer { .column, .drawer {
width: 100%; width: 100%;
@ -359,7 +372,6 @@
} }
.columns-area { .columns-area {
margin: 10px;
flex-direction: column; flex-direction: column;
} }
} }
@ -368,6 +380,13 @@
display: flex; display: flex;
} }
@media screen and (min-width: 360px) {
.tabs-bar {
margin: 10px;
margin-bottom: 0;
}
}
@media screen and (min-width: 1025px) { @media screen and (min-width: 1025px) {
.tabs-bar { .tabs-bar {
display: none; display: none;
@ -589,12 +608,8 @@
} }
} }
.getting-started__illustration { .getting-started {
width: 330px; overflow-y: auto;
height: 235px; padding-bottom: 235px;
background: image-url('mastodon-getting-started.png') no-repeat 0 0; background: image-url('mastodon-getting-started.png') no-repeat 0 100% local;
position: absolute;
pointer-events: none;
bottom: 0;
left: 0;
} }