natto1784/aslichan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/kaernyk/vichan

Browse Source 
Conflicts:
	stylesheets/style.css
This commit is contained in:
kaernyk
2014-09-28 04:30:22 -04:00
parent 78cf4a8b56 197e4d4bfc
commit f6e827ca75
8 changed files with 215 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
stylesheets/style.css
View File

@@ -1,7 +1,11 @@
body {
background: #EEF2FF url('img/fade-blue.png') repeat-x 50% 0%;
color: black;
<<<<<<< HEAD
font-family: arial,helvetica,sans-serif;
=======
font-family: arial, helvetica, sans-serif;
>>>>>>> 197e4d4bfcb5a312a699e1f6d012da03ee36fbe2
font-size: 10pt;
margin: 0 4px;
padding-left: 4px;
@@ -100,7 +104,11 @@ input[type="text"],input[type="password"],textarea {
max-width: 75%;
}
<<<<<<< HEAD
#quick-reply input[type="text"],input[type="password"],#quick-reply textarea {
=======
#quick-reply input[type="text"], input[type="password"], #quick-reply textarea {
>>>>>>> 197e4d4bfcb5a312a699e1f6d012da03ee36fbe2
max-width: 100%;
}
@@ -917,4 +925,4 @@ code>pre>span.pln {
div.post div.body {
clear: none;
}
}
}