developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

devin branch merge plus minor fixes

This commit is contained in:
Harry Bomrah 2013-04-16 17:02:41 +08:00 committed by saurabhbhatia
parent b70310c6fe
commit 78d6e33865
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/built_in_modules/personal_journal/app/assets/stylesheets/personal_journal/desktop/journal_pages.css vendored
View File

@ -1,3 +1,3 @@
/* css test*/
#harry { font-size: 10px;}
#harry { font-size: 10px; }

2
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb vendored
View File

@ -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">