Merge branch 'docsite-css' of git://github.com/sivel/ansible into docsite_css

pull/5523/merge
Michael DeHaan 11 years ago
commit 919eb1fb98

@ -12,3 +12,4 @@ ansible*.xml
objects.inv objects.inv
.doctrees .doctrees
rst/modules/*.rst rst/modules/*.rst
*.min.css

@ -4,13 +4,13 @@ FORMATTER=../hacking/module_formatter.py
all: clean docs all: clean docs
docs: clean modules docs: clean modules staticmin
./build-site.py ./build-site.py
viewdocs: clean viewdocs: clean staticmin
./build-site.py view ./build-site.py view
htmldocs: htmldocs: staticmin
./build-site.py rst ./build-site.py rst
clean: clean:
@ -18,6 +18,8 @@ clean:
-rm -f .buildinfo -rm -f .buildinfo
-rm -f *.inv -rm -f *.inv
-rm -rf *.doctrees -rm -rf *.doctrees
@echo "Cleaning up minified css files"
find . -type f -name "*.min.css" -delete
@echo "Cleaning up byte compiled python stuff" @echo "Cleaning up byte compiled python stuff"
find . -regex ".*\.py[co]$$" -delete find . -regex ".*\.py[co]$$" -delete
@echo "Cleaning up editor backup files" @echo "Cleaning up editor backup files"
@ -29,4 +31,5 @@ clean:
modules: $(FORMATTER) ../hacking/templates/rst.j2 modules: $(FORMATTER) ../hacking/templates/rst.j2
PYTHONPATH=../lib $(FORMATTER) -t rst --template-dir=../hacking/templates --module-dir=../library -o rst/ PYTHONPATH=../lib $(FORMATTER) -t rst --template-dir=../hacking/templates --module-dir=../library -o rst/
staticmin:
cat _themes/srtd/static/css/theme.css | sed -e 's/^[ \t]*//g; s/[ \t]*$$//g; s/\([:{;,]\) /\1/g; s/ {/{/g; s/\/\*.*\*\///g; /^$$/d' | sed -e :a -e '$$!N; s/\n\(.\)/\1/; ta' > _themes/srtd/static/css/theme.min.css

@ -118,9 +118,6 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
#search-box-id { #search-box-id {
padding-right: 25px; padding-right: 25px;
} }
.wy-nav-content {
max-width: 1024px;
}
</style> </style>
</head> </head>

File diff suppressed because one or more lines are too long

@ -1,6 +1,6 @@
[theme] [theme]
inherit = basic inherit = basic
stylesheet = css/theme.css stylesheet = css/theme.min.css
[options] [options]
typekit_id = hiw1hhg typekit_id = hiw1hhg

Loading…
Cancel
Save