disinclined.org
/
git
/
dylansserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
1fed68c
)
Merge branch 'mvc' into live
author
Dylan Lloyd
<dylan@dylansserver.com>
Wed, 13 Feb 2013 08:54:31 +0000
(
03:54
-0500)
committer
Dylan Lloyd
<dylan@dylansserver.com>
Wed, 13 Feb 2013 08:54:31 +0000
(
03:54
-0500)
Conflicts:
includes/style.css
includes/style.css
patch
|
blob
|
history
diff --git
a/includes/style.css
b/includes/style.css
index
a76bbe1
..
c8d2309
100644
(file)
--- a/
includes/style.css
+++ b/
includes/style.css
@@
-187,7
+187,7
@@
font-family:MuseoSlab500;
font-size:80%;
}
-#drawcss_title,#drawcss_entry,#youtube_backup_title,#i_like_pandora_title,#fvlc_title,#irssi-notify_title {
+#drawcss_title,#drawcss_entry,#youtube_backup_title,#i_like_pandora_title,#fvlc_title,#irssi-notify_title
, #powermate_title
{
font-size:1.6em;
}