luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-06 23:14:57 +00:00
Code Issues Projects Releases Wiki Activity

Change styling to always have scrollbar on search results

Browse source
This commit is contained in:
Thibaut Girka 2020-08-17 14:05:59 +02:00 committed by ThibG
parent d4b65193c7
commit 5dcc406abe
2 changed files with 45 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/flavours/glitch/features/compose/components/search_results.js
View file

@ -125,9 +125,11 @@ class SearchResults extends ImmutablePureComponent {
<FormattedMessage id='search_results.total' defaultMessage='{count, number} {count, plural, one {result} other {results}}' values={{ count }} />
</header>
{accounts}
{statuses}
{hashtags}
<div className='search-results__contents'>
{accounts}
{statuses}
{hashtags}
</div>
</div>
);
};

71
app/javascript/flavours/glitch/styles/components/drawer.scss
View file

@ -115,8 +115,10 @@
.drawer--results {
background: $ui-base-color;
overflow-x: hidden;
overflow-y: auto;
overflow: hidden;
display: flex;
flex-direction: column;
flex: 1 1 auto;
& > header {
color: $dark-text-color;
@ -125,6 +127,7 @@
font-weight: 500;
font-size: 16px;
cursor: default;
flex: 0 0 auto;
.fa {
display: inline-block;
@ -132,41 +135,47 @@
}
}
& > section {
margin-bottom: 5px;
& > .search-results__contents {
overflow-x: hidden;
overflow-y: scroll;
flex: 1 1 auto;
h5 {
background: darken($ui-base-color, 4%);
border-bottom: 1px solid lighten($ui-base-color, 8%);
cursor: default;
display: flex;
padding: 15px;
font-weight: 500;
font-size: 16px;
color: $dark-text-color;
& > section {
margin-bottom: 5px;
.fa {
display: inline-block;
margin-right: 5px;
h5 {
background: darken($ui-base-color, 4%);
border-bottom: 1px solid lighten($ui-base-color, 8%);
cursor: default;
display: flex;
padding: 15px;
font-weight: 500;
font-size: 16px;
color: $dark-text-color;
.fa {
display: inline-block;
margin-right: 5px;
}
}
}
.account:last-child,
& > div:last-child .status {
border-bottom: 0;
}
.account:last-child,
& > div:last-child .status {
border-bottom: 0;
}
& > .hashtag {
display: block;
padding: 10px;
color: $secondary-text-color;
text-decoration: none;
& > .hashtag {
display: block;
padding: 10px;
color: $secondary-text-color;
text-decoration: none;
&:hover,
&:active,
&:focus {
color: lighten($secondary-text-color, 4%);
text-decoration: underline;
&:hover,
&:active,
&:focus {
color: lighten($secondary-text-color, 4%);
text-decoration: underline;
}
}
}
}