diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-09-24 09:23:44 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-09-24 09:23:44 +0100 |
| commit | 7d9b66d1ff31afa8d73ea1a81f4e612e41f89cb0 (patch) | |
| tree | 5206d9fbaf8d6af58bdaa35cefdfeb34a88c84ff /doc/ADMIN.md | |
| parent | 40a28fa2fe21d752a15c11938791d620dd31d17f (diff) | |
| parent | 8e7432be764254e6a50e6a06e77bb93bb5bba9fe (diff) | |
Merge branch 'release/0.14' into wdtk
Conflicts:
app/views/request/show.html.erb
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 |