diff --git a/.gitignore b/.gitignore index ff9491c..d177141 100755 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .idea/ -builds/ +_builds/* +_src/* custom/ *pexels* *wallhaven* \ No newline at end of file diff --git a/README.md b/README.md index 0061d92..c7f9e8b 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# tpl_othercode +# otherCode Joomla 3.x Template otherCode Joomla Template developed with Gantry 5 @@ -9,7 +9,13 @@ otherCode Joomla Template developed with Gantry 5 Run the following command: ```bash -sh ./tpl_othercode.sh +bash build.sh +``` + +This will generate the installable `.zip` in `builds/` directory: + +```bash +builds/g5_othercode.zip ``` ## Configuration @@ -18,4 +24,4 @@ Access to template configuration in: **Extensions > Template > Styles > [Templat #### Disclaimer -All used images are from **pexels.com**. \ No newline at end of file +All used images are from **[pexels.com](https://www.pexels.com/)**. \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..6f2508e --- /dev/null +++ b/build.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +ext_path=`pwd` +ext_name="g5_othercode" +version="1.1.2" + +echo "**********************" +echo "Building: "$ext_name +echo "Version: "$version +echo "**********************" +echo "Path: "$ext_path +echo "**********************" + +echo "Cleaning..." +cd $ext_path +rm -rf $ext_path/_builds $ext_path/_builds/$ext_name +mkdir -p $ext_path/_builds $ext_path/_builds/$ext_name + +echo "Building directories..." +for directory in $(find ./ -type d | grep -vE ".git|.idea|custom|_build" | sed 's/.\///'); do + if [ ! -z "$directory" ]; then + mkdir -p $ext_path/_builds/$ext_name/$directory + fi +done + +echo "Copying files..." +for file in $(find ./ -type f | grep -vE ".git|.idea|custom|.sh$|_build|LICENSE|.md$"); do + cp -r $file $ext_path/_builds/$ext_name/$file +done + +perl -pi -e 's/VERSION/'$version'/g;s/DATE/'`date +%Y-%m-%d`'/g' $ext_path/_builds/$ext_name/templateDetails.xml +perl -pi -e 's/VERSION/'$version'/g;s/DATE/'`date +%Y-%m-%d`'/g' $ext_path/_builds/$ext_name/gantry/theme.yaml + +echo "Building zip package..." +cd $ext_path/_builds +zip -rq $ext_path/_builds/$ext_name.zip $ext_name +rm -rf $ext_path/_builds/$ext_name + +echo "Done!" diff --git a/roksprocket/layouts/mosaic/themes/default/mosaic.css b/roksprocket/layouts/mosaic/themes/default/mosaic.css index 7f83024..d67922e 100755 --- a/roksprocket/layouts/mosaic/themes/default/mosaic.css +++ b/roksprocket/layouts/mosaic/themes/default/mosaic.css @@ -1,11 +1,3 @@ -/** -* @version $Id: mosaic.css 26163 2015-01-27 17:11:55Z james $ -* @author RocketTheme http://www.rockettheme.com -* @copyright Copyright (C) 2007 - 2015 RocketTheme, LLC -* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only - */ - -/* Mosaic - Core */ .sprocket-mosaic { position: relative; -webkit-transform: translateZ(0); @@ -226,6 +218,8 @@ top: 50%; width: 100%; display: block; + font-size: 1.5rem; + transform: translateY(-50%); } .sprocket-mosaic-hovercontent span { @@ -335,6 +329,11 @@ animation: rotate 1s linear infinite; } +h2.sprocket-mosaic-title { + line-height: 2rem; + font-size: 1.5rem; +} + /* Tweaks */ .sprocket-mosaic-item { margin: 10px; diff --git a/scss/othercode/styles/_extenisons.scss b/scss/othercode/styles/_extenisons.scss index 6086bc9..588ceae 100644 --- a/scss/othercode/styles/_extenisons.scss +++ b/scss/othercode/styles/_extenisons.scss @@ -18,14 +18,6 @@ line-height: 0; } -// roksprokect -.sprocket-mosaic { - h2.sprocket-mosaic-title { - line-height: 2rem; - font-size: 1.5rem; - } -} - pre[class*="language-"] { box-shadow: none; border: none; diff --git a/templateDetails.xml b/templateDetails.xml index 967c044..9f7b498 100755 --- a/templateDetails.xml +++ b/templateDetails.xml @@ -16,6 +16,7 @@ admin blueprints config + css fields fonts gantry @@ -27,8 +28,8 @@ language layouts particles - scss roksprocket + scss component.php error.php index.php @@ -56,4 +57,9 @@ + + + https://updates.othercode.es/index.xml + + diff --git a/tpl_othercode.sh b/tpl_othercode.sh deleted file mode 100755 index c9c3036..0000000 --- a/tpl_othercode.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -TEMPLATE=`pwd` - -EXTENSION="g5_othercode" -VERSION="1.0-"`date +%s` -DATE="`date +%Y-%m-%d`" - -echo "**********************" -echo "Building: "$EXTENSION -echo "Version: "$VERSION -echo "**********************" -echo "Builder:" $TEMPLATE -echo "**********************" - -echo "Cleaning..." -cd $TEMPLATE - -rm -rf $TEMPLATE/builds -mkdir -p $TEMPLATE/builds/src - -echo "Copiyng files..." -for file in $TEMPLATE/* -do - if [ "$file" = "$TEMPLATE/builds" ] || [ "$file" = "$TEMPLATE/.idea/" ] || [ "$file" = "$TEMPLATE/.git" ] || [ "$file" = "$TEMPLATE/custom" ] || [ "$file" = "$TEMPLATE/tpl_othercode.sh" ]; then - continue; - fi - cp -r "$file" $TEMPLATE"/builds/src/" -done - -perl -pi -e 's/VERSION/'$VERSION'/g;s/DATE/'$DATE'/g' $TEMPLATE/builds/src/templateDetails.xml -perl -pi -e 's/VERSION/'$VERSION'/g;s/DATE/'$DATE'/g' $TEMPLATE/builds/src/gantry/theme.yaml - -echo "Building zip package..." -cd $TEMPLATE/builds/src && zip -rq $TEMPLATE/builds/$EXTENSION.zip ./ - -echo "Done!"