Skip to content

Commit

Permalink
Merge branch 'release/5.0.0-beta.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
w00fz committed May 1, 2015
2 parents 0ab80c7 + 40d1b22 commit 8184fed
Show file tree
Hide file tree
Showing 172 changed files with 4,807 additions and 1,812 deletions.
9 changes: 2 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,5 @@ themes/*/magento/skin/default/common
# Compiled
**/.sass-cache
**/*.map
node_modules/*
platforms/wordpress/gantryadmin/cache
platforms/common/node_modules
assets/application/node_modules
assets/common/application/node_modules
assets/common/node_modules
engines/common/nucleus/node_modules
**/node_modules/*
platforms/**/cache
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-beta.4/joomla-pkg_gantry5_v5.0.0-beta.4.zip)
* [Download Hydrogen Theme](https://github.com/gantry/gantry5/releases/download/5.0.0-beta.4/joomla-tpl_g5_hydrogen_v5.0.0-beta.4.zip)
* [Download Gantry 5](https://github.com/gantry/gantry5/releases/download/5.0.0-beta.5/joomla-pkg_gantry5_v5.0.0-beta.5.zip)
* [Download Hydrogen Theme](https://github.com/gantry/gantry5/releases/download/5.0.0-beta.5/joomla-tpl_g5_hydrogen_v5.0.0-beta.5.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-beta.4
5.0.0-beta.5
10 changes: 5 additions & 5 deletions assets/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "gantry5-hydrogen",
"version": "1.0.0",
"dependencies": {
"domready": "^1.0.7",
"domready": "^1.0.8",
"elements": "git://github.com/w00fz/elements.git",
"mout": "^0.11.0",
"prime": "^0.4.2",
Expand All @@ -13,14 +13,14 @@
"browserify": "^9.0.8",
"gulp": "^3.8.11",
"gulp-if": "^1.2.5",
"gulp-ruby-sass": "^1.0.1",
"gulp-sourcemaps": "^1.5.1",
"gulp-ruby-sass": "^1.0.5",
"gulp-sourcemaps": "^1.5.2",
"gulp-uglify": "^1.2.0",
"gulp-util": "^3.0.4",
"merge-stream": "^0.1.7",
"vinyl-buffer": "^1.0.0",
"vinyl-source-stream": "^1.1.0",
"watchify": "^3.1.1",
"yargs": "^3.7.2"
"watchify": "^3.2.0",
"yargs": "^3.8.0"
}
}
27 changes: 0 additions & 27 deletions assets/joomla/css/bootstrap-gantry.css
Original file line number Diff line number Diff line change
Expand Up @@ -4993,30 +4993,3 @@ div.modal.fade {
div.modal.fade.in {
top: 10%;
}

/* Joomla JUI NOTE: Original .modal definition has to be commented */

@media (max-width: 767px) {
div.modal {
position: fixed;
top: 20px;
right: 20px;
left: 20px;
width: auto;
margin: 0;
}
div.modal.fade {
top: -100px;
}
div.modal.fade.in {
top: 20px;
}
}

@media (max-width: 480px) {
div.modal {
top: 10px;
right: 10px;
left: 10px;
}
}
4 changes: 2 additions & 2 deletions bin/build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<!-- Initialize all project related files, at this point we are past any "location" setup work so its safe to proceed -->
<target name="assets-prod">
<echo message="Removing Sourcemaps and compressing Assets (CSS/JS)..." />
<exec command="gulp --prod" checkreturn="true" passthru="true" />
<exec command="gulp --prod" output="/dev/null" error ="./gulp-prod-error.txt" />
</target>

<target name="build-installer">
Expand Down Expand Up @@ -390,7 +390,7 @@

<target name="assets-dev">
<echo message="Reverting Assets to Dev (CSS/JS)..." />
<exec command="gulp" checkreturn="true" passthru="true" />
<exec command="gulp" output="/dev/null" error ="./gulp-dev-error.txt" />
</target>

<target name="package">
Expand Down
Binary file modified bin/composer.phar
Binary file not shown.

0 comments on commit 8184fed

Please sign in to comment.