Merge branch 'master' into branch_2.4
This commit is contained in:
		
						commit
						8ba00569be
					
				@ -1,10 +0,0 @@
 | 
				
			|||||||
<?php
 | 
					 | 
				
			||||||
/**
 | 
					 | 
				
			||||||
 * A customised version of the Setup theme
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
class CustomSetupTheme extends SetupTheme {
 | 
					 | 
				
			||||||
	protected function sb_to_html(SetupBlock $block) {
 | 
					 | 
				
			||||||
		return $this->box(parent::sb_to_html($block));
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
?>
 | 
					 | 
				
			||||||
@ -83,8 +83,8 @@ UL {
 | 
				
			|||||||
	text-align: left;
 | 
						text-align: left;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SECTION>H3, SECTION>.blockbody, .comment {margin: 8px; padding: 8px; border: 1px solid #B89F7C;}
 | 
					SECTION>H3, SECTION>.blockbody, .comment, .setupblock {margin: 8px; padding: 8px; border: 1px solid #B89F7C;}
 | 
				
			||||||
SECTION>.blockbody, .comment {background: #FCD9A9;}
 | 
					SECTION>.blockbody, .comment, .setupblock {background: #FCD9A9;}
 | 
				
			||||||
SECTION>H3 {background: #DABC92;}
 | 
					SECTION>H3 {background: #DABC92;}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user