djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-27 10:30:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into skylight

Browse Source
This commit is contained in:
Eugen Rochko 2017-04-19 19:24:31 +02:00
commit 5322654945
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/components/components/button.jsx
View File

@ -44,7 +44,10 @@ const Button = React.createClass({
cursor: 'pointer',
lineHeight: `${this.props.size}px`,
borderRadius: '4px',
textDecoration: 'none'
textDecoration: 'none',
whiteSpace: 'nowrap',
textOverflow: 'ellipsis',
overflow: 'hidden'
};
return (

4
app/assets/javascripts/components/features/compose/components/compose_form.jsx
View File

@ -197,9 +197,9 @@ const ComposeForm = React.createClass({
<SpoilerButtonContainer />
</div>
<div style={{ display: 'flex' }}>
<div style={{ display: 'flex', minWidth: 0 }}>
<div style={{ paddingTop: '10px', marginRight: '16px', lineHeight: '36px' }}><CharacterCounter max={500} text={text} /></div>
<div style={{ paddingTop: '10px' }}><Button text={publishText} onClick={this.handleSubmit} disabled={disabled || text.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "_").length > 500} /></div>
<div style={{ paddingTop: '10px', overflow: 'hidden' }}><Button text={publishText} onClick={this.handleSubmit} disabled={disabled || text.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "_").length > 500} block /></div>
</div>
</div>
</div>

2
app/assets/javascripts/components/locales/hu.jsx
View File

@ -18,7 +18,7 @@ const hu = {
"account.block": "Blokkolás",
"account.follow": "Követés",
"account.posts": "Posts",
"account.follows": "Követők",
"account.follows": "Követve",
"account.followers": "Követők",
"account.follows_you": "Követnek téged",
"getting_started.heading": "Első lépések",

5
app/assets/stylesheets/accounts.scss
View File

@ -237,13 +237,14 @@
}
.accounts-grid {
clear: both;
box-shadow: 0 0 15px rgba($color8, 0.2);
background: $color5;
border-radius: 0 0 4px 4px;
padding: 20px 10px;
padding-bottom: 10px;
overflow: hidden;
display: flex;
flex-wrap: wrap;
@media screen and (max-width: 700px) {
border-radius: 0;
@ -253,11 +254,9 @@
.account-grid-card {
box-sizing: border-box;
width: 335px;
float: left;
border: 1px solid $color2;
border-radius: 4px;
color: $color1;
height: 160px;
margin-bottom: 10px;
&:nth-child(odd) {