Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.
This commit is contained in:
		@@ -151,6 +151,20 @@ $no-columns-breakpoint: 600px;
 | 
			
		||||
      font-weight: 500;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    .directory__tag a {
 | 
			
		||||
      box-shadow: none;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    .directory__tag h4 {
 | 
			
		||||
      font-size: 18px;
 | 
			
		||||
      font-weight: 700;
 | 
			
		||||
      color: $primary-text-color;
 | 
			
		||||
      text-transform: none;
 | 
			
		||||
      padding-bottom: 0;
 | 
			
		||||
      margin-bottom: 0;
 | 
			
		||||
      border-bottom: none;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    & > p {
 | 
			
		||||
      font-size: 14px;
 | 
			
		||||
      line-height: 18px;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user