Merge branch 'feature/remove-lightbox' into develop

crowdfavorite · Jun 19, 2012 · 604465c · 604465c
2 parents c3be5c3 + 488074a
commit 604465c
Show file tree

Hide file tree

Showing 35 changed files with 2 additions and 1,170 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,5 +1,7 @@
 # Carrington Core Changelog
 
+- Remove Thickbox code (if your theme needs this, please include it in the theme).
+- Remove color picker code (if your theme needs this, please include it in the theme).
 - Remove archive/category posts per page default override (can be re-enabled by theme).
 - Bring in expected globals in templates. Can be disabled via filter (`cfct_template_file_globals`) if desired.
 

diff --git a/css/colorpicker.css b/css/colorpicker.css
diff --git a/images/colorpicker/blank.gif b/images/colorpicker/blank.gif
diff --git a/images/colorpicker/colorpicker_background.png b/images/colorpicker/colorpicker_background.png
diff --git a/images/colorpicker/colorpicker_hex.png b/images/colorpicker/colorpicker_hex.png
diff --git a/images/colorpicker/colorpicker_hsb_b.png b/images/colorpicker/colorpicker_hsb_b.png
diff --git a/images/colorpicker/colorpicker_hsb_h.png b/images/colorpicker/colorpicker_hsb_h.png
diff --git a/images/colorpicker/colorpicker_hsb_s.png b/images/colorpicker/colorpicker_hsb_s.png
diff --git a/images/colorpicker/colorpicker_indic.gif b/images/colorpicker/colorpicker_indic.gif
diff --git a/images/colorpicker/colorpicker_overlay.png b/images/colorpicker/colorpicker_overlay.png
diff --git a/images/colorpicker/colorpicker_rgb_b.png b/images/colorpicker/colorpicker_rgb_b.png
diff --git a/images/colorpicker/colorpicker_rgb_g.png b/images/colorpicker/colorpicker_rgb_g.png
diff --git a/images/colorpicker/colorpicker_rgb_r.png b/images/colorpicker/colorpicker_rgb_r.png
diff --git a/images/colorpicker/colorpicker_select.gif b/images/colorpicker/colorpicker_select.gif
diff --git a/images/colorpicker/colorpicker_submit.png b/images/colorpicker/colorpicker_submit.png
diff --git a/images/colorpicker/custom_background.png b/images/colorpicker/custom_background.png
diff --git a/images/colorpicker/custom_hex.png b/images/colorpicker/custom_hex.png
diff --git a/images/colorpicker/custom_hsb_b.png b/images/colorpicker/custom_hsb_b.png
diff --git a/images/colorpicker/custom_hsb_h.png b/images/colorpicker/custom_hsb_h.png
diff --git a/images/colorpicker/custom_hsb_s.png b/images/colorpicker/custom_hsb_s.png
diff --git a/images/colorpicker/custom_indic.gif b/images/colorpicker/custom_indic.gif
diff --git a/images/colorpicker/custom_rgb_b.png b/images/colorpicker/custom_rgb_b.png
diff --git a/images/colorpicker/custom_rgb_g.png b/images/colorpicker/custom_rgb_g.png
diff --git a/images/colorpicker/custom_rgb_r.png b/images/colorpicker/custom_rgb_r.png
diff --git a/images/colorpicker/custom_submit.png b/images/colorpicker/custom_submit.png
diff --git a/images/colorpicker/select.png b/images/colorpicker/select.png
diff --git a/images/colorpicker/select2.png b/images/colorpicker/select2.png
diff --git a/images/colorpicker/slider.png b/images/colorpicker/slider.png