tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved style of settings page

Browse Source
This commit is contained in:
Eugen Rochko
2016-09-25 15:48:20 +02:00
parent e9bc4a4a08
commit 693383234c
4 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/components/features/account/components/action_bar.jsx
View File

@ -34,8 +34,8 @@ const ActionBar = React.createClass({
}
return (
<div style={{ borderTop: '1px solid #363c4b', borderBottom: '1px solid #363c4b', padding: '10px', lineHeight: '36px' }}>
{actionButton} <span style={{ color: '#616b86', fontWeight: '500', textTransform: 'uppercase' }}>{infoText}</span>
<div style={{ borderTop: '1px solid #363c4b', borderBottom: '1px solid #363c4b', padding: '10px', lineHeight: '36px', overflow: 'hidden', flex: '0 0 auto' }}>
{actionButton} <span style={{ color: '#616b86', fontWeight: '500', textTransform: 'uppercase', float: 'right', display: 'block' }}>{infoText}</span>
</div>
);
},

19
app/assets/stylesheets/application.scss
View File

@ -127,7 +127,23 @@ body {
margin-bottom: 15px;
}
input[type=text], input[type=email], input[type=password] {
.file-field {
padding: 15px 0;
label {
font-family: 'Roboto';
font-size: 16px;
color: #fff;
width: 100px;
display: inline-block;
}
input[type=file] {
width: 280px;
}
}
input[type=text], input[type=email], input[type=password], textarea {
background: transparent;
border: 0;
border-bottom: 2px solid #9baec8;
@ -137,6 +153,7 @@ body {
display: block;
width: 100%;
outline: 0;
font-family: 'Roboto';
&:invalid {
box-shadow: none;