cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'theme_base' into theme_cybre

This commit is contained in:
khr 2019-10-13 12:32:29 -07:00
parent 1974ff00c4 019e0833d1
commit 1d0a80b4fd
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/javascript/styles/cybre-base.scss
View File

@ -1,15 +1,8 @@
@import 'application'; @import 'application';
/* Allow columns to grow wider as the screen gets /* Wider compose area */
* wider, but don't ever let them get more than
* 400px (some people have a bunch of columns!) */
@media screen and (min-width: 1300px) { @media screen and (min-width: 1300px) {
.column {
flex-grow: 1 !important;
max-width: 400px;
}
.drawer { .drawer {
width: 17%; /* Not part of the flex fun */ width: 17%; /* Not part of the flex fun */
max-width: 400px; max-width: 400px;
@ -17,14 +10,7 @@
} }
} }
/* Cap the column height at 100vh (fixed an old /* Don't show outline around statuses if we're in
* bug someone encountered in safari, but which
* I've seen resurface from time to time) */
.column {
max-height:100vh;
}
/* Don't show outline around statuses if we're in
* mouse or touch mode (rather than keyboard) */ * mouse or touch mode (rather than keyboard) */
[data-whatinput="mouse"], [data-whatinput="touch"] { [data-whatinput="mouse"], [data-whatinput="touch"] {
.status__content:focus, .status:focus, .status__content:focus, .status:focus,
@ -69,7 +55,22 @@
overflow-y:auto; overflow-y:auto;
} }
/* Use display: none instead of visibility:hidden /* Put a reasonable background on the single-column compose form */
.layout-single-column .compose-panel {
background-color: $ui-base-color;
height: auto;
overflow-y: visible;
margin-top: 65px;
}
/* Better distinguish the search bar */
.layout-single-column .compose-panel .search {
position:relative;
top: -55px;
margin-bottom: -55px;
}
/* Use display: none instead of visibility:hidden
* to hide the suggested follows list on non-mobile */ * to hide the suggested follows list on non-mobile */
@media screen and (min-width: 630px) { @media screen and (min-width: 630px) {
.search-results .trends { .search-results .trends {