forked from cybrespace/mastodon
		
	Merge branch 'theme_base' into cybrespace
This commit is contained in:
		
						commit
						a0ba41a78c
					
				
					 2 changed files with 116 additions and 0 deletions
				
			
		
							
								
								
									
										63
									
								
								app/javascript/styles/cybre-base.scss
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										63
									
								
								app/javascript/styles/cybre-base.scss
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,63 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@import 'application';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Allow columns to grow wider as the screen gets 
 | 
				
			||||||
 | 
					 * wider, but don't ever let them get more than
 | 
				
			||||||
 | 
					 * 400px (some people have a bunch of columns!) */
 | 
				
			||||||
 | 
					@media screen and (min-width: 1300px) {
 | 
				
			||||||
 | 
					  .column {
 | 
				
			||||||
 | 
					    flex-grow: 1 !important;
 | 
				
			||||||
 | 
					    max-width: 400px;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  .drawer {
 | 
				
			||||||
 | 
					    width: 17%; /* Not part of the flex fun */
 | 
				
			||||||
 | 
					    max-width: 400px;
 | 
				
			||||||
 | 
					    min-width: 330px;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Cap the column height at 100vh (fixed an old
 | 
				
			||||||
 | 
					 * 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) */
 | 
				
			||||||
 | 
					[data-whatinput="mouse"], [data-whatinput="touch"] {
 | 
				
			||||||
 | 
					  .status__content:focus, .status:focus,
 | 
				
			||||||
 | 
					  .status__wrapper:focus, .status__content__text:focus {
 | 
				
			||||||
 | 
					    outline: none;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Show a little arrowey thing after the time in a
 | 
				
			||||||
 | 
					 * status to signal that you can click it to see
 | 
				
			||||||
 | 
					 * a detailed view */
 | 
				
			||||||
 | 
					.status time:after,
 | 
				
			||||||
 | 
					.detailed-status__datetime span:after {
 | 
				
			||||||
 | 
					  font: normal normal normal 14px/1 FontAwesome;
 | 
				
			||||||
 | 
					  content: "\00a0\00a0\f08e";
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Don't display the elephant mascot (we have our
 | 
				
			||||||
 | 
					 * own, thanks) */
 | 
				
			||||||
 | 
					.drawer__inner__mastodon {
 | 
				
			||||||
 | 
					  display: none;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Let the compose area/drawer be short, but
 | 
				
			||||||
 | 
					 * expand if necessary */
 | 
				
			||||||
 | 
					.drawer .drawer__inner {
 | 
				
			||||||
 | 
					  overflow: visible;
 | 
				
			||||||
 | 
					  height:inherit;
 | 
				
			||||||
 | 
					  background-image: none;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					.drawer__pager {
 | 
				
			||||||
 | 
					  overflow-y:auto;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@import 'fullwidth-media';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
							
								
								
									
										53
									
								
								app/javascript/styles/fullwidth-media.scss
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										53
									
								
								app/javascript/styles/fullwidth-media.scss
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,53 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Use 100% of the viewport width always*/
 | 
				
			||||||
 | 
					.detailed-status > .media-spoiler,
 | 
				
			||||||
 | 
					.status > .media-spoiler,
 | 
				
			||||||
 | 
					.status .video-player,
 | 
				
			||||||
 | 
					.media-gallery,
 | 
				
			||||||
 | 
					.status .status-card {
 | 
				
			||||||
 | 
					  margin-top:20px;
 | 
				
			||||||
 | 
					  margin-left:-68px;
 | 
				
			||||||
 | 
					  width: calc(100% + 80px);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Unset max-width for spoilers and the video player */
 | 
				
			||||||
 | 
					.detailed-status > .media-spoiler,
 | 
				
			||||||
 | 
					.status > .media-spoiler,
 | 
				
			||||||
 | 
					.video-player {
 | 
				
			||||||
 | 
					  max-width: none;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* If there's no status text, add an extra margin on top */
 | 
				
			||||||
 | 
					.status .status__info + .media-gallery,
 | 
				
			||||||
 | 
					.status .status__info + .media-spoiler,
 | 
				
			||||||
 | 
					.status .status__info + .video-player,
 | 
				
			||||||
 | 
					.status .status__info + .status-card {
 | 
				
			||||||
 | 
					  margin-top: 40px;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Undo transforms on videos inside the video player */
 | 
				
			||||||
 | 
					.status__video-player-video {
 | 
				
			||||||
 | 
					  transform:unset;
 | 
				
			||||||
 | 
					  top:unset;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Adjust offset and width for detail view */
 | 
				
			||||||
 | 
					.detailed-status .media-gallery {
 | 
				
			||||||
 | 
					  margin-left:-10px;
 | 
				
			||||||
 | 
					  width: calc(100% + 22px);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.public-layout .status {
 | 
				
			||||||
 | 
					  .status__content {
 | 
				
			||||||
 | 
					    min-height: 15px;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  & > .media-spoiler,
 | 
				
			||||||
 | 
					  .video-player,
 | 
				
			||||||
 | 
					  .media-gallery,
 | 
				
			||||||
 | 
					  .status-card {
 | 
				
			||||||
 | 
					    margin-top:20px;
 | 
				
			||||||
 | 
					    width: calc(100% + 94px);
 | 
				
			||||||
 | 
					    margin-left: -78px;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue