harmacist/vichan
1
0
Fork 0
forked from GithubBackups/vichan
Code Pull Requests Activity

Remove erroneous data and fix indentation

Browse Source
This commit is contained in:
kaernyk 2014-09-26 08:23:25 -04:00
parent 5093f5c121
commit 74ab0a2feb
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
stylesheets/style.css
View File

@ -535,20 +535,17 @@ 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);
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);
>>>>>>> 5b5f3984f0d17a0dfaf6cdc7f49ec31fe5c862b8
} }
.theme-catalog div.thread strong { .theme-catalog div.thread strong {
display: block; display: block;
} }
.theme-catalog div.threads{ .theme-catalog div.threads{
text-align: center; text-align: center;
margin-left: -20px; margin-left: -20px;
} }
div.thread:hover { div.thread:hover {