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

This commit is contained in:
Michael DeHaan 2014-01-08 18:00:03 -05:00
commit 919eb1fb98
5 changed files with 4645 additions and 9 deletions

1
docsite/.gitignore vendored
View file

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

View file

@ -4,13 +4,13 @@ FORMATTER=../hacking/module_formatter.py
all: clean docs
docs: clean modules
docs: clean modules staticmin
./build-site.py
viewdocs: clean
viewdocs: clean staticmin
./build-site.py view
htmldocs:
htmldocs: staticmin
./build-site.py rst
clean:
@ -18,6 +18,8 @@ clean:
-rm -f .buildinfo
-rm -f *.inv
-rm -rf *.doctrees
@echo "Cleaning up minified css files"
find . -type f -name "*.min.css" -delete
@echo "Cleaning up byte compiled python stuff"
find . -regex ".*\.py[co]$$" -delete
@echo "Cleaning up editor backup files"
@ -29,4 +31,5 @@ clean:
modules: $(FORMATTER) ../hacking/templates/rst.j2
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

View file

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

File diff suppressed because one or more lines are too long

View file

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