refactored bower_components

geocam · Feb 23, 2015 · 1280409 · 1280409
1 parent 4ce66e6
commit 1280409
Show file tree

Hide file tree

Showing 23 changed files with 4 additions and 4 deletions.
diff --git a/geocamUtil/defaultSettings.py b/geocamUtil/defaultSettings.py
@@ -135,8 +135,8 @@
 PIPELINE_YUGLIFY_JS_ARGUMENTS = 'mangle:false --terminal'
 # PIPELINE_DISABLE_WRAPPER = True
 
-GEOCAM_UTIL_PREPCSS_DIRS = ['external/bower_components/gumby']
-GEOCAM_UTIL_COMPRESSCSS_FILES = ['external/bower_components/gumby/css/gumby.css']
+GEOCAM_UTIL_PREPCSS_DIRS = ['gumby']
+GEOCAM_UTIL_COMPRESSCSS_FILES = ['gumby/css/gumby.css']
 
 # include this in your siteSettings.py BOWER_INSTALLED_APPS
 GEOCAM_UTIL_BOWER_INSTALLED_APPS = ('underscore',

diff --git a/...table/media/images/back_enabled_hover.png → ...table/media/images/back_enabled_hover.png b/...table/media/images/back_enabled_hover.png → ...table/media/images/back_enabled_hover.png
diff --git a/...le/media/images/forward_enabled_hover.png → ...le/media/images/forward_enabled_hover.png b/...le/media/images/forward_enabled_hover.png → ...le/media/images/forward_enabled_hover.png
diff --git a/...les-editable/media/jAlert/images/help.gif → ...les-editable/media/jAlert/images/help.gif b/...les-editable/media/jAlert/images/help.gif → ...les-editable/media/jAlert/images/help.gif
diff --git a/...external/bower_components/gumby/config.rb → geocamUtil/static/gumby/config.rb b/...external/bower_components/gumby/config.rb → geocamUtil/static/gumby/config.rb
diff --git a/...ternal/bower_components/gumby/img/irg.png → geocamUtil/static/gumby/img/irg.png b/...ternal/bower_components/gumby/img/irg.png → geocamUtil/static/gumby/img/irg.png
diff --git a/...l/bower_components/gumby/img/meatball.png → geocamUtil/static/gumby/img/meatball.png b/...l/bower_components/gumby/img/meatball.png → geocamUtil/static/gumby/img/meatball.png
diff --git a/...l/bower_components/gumby/img/sort_asc.png → geocamUtil/static/gumby/img/sort_asc.png b/...l/bower_components/gumby/img/sort_asc.png → geocamUtil/static/gumby/img/sort_asc.png
diff --git a/...omponents/gumby/img/sort_asc_disabled.png → ...il/static/gumby/img/sort_asc_disabled.png b/...omponents/gumby/img/sort_asc_disabled.png → ...il/static/gumby/img/sort_asc_disabled.png
diff --git a/.../bower_components/gumby/img/sort_both.png → geocamUtil/static/gumby/img/sort_both.png b/.../bower_components/gumby/img/sort_both.png → geocamUtil/static/gumby/img/sort_both.png
diff --git a/.../bower_components/gumby/img/sort_desc.png → geocamUtil/static/gumby/img/sort_desc.png b/.../bower_components/gumby/img/sort_desc.png → geocamUtil/static/gumby/img/sort_desc.png
diff --git a/...mponents/gumby/img/sort_desc_disabled.png → ...l/static/gumby/img/sort_desc_disabled.png b/...mponents/gumby/img/sort_desc_disabled.png → ...l/static/gumby/img/sort_desc_disabled.png
diff --git a/...al/bower_components/gumby/img/sorting.psd → geocamUtil/static/gumby/img/sorting.psd b/...al/bower_components/gumby/img/sorting.psd → geocamUtil/static/gumby/img/sorting.psd
diff --git a/.../bower_components/gumby/sass/_button.scss → geocamUtil/static/gumby/sass/_button.scss b/.../bower_components/gumby/sass/_button.scss → geocamUtil/static/gumby/sass/_button.scss
diff --git a/.../bower_components/gumby/sass/_custom.scss → geocamUtil/static/gumby/sass/_custom.scss b/.../bower_components/gumby/sass/_custom.scss → geocamUtil/static/gumby/sass/_custom.scss
@@ -15,14 +15,14 @@ body{
 	background-color: $primary;
 }
 
-$irg_logo_img: image-url('/static/external/bower_components/gumby/img/irg.png', false, true);
+$irg_logo_img: image-url('/static/gumby/img/irg.png', false, true);
 .irg_logo {
 	background: $irg_logo_img $color no-repeat;
 	width:65px;
     height:$logo-height;
 }
 
-$nasa_logo_img: image-url('/static/external/bower_components/gumby/img/meatball.png', false, true);
+$nasa_logo_img: image-url('/static/gumby/img/meatball.png', false, true);
 .nasa_logo {
 	background: $nasa_logo_img $footer-bg no-repeat; 
 	height:$logo-height;

diff --git a/...l/bower_components/gumby/sass/_fonts.scss → geocamUtil/static/gumby/sass/_fonts.scss b/...l/bower_components/gumby/sass/_fonts.scss → geocamUtil/static/gumby/sass/_fonts.scss
diff --git a/.../bower_components/gumby/sass/_footer.scss → geocamUtil/static/gumby/sass/_footer.scss b/.../bower_components/gumby/sass/_footer.scss → geocamUtil/static/gumby/sass/_footer.scss
diff --git a/...al/bower_components/gumby/sass/_form.scss → geocamUtil/static/gumby/sass/_form.scss b/...al/bower_components/gumby/sass/_form.scss → geocamUtil/static/gumby/sass/_form.scss
diff --git a/...nal/bower_components/gumby/sass/_nav.scss → geocamUtil/static/gumby/sass/_nav.scss b/...nal/bower_components/gumby/sass/_nav.scss → geocamUtil/static/gumby/sass/_nav.scss
diff --git a/...l/bower_components/gumby/sass/_table.scss → geocamUtil/static/gumby/sass/_table.scss b/...l/bower_components/gumby/sass/_table.scss → geocamUtil/static/gumby/sass/_table.scss
diff --git a/...l/bower_components/gumby/sass/_theme.scss → geocamUtil/static/gumby/sass/_theme.scss b/...l/bower_components/gumby/sass/_theme.scss → geocamUtil/static/gumby/sass/_theme.scss
diff --git a/..._components/gumby/sass/var/_settings.scss → ...Util/static/gumby/sass/var/_settings.scss b/..._components/gumby/sass/var/_settings.scss → ...Util/static/gumby/sass/var/_settings.scss
diff --git a/...r_components/jeditable/tests/data/cow.jpg → ...mUtil/static/jeditable/tests/data/cow.jpg b/...r_components/jeditable/tests/data/cow.jpg → ...mUtil/static/jeditable/tests/data/cow.jpg