From bbd7bec3d125472b885ae2791016dd998874ba4b Mon Sep 17 00:00:00 2001 From: Charles Connell Date: Wed, 23 Apr 2014 14:02:00 -0400 Subject: [PATCH] Find fonts correctly, don't load jquery twice --- .../css/font-awesome.css | 7 ++++-- .../css/font-awesome.min.css | 0 .../fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin karmaworld/assets/css/fontface/fontface.css | 20 +++++++++--------- karmaworld/settings/common.py | 6 ++++++ 9 files changed, 21 insertions(+), 12 deletions(-) rename karmaworld/assets/css/{font-awesome-4.0.3 => font-awesome}/css/font-awesome.css (97%) rename karmaworld/assets/css/{font-awesome-4.0.3 => font-awesome}/css/font-awesome.min.css (100%) rename karmaworld/assets/css/{font-awesome-4.0.3 => font-awesome}/fonts/FontAwesome.otf (100%) rename karmaworld/assets/css/{font-awesome-4.0.3 => font-awesome}/fonts/fontawesome-webfont.eot (100%) rename karmaworld/assets/css/{font-awesome-4.0.3 => font-awesome}/fonts/fontawesome-webfont.svg (100%) rename karmaworld/assets/css/{font-awesome-4.0.3 => font-awesome}/fonts/fontawesome-webfont.ttf (100%) rename karmaworld/assets/css/{font-awesome-4.0.3 => font-awesome}/fonts/fontawesome-webfont.woff (100%) diff --git a/karmaworld/assets/css/font-awesome-4.0.3/css/font-awesome.css b/karmaworld/assets/css/font-awesome/css/font-awesome.css similarity index 97% rename from karmaworld/assets/css/font-awesome-4.0.3/css/font-awesome.css rename to karmaworld/assets/css/font-awesome/css/font-awesome.css index 048cff9..92a516c 100644 --- a/karmaworld/assets/css/font-awesome-4.0.3/css/font-awesome.css +++ b/karmaworld/assets/css/font-awesome/css/font-awesome.css @@ -6,8 +6,11 @@ * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../fonts/fontawesome-webfont.eot?v=4.0.3'); - src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg'); + src: url('/css/font-awesome/fonts/fontawesome-webfont.eot?v=4.0.3'); + src: url('/css/font-awesome/fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), + url('/css/font-awesome/fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'), + url('/css/font-awesome/fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), + url('/css/font-awesome/fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/karmaworld/assets/css/font-awesome-4.0.3/css/font-awesome.min.css b/karmaworld/assets/css/font-awesome/css/font-awesome.min.css similarity index 100% rename from karmaworld/assets/css/font-awesome-4.0.3/css/font-awesome.min.css rename to karmaworld/assets/css/font-awesome/css/font-awesome.min.css diff --git a/karmaworld/assets/css/font-awesome-4.0.3/fonts/FontAwesome.otf b/karmaworld/assets/css/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from karmaworld/assets/css/font-awesome-4.0.3/fonts/FontAwesome.otf rename to karmaworld/assets/css/font-awesome/fonts/FontAwesome.otf diff --git a/karmaworld/assets/css/font-awesome-4.0.3/fonts/fontawesome-webfont.eot b/karmaworld/assets/css/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from karmaworld/assets/css/font-awesome-4.0.3/fonts/fontawesome-webfont.eot rename to karmaworld/assets/css/font-awesome/fonts/fontawesome-webfont.eot diff --git a/karmaworld/assets/css/font-awesome-4.0.3/fonts/fontawesome-webfont.svg b/karmaworld/assets/css/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from karmaworld/assets/css/font-awesome-4.0.3/fonts/fontawesome-webfont.svg rename to karmaworld/assets/css/font-awesome/fonts/fontawesome-webfont.svg diff --git a/karmaworld/assets/css/font-awesome-4.0.3/fonts/fontawesome-webfont.ttf b/karmaworld/assets/css/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from karmaworld/assets/css/font-awesome-4.0.3/fonts/fontawesome-webfont.ttf rename to karmaworld/assets/css/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/karmaworld/assets/css/font-awesome-4.0.3/fonts/fontawesome-webfont.woff b/karmaworld/assets/css/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from karmaworld/assets/css/font-awesome-4.0.3/fonts/fontawesome-webfont.woff rename to karmaworld/assets/css/font-awesome/fonts/fontawesome-webfont.woff diff --git a/karmaworld/assets/css/fontface/fontface.css b/karmaworld/assets/css/fontface/fontface.css index ab56ad2..ed1d1ae 100644 --- a/karmaworld/assets/css/fontface/fontface.css +++ b/karmaworld/assets/css/fontface/fontface.css @@ -2,22 +2,22 @@ @font-face { font-family: 'museo700'; - src: url('museo700-regular-webfont.eot'); - src: url('museo700-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('museo700-regular-webfont.woff') format('woff'), - url('museo700-regular-webfont.ttf') format('truetype'), - url('museo700-regular-webfont.svg#museo700') format('svg'); + src: url('/css/fontface/museo700-regular-webfont.eot'); + src: url('/css/fontface/museo700-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('/css/fontface/museo700-regular-webfont.woff') format('woff'), + url('/css/fontface/museo700-regular-webfont.ttf') format('truetype'), + url('/css/fontface/museo700-regular-webfont.svg#museo700') format('svg'); font-weight: normal; font-style: normal; } @font-face { font-family: 'museo300'; - src: url('museo300-regular-webfont.eot'); - src: url('museo300-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('museo300-regular-webfont.woff') format('woff'), - url('museo300-regular-webfont.ttf') format('truetype'), - url('museo300-regular-webfont.svg#museo300') format('svg'); + src: url('/css/fontface/museo300-regular-webfont.eot'); + src: url('/css/fontface/museo300-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('/css/fontface/museo300-regular-webfont.woff') format('woff'), + url('/css/fontface/museo300-regular-webfont.ttf') format('truetype'), + url('/css/fontface/museo300-regular-webfont.svg#museo300') format('svg'); font-weight: normal; font-style: normal; } diff --git a/karmaworld/settings/common.py b/karmaworld/settings/common.py index 99d46e5..0ab4d2f 100644 --- a/karmaworld/settings/common.py +++ b/karmaworld/settings/common.py @@ -392,9 +392,15 @@ HONEYPOT_ERROR = "You did not follow directions." ########## END HONEYPOT CONFIGURATION +########## SOUTH CONFIGURATION SOUTH_MIGRATION_MODULES = { 'taggit': 'taggit.south_migrations', } +########## END SOUTH CONFIGURATION + +########## AJAX SELECTS CONFIGURATION +AJAX_SELECT_BOOTSTRAP = False +########## END AJAX SELECTS CONFIGURATION ########## TESTING CONFIGURATION -- 2.25.1