Permalink
Browse files

Upgrade jQueryUI, merge all jQueryUI bundles.

* Fix KBox z-index conflict.
* Update CSS for active tab in advanced search.
* Update JS for selecting a tab in advanced search.
  • Loading branch information...
1 parent dfd6de7 commit e0d34a5ba25e7cfeb5a9bea2491e4a55d35d2dac @mythmon committed Mar 28, 2013
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% from "messages/includes/macros.html" import message_tabs %}
{% from 'includes/common_macros.html' import for_contributors_sidebar %}
-{% set styles = ('messages', 'jqueryui/jqueryui') %}
+{% set styles = ('jqueryui/jqueryui', 'messages') %}
{% set scripts = ('messages', 'libs/jqueryui') %}
{% block side_top %}
View
@@ -32,7 +32,7 @@
'less/mobile/aaq.less',
),
'rickshaw': (
- 'css/jqueryui/jqueryui-rickshaw.css',
+ 'css/jqueryui/jqueryui.css',
'css/rickshaw.min.css',
'less/rickshaw.sumo.less',
),
@@ -152,7 +152,7 @@
'js/libs/selectivizr-1.0.2.js',
),
'libs/jqueryui': (
- 'js/libs/jqueryui.min.js',
+ 'js/libs/jqueryui.js',
),
'questions': (
'js/markup.js',
@@ -209,7 +209,7 @@
'js/wiki.metrics.js',
),
'rickshaw': (
- 'js/libs/jqueryui.rickshaw.js',
+ 'js/libs/jqueryui.js',
'js/libs/d3.v3.min.js',
'js/libs/d3.layout.min.js',
'js/libs/rickshaw.min.js',
View
@@ -1,14 +1,12 @@
-Different parts of the sites need different sets of jQuery UI. I also didn't
-know what parts of jQuery UI we already had selected, so now we have
-multiple bundles. Here is what is in each bundle:
+This is the contents of the custom jQueryUI bundle here.
-* Unnamed bundles: ???
-* Rickshaw
- - Sortable
- - Datepicker
- - Slider
+- Accordion
+- Autocomplete
+- Datepicker
+- Slider
+- Sortable
-The bundles include more, but these are things that shuld be checked on the
+The bundle include more, but these are things that shuld be checked on the
jQuery UI custom builder. They pull in dependencies like 'Core' or 'Mouse'.
Images should be shared between bundles, but CSS and JS should not be. We use
the UI Lightness theme.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit e0d34a5

Please sign in to comment.