erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Fix styles

Browse source
This commit is contained in:
Eugen Rochko 2016-10-12 19:14:47 +02:00
parent 2ddf4e09f9
commit f7f3e6e3be
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/components/features/ui/components/column.jsx
View file

@ -30,9 +30,7 @@ const scrollTop = (node) => {
};
const style = {
height: '100%',
boxSizing: 'border-box',
flex: '0 0 auto',
background: '#282c37',
display: 'flex',
flexDirection: 'column'

1
app/assets/javascripts/components/features/ui/components/columns_area.jsx
View file

@ -3,7 +3,6 @@ import PureRenderMixin from 'react-addons-pure-render-mixin';
const style = {
display: 'flex',
flex: '1 1 auto',
flexDirection: 'row',
justifyContent: 'flex-start',
overflowX: 'auto'
};

2
app/assets/javascripts/components/features/ui/components/drawer.jsx
View file

@ -1,8 +1,6 @@
import PureRenderMixin from 'react-addons-pure-render-mixin';
const style = {
height: '100%',
flex: '0 0 auto',
boxSizing: 'border-box',
background: '#454b5e',
padding: '0',

4
app/assets/stylesheets/application.scss
View file

@ -77,9 +77,9 @@ table {
}
::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
border: 0px none #ffffff;
border-radius: 50px;
border-radius: 0;
background: rgba(0, 0, 0, 0.1);
}
::-webkit-scrollbar-track:hover {

5
app/assets/stylesheets/components.scss
View file

@ -231,6 +231,7 @@
.columns-area {
margin: 10px;
margin-left: 0;
flex-direction: row;
}
.column {
@ -243,15 +244,19 @@
.column, .drawer {
margin-left: 10px;
flex: 0 0 auto;
overflow: hidden;
}
@media screen and (max-width: 1024px) {
.column, .drawer {
width: 100%;
margin: 0;
flex: 1 1 100%;
}
.columns-area {
margin: 10px;
flex-direction: column;
}
}