misc uncommitted changes laying round
This commit is contained in:
2
Gemfile
2
Gemfile
@ -13,4 +13,4 @@ gem "redcarpet"
|
|||||||
|
|
||||||
gem "middleman-syntax"
|
gem "middleman-syntax"
|
||||||
|
|
||||||
gem 'middleman-deploy'
|
# gem 'middleman-deploy'
|
||||||
|
|||||||
191
Gemfile.lock
191
Gemfile.lock
@ -1,150 +1,127 @@
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
activesupport (4.1.10)
|
activesupport (4.2.7.1)
|
||||||
i18n (~> 0.6, >= 0.6.9)
|
i18n (~> 0.7)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.3, >= 0.3.4)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
addressable (2.3.7)
|
addressable (2.4.0)
|
||||||
|
backports (3.6.8)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
celluloid (0.16.0)
|
coffee-script (2.4.1)
|
||||||
timers (~> 4.0.0)
|
|
||||||
chunky_png (1.3.4)
|
|
||||||
coffee-script (2.3.0)
|
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.9.1)
|
coffee-script-source (1.10.0)
|
||||||
compass (1.0.3)
|
|
||||||
chunky_png (~> 1.2)
|
|
||||||
compass-core (~> 1.0.2)
|
|
||||||
compass-import-once (~> 1.0.5)
|
|
||||||
rb-fsevent (>= 0.9.3)
|
|
||||||
rb-inotify (>= 0.9)
|
|
||||||
sass (>= 3.3.13, < 3.5)
|
|
||||||
compass-core (1.0.3)
|
|
||||||
multi_json (~> 1.0)
|
|
||||||
sass (>= 3.3.0, < 3.5)
|
|
||||||
compass-import-once (1.0.5)
|
compass-import-once (1.0.5)
|
||||||
sass (>= 3.2, < 3.5)
|
sass (>= 3.2, < 3.5)
|
||||||
|
concurrent-ruby (1.0.2)
|
||||||
|
contracts (0.13.0)
|
||||||
docile (1.1.5)
|
docile (1.1.5)
|
||||||
|
dotenv (2.1.1)
|
||||||
em-websocket (0.5.1)
|
em-websocket (0.5.1)
|
||||||
eventmachine (>= 0.12.9)
|
eventmachine (>= 0.12.9)
|
||||||
http_parser.rb (~> 0.6.0)
|
http_parser.rb (~> 0.6.0)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
eventmachine (1.0.7)
|
eventmachine (1.2.0.1)
|
||||||
execjs (2.4.0)
|
execjs (2.7.0)
|
||||||
favicon_maker (1.3)
|
fast_blank (1.0.0)
|
||||||
|
fastimage (2.0.0)
|
||||||
|
addressable (~> 2)
|
||||||
|
favicon_maker (1.3.1)
|
||||||
docile (~> 1.1)
|
docile (~> 1.1)
|
||||||
ffi (1.9.8)
|
ffi (1.9.14)
|
||||||
haml (4.0.6)
|
haml (4.0.7)
|
||||||
tilt
|
tilt
|
||||||
hike (1.2.3)
|
hamster (3.0.0)
|
||||||
hitimes (1.2.2)
|
concurrent-ruby (~> 1.0)
|
||||||
hooks (0.4.0)
|
hashie (3.4.4)
|
||||||
uber (~> 0.0.4)
|
|
||||||
http_parser.rb (0.6.0)
|
http_parser.rb (0.6.0)
|
||||||
i18n (0.7.0)
|
i18n (0.7.0)
|
||||||
json (1.8.2)
|
json (1.8.3)
|
||||||
kramdown (1.6.0)
|
kramdown (1.12.0)
|
||||||
listen (2.9.0)
|
listen (3.0.8)
|
||||||
celluloid (>= 0.15.2)
|
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||||
rb-fsevent (>= 0.9.3)
|
rb-inotify (~> 0.9, >= 0.9.7)
|
||||||
rb-inotify (>= 0.9)
|
memoist (0.15.0)
|
||||||
middleman (3.3.10)
|
middleman (4.1.10)
|
||||||
coffee-script (~> 2.2)
|
coffee-script (~> 2.2)
|
||||||
compass (>= 1.0.0, < 2.0.0)
|
|
||||||
compass-import-once (= 1.0.5)
|
compass-import-once (= 1.0.5)
|
||||||
execjs (~> 2.0)
|
|
||||||
haml (>= 4.0.5)
|
haml (>= 4.0.5)
|
||||||
kramdown (~> 1.2)
|
kramdown (~> 1.2)
|
||||||
middleman-core (= 3.3.10)
|
middleman-cli (= 4.1.10)
|
||||||
middleman-sprockets (>= 3.1.2)
|
middleman-core (= 4.1.10)
|
||||||
sass (>= 3.4.0, < 4.0)
|
sass (>= 3.4.0, < 4.0)
|
||||||
uglifier (~> 2.5)
|
middleman-blog (4.0.1)
|
||||||
middleman-blog (3.5.3)
|
addressable (~> 2.3)
|
||||||
addressable (~> 2.3.5)
|
middleman-core (>= 4.0.0)
|
||||||
middleman-core (~> 3.2)
|
|
||||||
tzinfo (>= 0.3.0)
|
tzinfo (>= 0.3.0)
|
||||||
middleman-core (3.3.10)
|
middleman-cli (4.1.10)
|
||||||
activesupport (~> 4.1.0)
|
thor (>= 0.17.0, < 2.0)
|
||||||
|
middleman-core (4.1.10)
|
||||||
|
activesupport (~> 4.2)
|
||||||
|
addressable (~> 2.3)
|
||||||
|
backports (~> 3.6)
|
||||||
bundler (~> 1.1)
|
bundler (~> 1.1)
|
||||||
|
contracts (~> 0.13.0)
|
||||||
|
dotenv
|
||||||
erubis
|
erubis
|
||||||
hooks (~> 0.3)
|
execjs (~> 2.0)
|
||||||
|
fast_blank
|
||||||
|
fastimage (~> 2.0)
|
||||||
|
hamster (~> 3.0)
|
||||||
|
hashie (~> 3.4)
|
||||||
i18n (~> 0.7.0)
|
i18n (~> 0.7.0)
|
||||||
listen (>= 2.7.9, < 3.0)
|
listen (~> 3.0.0)
|
||||||
padrino-helpers (~> 0.12.3)
|
memoist (~> 0.14)
|
||||||
|
padrino-helpers (~> 0.13.0)
|
||||||
|
parallel
|
||||||
rack (>= 1.4.5, < 2.0)
|
rack (>= 1.4.5, < 2.0)
|
||||||
rack-test (~> 0.6.2)
|
sass (>= 3.4)
|
||||||
thor (>= 0.15.2, < 2.0)
|
servolux
|
||||||
tilt (~> 1.4.1, < 2.0)
|
tilt (~> 1.4.1)
|
||||||
middleman-deploy (1.0.0)
|
uglifier (~> 3.0)
|
||||||
middleman-core (>= 3.2)
|
middleman-favicon-maker (4.0.4)
|
||||||
net-sftp
|
favicon_maker (~> 1.3, >= 1.3.1)
|
||||||
ptools
|
middleman-core (~> 4.0)
|
||||||
middleman-favicon-maker (3.7)
|
middleman-livereload (3.4.6)
|
||||||
favicon_maker (~> 1.3)
|
|
||||||
middleman-core (>= 3.0.0)
|
|
||||||
middleman-livereload (3.4.2)
|
|
||||||
em-websocket (~> 0.5.1)
|
em-websocket (~> 0.5.1)
|
||||||
middleman-core (>= 3.3)
|
middleman-core (>= 3.3)
|
||||||
rack-livereload (~> 0.3.15)
|
rack-livereload (~> 0.3.15)
|
||||||
middleman-sprockets (3.4.2)
|
middleman-syntax (3.0.0)
|
||||||
middleman-core (>= 3.3)
|
middleman-core (>= 3.2)
|
||||||
sprockets (~> 2.12.1)
|
rouge (~> 2.0)
|
||||||
sprockets-helpers (~> 1.1.0)
|
mini_portile2 (2.1.0)
|
||||||
sprockets-sass (~> 1.3.0)
|
minitest (5.9.0)
|
||||||
middleman-syntax (2.0.0)
|
nokogiri (1.6.8)
|
||||||
middleman-core (~> 3.2)
|
mini_portile2 (~> 2.1.0)
|
||||||
rouge (~> 1.0)
|
pkg-config (~> 1.1.7)
|
||||||
mini_portile (0.6.2)
|
padrino-helpers (0.13.3.2)
|
||||||
minitest (5.5.1)
|
|
||||||
multi_json (1.11.0)
|
|
||||||
net-sftp (2.1.2)
|
|
||||||
net-ssh (>= 2.6.5)
|
|
||||||
net-ssh (2.9.2)
|
|
||||||
nokogiri (1.6.6.2)
|
|
||||||
mini_portile (~> 0.6.0)
|
|
||||||
padrino-helpers (0.12.5)
|
|
||||||
i18n (~> 0.6, >= 0.6.7)
|
i18n (~> 0.6, >= 0.6.7)
|
||||||
padrino-support (= 0.12.5)
|
padrino-support (= 0.13.3.2)
|
||||||
tilt (~> 1.4.1)
|
tilt (>= 1.4.1, < 3)
|
||||||
padrino-support (0.12.5)
|
padrino-support (0.13.3.2)
|
||||||
activesupport (>= 3.1)
|
activesupport (>= 3.1)
|
||||||
ptools (1.3.2)
|
parallel (1.9.0)
|
||||||
rack (1.6.0)
|
pkg-config (1.1.7)
|
||||||
rack-livereload (0.3.15)
|
rack (1.6.4)
|
||||||
|
rack-livereload (0.3.16)
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.3)
|
rb-fsevent (0.9.7)
|
||||||
rack (>= 1.0)
|
rb-inotify (0.9.7)
|
||||||
rb-fsevent (0.9.4)
|
|
||||||
rb-inotify (0.9.5)
|
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
redcarpet (3.2.2)
|
redcarpet (3.3.4)
|
||||||
rouge (1.8.0)
|
rouge (2.0.6)
|
||||||
sass (3.4.13)
|
sass (3.4.22)
|
||||||
sprockets (2.12.3)
|
servolux (0.12.0)
|
||||||
hike (~> 1.2)
|
|
||||||
multi_json (~> 1.0)
|
|
||||||
rack (~> 1.0)
|
|
||||||
tilt (~> 1.1, != 1.3.0)
|
|
||||||
sprockets-helpers (1.1.0)
|
|
||||||
sprockets (~> 2.0)
|
|
||||||
sprockets-sass (1.3.1)
|
|
||||||
sprockets (~> 2.0)
|
|
||||||
tilt (~> 1.1)
|
|
||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.3.5)
|
thread_safe (0.3.5)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
timers (4.0.1)
|
|
||||||
hitimes
|
|
||||||
tzinfo (1.2.2)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uber (0.0.13)
|
uglifier (3.0.2)
|
||||||
uglifier (2.7.1)
|
execjs (>= 0.3.0, < 3)
|
||||||
execjs (>= 0.3.0)
|
|
||||||
json (>= 1.8.0)
|
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
@ -154,9 +131,11 @@ DEPENDENCIES
|
|||||||
json
|
json
|
||||||
middleman
|
middleman
|
||||||
middleman-blog
|
middleman-blog
|
||||||
middleman-deploy
|
|
||||||
middleman-favicon-maker
|
middleman-favicon-maker
|
||||||
middleman-livereload
|
middleman-livereload
|
||||||
middleman-syntax
|
middleman-syntax
|
||||||
nokogiri
|
nokogiri
|
||||||
redcarpet
|
redcarpet
|
||||||
|
|
||||||
|
BUNDLED WITH
|
||||||
|
1.12.3
|
||||||
|
|||||||
20
config.rb
20
config.rb
@ -74,13 +74,13 @@ configure :build do
|
|||||||
# set :http_path, "/Content/images/"
|
# set :http_path, "/Content/images/"
|
||||||
end
|
end
|
||||||
|
|
||||||
activate :deploy do |deploy|
|
# activate :deploy do |deploy|
|
||||||
deploy.method = :rsync
|
# deploy.method = :rsync
|
||||||
deploy.host = 'fullsight.com'
|
# deploy.host = 'fullsight.com'
|
||||||
deploy.path = 'vhost/markamoser'
|
# deploy.path = 'vhost/markamoser'
|
||||||
deploy.user = 'mmoser'
|
# deploy.user = 'mmoser'
|
||||||
deploy.port = 6791
|
# deploy.port = 6791
|
||||||
deploy.clean = true # remove orphaned files on remote host, default: false
|
# deploy.clean = true # remove orphaned files on remote host, default: false
|
||||||
# deploy.flags = '-rltgoDvzO --no-p --del' # add custom flags, default: -avz
|
# # deploy.flags = '-rltgoDvzO --no-p --del' # add custom flags, default: -avz
|
||||||
deploy.build_before = true
|
# deploy.build_before = true
|
||||||
end
|
# end
|
||||||
|
|||||||
@ -9,7 +9,7 @@ index:
|
|||||||
autoplay: false
|
autoplay: false
|
||||||
preload: "auto"
|
preload: "auto"
|
||||||
note: "A short sampling of my after effects work. I do love to edit. (<a href=\"video/MarkMoser_reel2011.mp4\">download</a>)"
|
note: "A short sampling of my after effects work. I do love to edit. (<a href=\"video/MarkMoser_reel2011.mp4\">download</a>)"
|
||||||
vimeo: "<iframe src=\"http://player.vimeo.com/video/29118777?byline=0&portrait=0&autoplay=0\" width=\"720\" height=\"360\" frameborder=\"0\" webkitAllowFullScreen allowFullScreen></iframe>"
|
vimeo: "<iframe src=\"//player.vimeo.com/video/29118777?byline=0&portrait=0&autoplay=0\" width=\"720\" height=\"360\" frameborder=\"0\" webkitAllowFullScreen allowFullScreen></iframe>"
|
||||||
|
|
||||||
las_invent:
|
las_invent:
|
||||||
file: "LAS_InventYourFuture_720x404.mp4"
|
file: "LAS_InventYourFuture_720x404.mp4"
|
||||||
|
|||||||
Reference in New Issue
Block a user