devin branch merge plus minor fixes
This commit is contained in:
parent
b70310c6fe
commit
78d6e33865
|
@ -1,3 +1,3 @@
|
|||
/* css test*/
|
||||
|
||||
#harry { font-size: 10px;}
|
||||
#harry { font-size: 10px; }
|
|
@ -1,5 +1,5 @@
|
|||
<%= javascript_include_tag "personal_journal" %>
|
||||
<%= stylesheet_link_tag "personal_journal" %>
|
||||
<%= stylesheet_link_tag "/assets/personal_journal/desktop/journal_pages" %>
|
||||
<div id="journal_p">
|
||||
<div id="content">
|
||||
<div id="header" class="hh2">
|
||||
|
|
Loading…
Reference in New Issue