diff options
| author | Michael Williamson <mike@zwobble.org> | 2014-03-23 11:25:05 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2014-03-23 11:25:05 +0000 |
| commit | d0dc2dd324ff2ff5c31d676fe733eaf176af7fb7 (patch) | |
| tree | 592c4367988ea02491f469f5a099cef157d67b53 | |
| parent | 70c4e089e0f9eb3e8112813d5992fffbcd55860b (diff) | |
Remove reliance on bootstrap
| -rw-r--r-- | browser-demo/index.html | 1 | ||||
| -rw-r--r-- | makefile | 8 | ||||
| -rw-r--r-- | static/style.css | 36 | ||||
| -rw-r--r-- | templates/base.html | 1 |
4 files changed, 36 insertions, 10 deletions
diff --git a/browser-demo/index.html b/browser-demo/index.html index 552da7b..2ced877 100644 --- a/browser-demo/index.html +++ b/browser-demo/index.html @@ -2,7 +2,6 @@ <html> <head> <title>Mammoth</title> - <link rel="stylesheet" type="text/css" href="../static/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../static/style.css"> </head> <body> @@ -3,13 +3,7 @@ test: npm test -setup: static/bootstrap static/jszip mammoth.browser.min.js - -static/bootstrap: - mkdir -p _build/bootstrap - curl -L https://github.com/twitter/bootstrap/archive/v2.3.1.tar.gz | tar xz --directory _build/bootstrap --strip-components 1 - cd _build/bootstrap; npm install; make bootstrap - cp -rT _build/bootstrap/bootstrap static/bootstrap +setup: static/jszip mammoth.browser.min.js static/jszip: mkdir -p _build/jszip diff --git a/static/style.css b/static/style.css index e3bb6f8..31dd97f 100644 --- a/static/style.css +++ b/static/style.css @@ -1,11 +1,24 @@ html { overflow-y: scroll; + font-family: helvetica, arial, sans-serif; +} + +body { + margin: 0; + padding: 0; +} + +.container { + overflow: auto; + max-width: 940px; + margin: 0 auto; } .banner { + overflow: auto; + margin-bottom: 20px; background-color: #555; color: #fff; - margin-bottom: 20px; } .banner a { @@ -14,6 +27,27 @@ html { .banner h1 { font-size: 20px; + line-height: 2; + margin: 0.5em 0; +} + +.span8, .span4 { + float: left; +} + +.span8 { + width: 620px; +} + +.span4 { + margin: 0 0 0 20px; +} + +.well { + background-color: #f2f2f2; + border: 1px solid #ccc; + padding: 1em; + min-height: 200px; } .messages .warning { diff --git a/templates/base.html b/templates/base.html index 16f432d..ffa1b8e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,7 +2,6 @@ <html> <head> <title>Mammoth</title> - <link rel="stylesheet" type="text/css" href="/static/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="/static/style.css"> </head> <body> |