Skip to content

Commit

Permalink
Merge branch 'release/5.0.0-rc.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
w00fz committed May 15, 2015
2 parents ca53cd5 + f0192dc commit 9ad2538
Show file tree
Hide file tree
Showing 144 changed files with 2,375 additions and 1,835 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Linguist Normalizer
*.twig linguistic-language=PHP
**/js/main.js linguist-vendored=true
**/css-compiled/*.css linguist-vendored=true
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ Gantry 5 is a framework by which Gantry-powered themes are made. In order for a

The first thing you need to do is download the latest build of Gantry 5 and Hydrogen. You can do so by clicking the links below, or via [GitHub](http://github.com/gantry/gantry5/).

* [Download Gantry 5](https://github.com/gantry/gantry5/releases/download/5.0.0-rc.1/joomla-pkg_gantry5_v5.0.0-rc.1.zip)
* [Download Hydrogen Theme](https://github.com/gantry/gantry5/releases/download/5.0.0-rc.1/joomla-tpl_g5_hydrogen_v5.0.0-rc.1.zip)
* [Download Gantry 5](https://github.com/gantry/gantry5/releases/download/5.0.0-rc.2/joomla-pkg_gantry5_v5.0.0-rc.2.zip)
* [Download Hydrogen Theme](https://github.com/gantry/gantry5/releases/download/5.0.0-rc.2/joomla-tpl_g5_hydrogen_v5.0.0-rc.2.zip)

>>> During the initial beta, the **Framework** and **Template** are being distributed in different installable packages. A bundled package is planned, but will likely be available after the initial beta launch.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0.0-rc.1
5.0.0-rc.2
17 changes: 14 additions & 3 deletions assets/common/application/menu/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ var Menu = new prime({
dropdown: '.g-dropdown',
overlay: '.g-menu-overlay',
touchIndicator: '.g-menu-parent-indicator',
linkedParent: '[data-g-menuparent]'
linkedParent: '[data-g-menuparent]',
mobileTarget: '[data-g-mobile-target]'
},

states: {
Expand Down Expand Up @@ -257,8 +258,8 @@ var Menu = new prime({
_checkQuery: function(mq) {
var selectors = this.options.selectors,
mobileContainer = $(selectors.mobileContainer),
mainContainer = $(selectors.mainContainer),
find;
mainContainer = $(selectors.mainContainer + selectors.mobileTarget) || $(selectors.mainContainer),
find, dropdowns;

if (mq.matches) {
find = mainContainer.find(selectors.topLevel);
Expand All @@ -269,6 +270,16 @@ var Menu = new prime({
}

this.resetStates(find);

// we need to reintroduce fixed widths for those dropdowns that come with it
if (!mq.matches && (find && (dropdowns = find.search('[data-g-item-width]')))) {
console.log(dropdowns);
dropdowns.forEach(function(dropdown) {
dropdown = $(dropdown);
dropdown[0].style.width = dropdown.data('g-item-width');
console.log(dropdown, dropdown.data('g-item-width'));
});
}
},

_debug: function() {}
Expand Down
17 changes: 14 additions & 3 deletions assets/common/js/main.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9ad2538

Please sign in to comment.