github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-05 03:00:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add sprite for compact.css to the make process.

Browse Source
This commit is contained in:
Max Goodman
2011-07-07 11:44:51 -07:00
parent ecb4a3d456
commit ef5e77a289
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
r2/Makefile
View File

@@ -28,7 +28,8 @@ localized_js_outputs = $(localized_js_targets:.js=.*.js)
# CSS targets
main_css = reddit.css
css_targets = reddit-ie6-hax.css reddit-ie7-hax.css mobile.css spreadshirt.css compact.css
compact_css = compact.css
css_targets = reddit-ie6-hax.css reddit-ie7-hax.css mobile.css spreadshirt.css
package = r2
static_dir = $(package)/public/static
@@ -50,8 +51,9 @@ JSTARGETS = $(foreach js, $(js_targets) $(localized_js_targets), $(static_di
JSOUTPUTS = $(foreach js, $(js_targets) $(localized_js_outputs), $(static_dir)/$(js))
JSSOURCES = $(foreach js, $(js_sources), $(static_dir)/js/$(js))
CSSTARGETS = $(foreach css, $(css_targets), $(static_dir)/$(css))
SPRITES = $(static_dir)/sprite.png
SPRITES = $(static_dir)/sprite-main.png $(static_dir)/sprite-compact.png
MAINCSS = $(foreach css, $(main_css), $(static_dir)/$(css))
COMPACTCSS = $(foreach css, $(compact_css), $(static_dir)/$(css))
RTLCSS = $(CSSTARGETS:.css=-rtl.css) $(MAINCSS:.css=-rtl.css)
NAMES = $(static_dir)/names.json
@@ -78,7 +80,7 @@ all: pyx static names $(INIS)
.PHONY: pyx js css rtl static names clean clean_static all
$(NAMES): $(JSTARGETS) $(CSSTARGETS) $(SPRITES) $(MAINCSS)
$(NAMES): $(JSTARGETS) $(CSSTARGETS) $(MAINCSS) $(COMPACTCSS)
$(UPDATE_NAMES) $(NAMES) $(NAMED)
$(JSTARGETS): $(JSSOURCES)
@@ -87,8 +89,11 @@ $(JSTARGETS): $(JSSOURCES)
$(CSSTARGETS): $(static_dir)/%.css : $(static_dir)/css/%.css
$(CAT) $< | $(CSS_COMPRESS) > $@
$(MAINCSS): $(static_dir)/%.css : $(static_dir)/css/%.css
$(PYTHON) r2/lib/contrib/nymph.py $< | $(CSS_COMPRESS) > $@
$(MAINCSS): $(static_dir)/%.css : $(static_dir)/css/%.css
$(PYTHON) r2/lib/contrib/nymph.py sprite-main.png $< | $(CSS_COMPRESS) > $@
$(COMPACTCSS): $(static_dir)/%.css : $(static_dir)/css/%.css
$(PYTHON) r2/lib/contrib/nymph.py sprite-compact.png $< | $(CSS_COMPRESS) > $@
$(RTLCSS): %-rtl.css : %.css
$(SED) -e "s/left/>####</g" \
@@ -109,7 +114,7 @@ static: js css rtl
js: pyx $(JSTARGETS)
css: $(CSSTARGETS) $(MAINCSS)
css: $(CSSTARGETS) $(MAINCSS) $(COMPACTCSS)
rtl: $(RTLCSS)
@@ -119,7 +124,7 @@ clean: clean_static
rm -f $(PYXSO_FILES) $(INIS)
clean_static: clean_names
rm -f $(JSOUTPUTS) $(CSSTARGETS) $(SPRITES) $(MAINCSS)
rm -f $(JSOUTPUTS) $(CSSTARGETS) $(MAINCSS) $(SPRITES) $(COMPACTCSS)
clean_names:
rm -f $(NAMES) $(NAMELINKS) $(static_dir)/*.md5

2
r2/r2/lib/contrib/nymph.py
View File

@@ -102,4 +102,4 @@ def process_css(incss, out_file = 'sprite.png', css_path = "/static/"):
if __name__ == '__main__':
import sys
print process_css(sys.argv[-1])
print process_css(sys.argv[-1], sys.argv[-2])