Skip to content

Commit

Permalink
Teach the makefile how to hash static assets.
Browse files Browse the repository at this point in the history
To come: teach the web app how to find them.
  • Loading branch information
erikrose committed Oct 5, 2015
1 parent 6d18dbf commit 19ca79c
Show file tree
Hide file tree
Showing 90 changed files with 290 additions and 205 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
*.pyc
*.o
*.so
/dxr/static/js/templates.js
/dxr/static
/dxr/static_manifest
/dxr/static_unhashed/js/templates.js
dxr-logs-*
dxr-temp-*
**/tests/*/code/code
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ include README.rst
recursive-include docs *

include dxr/format
include dxr/static_manifest
recursive-include dxr/plugins *.py *.so
recursive-include dxr/static *
recursive-include dxr/templates *
Expand Down
4 changes: 2 additions & 2 deletions dxr/cli/deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ def build(self, rev):
python = join(new_build_path, VENV_NAME, 'bin', 'python')
run('{python} ./peep.py install -r requirements.txt',
python=python)
# Compile nunjucks templates:
run('make templates &> /dev/null')
# Compile nunjucks templates and cachebust static assets:
run('make static &> /dev/null')
# Quiet the complaint about there being no matches for *.so:
run('{python} setup.py install 2>/dev/null', python=python)

Expand Down
184 changes: 0 additions & 184 deletions dxr/static/css/icons.css

This file was deleted.

File renamed without changes.
12 changes: 6 additions & 6 deletions dxr/static/css/dxr.css → dxr/static_unhashed/css/dxr.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@font-face {
font-family: 'icons';
src: url('/static/fonts/icons.eot?#iefix2013') format('embedded-opentype'),
url('/static/fonts/icons.woff?2013') format('woff'),
url('/static/fonts/icons.ttf?2013') format('truetype');
src: url('/static/fonts/icons.eot') format('embedded-opentype'),
url('/static/fonts/icons.woff') format('woff'),
url('/static/fonts/icons.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
Expand Down Expand Up @@ -333,7 +333,7 @@ mark {
}
.arrow_icon {
display: inline-block;
background: transparent url(/static/images/arrow_collapsed.png) 0 0 no-repeat;
background: transparent url('/static/images/arrow_collapsed.png') 0 0 no-repeat;
width: 25px;
height: 25px;
vertical-align: top;
Expand Down Expand Up @@ -570,13 +570,13 @@ mark {
border-width: 0 9px 9px;
}
.bubble.info {
background: white url(/static/images/info.gif) 12px 0 / 3ex no-repeat;
background: white url('/static/images/info.gif') 12px 0 / 3ex no-repeat;
}
.bubble.warning {
background: white url('/static/images/warning.gif') 10px -2px / 3.5ex no-repeat;
}
.bubble.error {
background: white url(/static/images/error.gif) 12px 0 / 3ex no-repeat;
background: white url('/static/images/error.gif') 12px 0 / 3ex no-repeat;
}
.zero-size-container {
position: relative;
Expand Down
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 19ca79c

Please sign in to comment.