Merge branch 'master' into patch-1
@@ -3,17 +3,6 @@ rvm:
|
||||
- 2.1.0
|
||||
sudo: false
|
||||
cache: bundler
|
||||
env:
|
||||
global:
|
||||
- GITHUB_USERNAME="paracycle"
|
||||
- # GITHUB_TOKEN
|
||||
secure: "GxIYWgHaTXAO6jPn1L8JOYhwFmCRKCUttMP7+G6xMjSgQzrmaBuWWprKCNj5/8yOUrcQl0QOuUE0FLwdYAUouuesPoryyWuvLcHVKJUyHVH1ad8CXbTua//zH/0re4/3NDKRWgGK2piZHWVkacfoyo1qsQ5inyARPeXE4GmkkFI="
|
||||
- # GIT_NAME
|
||||
secure: "Rn6AWw/lpIjf0QzDDfBNdwA+JAJasvH7cx2MeHCF+j1yhyRAfGrHGkbGXca4bO8u8fi/Y+eYwjRl+lrys39vx9k8657ju2XJMRxszgqIQesc2TwKYxkH82m8BWpovFWFzViJjIZDOv5z6pR3HonbsdtCbhQQIixwT9m6NB63x9s="
|
||||
- # GIT_EMAIL
|
||||
secure: "Badx3sMShH8lhiinfhXKRPlq3bM0V8JKsBEHnKtWk4EO3t6dwJpYtXQH20qXJEMCWg+9mFJv+yLuiRVX3QrAJiPP1z/b01Q2zVmTL3SAZElXYOYCTekkc1qUvbjjA4g8y1X+cOPkLy13eGBM64mRqCBAV8oOFBx9wM8mMHTqgS0="
|
||||
- # ANALYTICS_ID
|
||||
secure: "TyGjoHZ4bhNed1k4ZvWxNmSrve+yTr+jlFx8MqvJoK+A5bZMq/CYkXajO96tKN0ZiJmF6Rm5/sn9kk00pwnjBw/FOkIKcen5Q+7R0zKYuBodM5q8uUDuqrJQDVJaPQ3BH15JGJR7oB/QoJR80iugGJcjvnF8CO3oCaiFcZWxOVg="
|
||||
before_install:
|
||||
- mkdir travis-phantomjs
|
||||
- wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
|
||||
@@ -26,5 +15,9 @@ after_success:
|
||||
git config --global user.name "${GIT_NAME}";
|
||||
git config --global user.email "${GIT_EMAIL}";
|
||||
git remote set-url origin "https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git";
|
||||
git checkout master;
|
||||
git add 'source/images/theme/*';
|
||||
git commit -m 'Adding generated images [skip ci]';
|
||||
git push origin master;
|
||||
bundle exec middleman deploy;
|
||||
fi
|
||||
@@ -169,4 +169,5 @@
|
||||
- { colors: '#353535,#2f2f2f,#8fa876,#ffffff,#8fa876,#ffffff,#818181,#8fa876', name: 'Linux Mint Y Dark'}
|
||||
- { colors: '#444444,#157477,#e4e4e4,#666666,#888888,#ffffff,#5ae043,#1de2e7', name: 'Nitro Marketing Digital'}
|
||||
- { colors: '#003554,#073c57,#006494,#FFFFFF,#006494,#FFFFFF,#00A6FB,#EB4D5C', name: 'SQOOL by Unowhy'}
|
||||
- { colors: '#141422,#259692,#259692,#FFFFFF,#4A5664,#ffffff,#ff8800,#FF8800', name: 'GitKraken'}
|
||||
- { colors: '#000000,#000000,#7aba20,#FFFFFF,#000000,#FFFFFF,#7aba20,#0088cc', name: 'Symfony'}
|
||||
|
||||
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 7.9 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 10 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |