diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-09-24 11:29:31 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-09-24 11:29:31 +0100 |
commit | d8deb8418b4cd26c68eb1301959e156c19b111e2 (patch) | |
tree | 99c346db95d17be9c5105ce47d5f3ac8e943e952 /doc/ADMIN.md | |
parent | 8459314b691f5b02277035219cd58f510d100a77 (diff) | |
parent | 75542416a1cc36b353ade557b1bc4f729b02423a (diff) |
Merge branch 'release/0.14'0.14
Conflicts:
locale/bg/app.po
locale/fr/app.po
locale/fr_CA/app.po
locale/he_IL/app.po
locale/hr/app.po
locale/it/app.po
locale/nb_NO/app.po
locale/pl/app.po
locale/sv/app.po
locale/vi/app.po
Diffstat (limited to 'doc/ADMIN.md')
-rw-r--r-- | doc/ADMIN.md | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 07fe9398d..6248e6cfc 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -11,11 +11,9 @@ If you want to work on the CSS, you'll want to use $ gem install compass $ compass compile --config .compass/config.rb -The javascript is included in a funky way -[for reasons explained in this commit](https://github.com/sebbacon/adminbootstraptheme/commit/45a73d53fc9e8f0b728933ff58764bd8d0612dab). -To change it, edit the coffeescript at -`lib/view/general/admin.coffee`, and then do something like: +To change the JavaScript, edit `public/admin/javascripts/admin.coffee` +and then run: - $ coffee -o /tmp/ -c app/views/admin_general/admin.coffee - $ mv /tmp/admin.js app/views/admin_general/admin_js.erb + $ coffee -c public/admin/javascripts/admin.coffee +That will update `public/admin/javascripts/admin.js`.
\ No newline at end of file |