Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2025-02-22 05:29:34 +01:00
Code Releases Wiki Activity

Merge branch 'master' of https://github.com/ctrlcctrlv/8chan

Browse Source 
Conflicts:
	stylesheets/style.css

quick merge
This commit is contained in:
kaernyk 2014-09-26 08:15:10 -04:00
commit 5093f5c121
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stylesheets/style.css
View File

@ -535,8 +535,13 @@ pre {
background: rgba(182, 182, 182, 0.12); background: rgba(182, 182, 182, 0.12);
border: 2px solid rgba(111, 111, 111, 0.34); border: 2px solid rgba(111, 111, 111, 0.34);
max-height:300px; max-height:300px;
<<<<<<< HEAD
background: rgba(182, 182, 182, 0.12); background: rgba(182, 182, 182, 0.12);
border: 2px solid rgba(111, 111, 111, 0.34); border: 2px solid rgba(111, 111, 111, 0.34);
=======
background: rgba(182, 182, 182, 0.12);
border: 2px solid rgba(111, 111, 111, 0.34);
>>>>>>> 5b5f3984f0d17a0dfaf6cdc7f49ec31fe5c862b8
} }
.theme-catalog div.thread strong { .theme-catalog div.thread strong {
display: block; display: block;