diff options
| author | Frédéric Sureau <frederic.sureau@gmail.com> | 2012-02-15 16:09:23 +0100 |
|---|---|---|
| committer | Frédéric Sureau <frederic.sureau@gmail.com> | 2012-02-15 16:09:23 +0100 |
| commit | 71cb07a92b65579f45152ca09c0597e90fd7b484 (patch) | |
| tree | 7bf4bb1cd190bc08476f008f6f00d4d3d1aa52f0 /budget/static/css/main.css | |
| parent | caf9b6fcc24d97586a50b21022fbf673435fe939 (diff) | |
| parent | c981002796584956e853062d23a208440837ae5a (diff) | |
| download | ihatemoney-mirror-71cb07a92b65579f45152ca09c0597e90fd7b484.zip ihatemoney-mirror-71cb07a92b65579f45152ca09c0597e90fd7b484.tar.gz ihatemoney-mirror-71cb07a92b65579f45152ca09c0597e90fd7b484.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'budget/static/css/main.css')
| -rw-r--r-- | budget/static/css/main.css | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/budget/static/css/main.css b/budget/static/css/main.css index ebfa67c..3d2aae8 100644 --- a/budget/static/css/main.css +++ b/budget/static/css/main.css @@ -1,6 +1,7 @@ @import "bootstrap.min.css"; -@import url(http://fonts.googleapis.com/css?family=Lobster|Comfortaa); +@import "../fonts/fontfaces.css"; @import "jquery-ui.css"; +@import "jquery.qtip.min.css"; html, body{ margin-top: 25px; |