cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Fix embed width, light theme embeds #2

Merged
chr merged 2 commits from nightpool/mastodon:light_theme_inline_embeds into cybrespace 2018-11-20 07:27:41 +01:00
Conversation 2 Commits 2 Files Changed 3 +14 -22
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/javascript/styles/cybre-light.scss
View File

@ -16,10 +16,8 @@ $action-button-color: $icon-button-inactive-color;
$about-page-text: $primary-text-color; $about-page-text: $primary-text-color;
@import 'application';
@import 'cybre-base'; @import 'cybre-base';
$gold-star: #dd9d08; $gold-star: #dd9d08;
/* cybre-specific additions */ /* cybre-specific additions */
@ -264,6 +262,10 @@ $gold-star: #dd9d08;
} }
} }
.status-card, .status-card.compact {
border-color: $ui-highlight-color;
}
// selectivity -- needs to override .column-header > button // selectivity -- needs to override .column-header > button
.column-header .column-header__back-button { .column-header .column-header__back-button {
background: $header-color; background: $header-color;
@ -773,7 +775,7 @@ button.icon-button {
color: $primary-text-color; color: $primary-text-color;
} }
.admin-wrapper .content { .admin-wrapper .content {
& > p { & > p {
color: $primary-text-color; color: $primary-text-color;
} }
@ -905,8 +907,8 @@ button.icon-button {
color: $white; color: $white;
} }
} }
.public-layout .header .brand:hover, .public-layout .header .brand:hover,
.public-layout .header .brand:focus, .public-layout .header .brand:focus,
.public-layout .header .brand:active { .public-layout .header .brand:active {
background: lighten($ui-highlight-color, 5%); background: lighten($ui-highlight-color, 5%);
} }

19
app/javascript/styles/fullwidth-media.scss
View File

@ -1,16 +1,14 @@
/* Use 100% of the viewport width always*/
.detailed-status > .media-spoiler, .detailed-status > .media-spoiler,
.status > .media-spoiler, .status > .media-spoiler,
.status .video-player, .status .video-player,
.media-gallery, .media-gallery,
.status .status-card { .status .status-card.interactive {
margin-top:20px; margin-top: 20px;
margin-left:-68px; margin-left: -68px;
width: calc(100% + 80px); width: calc(100% + 80px);
} }
/* Unset max-width for spoilers and the video player */
.detailed-status > .media-spoiler, .detailed-status > .media-spoiler,
.status > .media-spoiler, .status > .media-spoiler,
.video-player { .video-player {
@ -25,16 +23,13 @@
margin-top: 40px; margin-top: 40px;
} }
/* Undo transforms on videos inside the video player */
.status__video-player-video { .status__video-player-video {
transform:unset; transform: unset;
top:unset; top: unset;
} }
/* Adjust offset and width for detail view */
.detailed-status .media-gallery { .detailed-status .media-gallery {
margin-left:-10px; margin-left: -10px;
width: calc(100% + 22px); width: calc(100% + 22px);
} }
@ -46,7 +41,7 @@
.video-player, .video-player,
.media-gallery, .media-gallery,
.status-card { .status-card {
margin-top:20px; margin-top: 20px;
width: calc(100% + 94px); width: calc(100% + 94px);
margin-left: -78px; margin-left: -78px;
} }

5
app/javascript/styles/mastodon/components.scss
View File

@ -2578,10 +2578,6 @@ a.status-card {
width: 100%; width: 100%;
} }
.status-card__image-image {
border-radius: 4px 4px 0 0;
}
.status-card__title { .status-card__title {
white-space: inherit; white-space: inherit;
} }
@ -2613,7 +2609,6 @@ a.status-card.compact:hover {
} }
.status-card__image-image { .status-card__image-image {
border-radius: 4px 0 0 4px;
display: block; display: block;
margin: 0; margin: 0;
width: 100%; width: 100%;