diff options
| author | Francesco Pontillo <francescopontillo@gmail.com> | 2013-05-16 09:59:08 +0200 |
|---|---|---|
| committer | Francesco Pontillo <francescopontillo@gmail.com> | 2013-05-16 09:59:08 +0200 |
| commit | 2ec92281b988c129d4eb2ef5efffef57c011f9cc (patch) | |
| tree | 91dfccb9c590480b37f254c99c5cdea366fea283 /api | |
| parent | 266c8ea28da92dc14fe6cb4207c149f3153141a5 (diff) | |
| parent | 5a8fb4bf1b64d06e5ca148eb4619a1c692d2dded (diff) | |
Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages
Conflicts:
amelia/index.html
cerulean/index.html
cosmo/index.html
cyborg/index.html
default/index.html
index.html
journal/index.html
readable/index.html
simplex/index.html
slate/index.html
spacelab/index.html
spruce/index.html
superhero/index.html
united/index.html
Diffstat (limited to 'api')
| -rw-r--r-- | api/themes.json | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/api/themes.json b/api/themes.json index 1023e179..602f43e0 100644 --- a/api/themes.json +++ b/api/themes.json @@ -56,6 +56,19 @@ }, { + "name": "Flatly", + "description": "Flat and clean.", + "thumbnail": "http://bootswatch.com/flatly/thumbnail.png", + "preview": "http://bootswatch.com/flatly/", + "css": "http://bootswatch.com/flatly/bootstrap.css", + "css-min": "http://bootswatch.com/flatly/bootstrap.min.css", + "cssMin": "http://bootswatch.com/flatly/bootstrap.min.css", + "less": "http://bootswatch.com/flatly/bootswatch.less", + "less-variables": "http://bootswatch.com/flatly/variables.less", + "lessVariables": "http://bootswatch.com/flatly/variables.less" + }, + + { "name": "Journal", "description": "Crisp like a new sheet of paper.", "thumbnail": "http://bootswatch.com/journal/thumbnail.png", |