Browse Source

Fix embed width, light theme embeds (#2)

nightpool 4 weeks ago
parent
commit
b9bab4e477

+ 7
- 5
app/javascript/styles/cybre-light.scss View File

@@ -16,10 +16,8 @@ $action-button-color: $icon-button-inactive-color;
16 16
 
17 17
 $about-page-text: $primary-text-color;
18 18
 
19
-@import 'application';
20 19
 @import 'cybre-base';
21 20
 
22
-
23 21
 $gold-star: #dd9d08;
24 22
 
25 23
 /* cybre-specific additions */
@@ -264,6 +262,10 @@ $gold-star: #dd9d08;
264 262
   }
265 263
 }
266 264
 
265
+.status-card, .status-card.compact {
266
+  border-color: $ui-highlight-color;
267
+}
268
+
267 269
 // selectivity -- needs to override .column-header > button
268 270
 .column-header .column-header__back-button {
269 271
   background: $header-color;
@@ -773,7 +775,7 @@ button.icon-button {
773 775
   color: $primary-text-color;
774 776
 }
775 777
 
776
-.admin-wrapper .content { 
778
+.admin-wrapper .content {
777 779
   & > p {
778 780
     color: $primary-text-color;
779 781
   }
@@ -905,8 +907,8 @@ button.icon-button {
905 907
     color: $white;
906 908
   }
907 909
 }
908
-.public-layout .header .brand:hover, 
909
-.public-layout .header .brand:focus, 
910
+.public-layout .header .brand:hover,
911
+.public-layout .header .brand:focus,
910 912
 .public-layout .header .brand:active {
911 913
   background: lighten($ui-highlight-color, 5%);
912 914
 }

+ 7
- 12
app/javascript/styles/fullwidth-media.scss View File

@@ -1,16 +1,14 @@
1 1
 
2
-/* Use 100% of the viewport width always*/
3 2
 .detailed-status > .media-spoiler,
4 3
 .status > .media-spoiler,
5 4
 .status .video-player,
6 5
 .media-gallery,
7
-.status .status-card {
8
-  margin-top:20px;
9
-  margin-left:-68px;
6
+.status .status-card.interactive {
7
+  margin-top: 20px;
8
+  margin-left: -68px;
10 9
   width: calc(100% + 80px);
11 10
 }
12 11
 
13
-/* Unset max-width for spoilers and the video player */
14 12
 .detailed-status > .media-spoiler,
15 13
 .status > .media-spoiler,
16 14
 .video-player {
@@ -25,16 +23,13 @@
25 23
   margin-top: 40px;
26 24
 }
27 25
 
28
-/* Undo transforms on videos inside the video player */
29 26
 .status__video-player-video {
30
-  transform:unset;
31
-  top:unset;
27
+  transform: unset;
28
+  top: unset;
32 29
 }
33 30
 
34
-
35
-/* Adjust offset and width for detail view */
36 31
 .detailed-status .media-gallery {
37
-  margin-left:-10px;
32
+  margin-left: -10px;
38 33
   width: calc(100% + 22px);
39 34
 }
40 35
 
@@ -46,7 +41,7 @@
46 41
   .video-player,
47 42
   .media-gallery,
48 43
   .status-card {
49
-    margin-top:20px;
44
+    margin-top: 20px;
50 45
     width: calc(100% + 94px);
51 46
     margin-left: -78px;
52 47
   }

+ 0
- 5
app/javascript/styles/mastodon/components.scss View File

@@ -2578,10 +2578,6 @@ a.status-card {
2578 2578
     width: 100%;
2579 2579
   }
2580 2580
 
2581
-  .status-card__image-image {
2582
-    border-radius: 4px 4px 0 0;
2583
-  }
2584
-
2585 2581
   .status-card__title {
2586 2582
     white-space: inherit;
2587 2583
   }
@@ -2613,7 +2609,6 @@ a.status-card.compact:hover {
2613 2609
 }
2614 2610
 
2615 2611
 .status-card__image-image {
2616
-  border-radius: 4px 0 0 4px;
2617 2612
   display: block;
2618 2613
   margin: 0;
2619 2614
   width: 100%;