Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
706ae9f
first branch in tn
Apr 9, 2015
b8c8956
tying to convert
Apr 9, 2015
03a7d78
added some love
Apr 9, 2015
f44b1f9
added some k00l design
Apr 9, 2015
745c045
mixin
Apr 9, 2015
5330f09
added watermarks files
Apr 14, 2015
1969022
added watermarks
Apr 14, 2015
962d03d
finally haml
Apr 14, 2015
c55661c
html ready
Apr 14, 2015
d038300
more settings
Apr 14, 2015
c2187d8
added emojis, backgrounds and fonts
Apr 14, 2015
88b5935
fix meme
Apr 14, 2015
1072294
fix
Apr 14, 2015
7929df0
first test
Apr 14, 2015
03ad583
added aspect ratio
Apr 14, 2015
38c9b9a
play
Apr 14, 2015
9b0f520
fix typos
Apr 15, 2015
74381ce
fix bg
Apr 15, 2015
59a0c36
added bold
Apr 15, 2015
3546952
fix fonts
Apr 15, 2015
b5c274f
fix editor
Apr 15, 2015
b1e3a5f
fix fonts
Apr 15, 2015
57af921
fix
Apr 15, 2015
6f87c89
Merge branch 'meme-tn' of tn.cmd.com.ar:repositories/proyectos/meme i…
Apr 15, 2015
7b53cf4
fix sprite 4 m3m3
Apr 15, 2015
6a5aba5
Merge branch 'meme-tn' of tn.cmd.com.ar:repositories/proyectos/meme i…
Apr 15, 2015
725be81
updated gitignore
Apr 15, 2015
e85b663
removed gitignore
Apr 15, 2015
4723435
fix
Apr 15, 2015
f1925ac
fix
Apr 15, 2015
36ba776
some emoji test
Apr 15, 2015
aeac3a3
Merge branch 'meme-tn' of tn.cmd.com.ar:repositories/proyectos/meme i…
Apr 15, 2015
71aeb26
canvas
Apr 15, 2015
5e37a64
fix gitignore
Apr 15, 2015
c9536d8
emojis!!!
Apr 15, 2015
3bb859e
emojis logic
Apr 15, 2015
460132d
css
Apr 15, 2015
144b728
removed hidden
Apr 15, 2015
bf7370f
Merge branch 'meme-tn' of tn.cmd.com.ar:repositories/proyectos/meme i…
Apr 15, 2015
47cd4bc
Merge branch 'meme-tn' of tn.cmd.com.ar:repositories/proyectos/meme i…
Apr 15, 2015
9ba8ab9
more fix
Apr 15, 2015
a619290
gitignore
Apr 15, 2015
599b101
removed .idea
Apr 15, 2015
247424d
css
Apr 15, 2015
fb55a42
css
Apr 15, 2015
1a4da7a
removed .idea
Apr 15, 2015
31ca2a0
removed .idea
Apr 15, 2015
2db25ac
some minor fixs
Apr 15, 2015
a010516
fix sprite vars
Apr 16, 2015
3998cc0
fix emojis position
Apr 16, 2015
eb34243
fix meme ratio
Apr 16, 2015
f432f77
merge
Apr 16, 2015
5cf032a
merge
Apr 16, 2015
7358506
update img drag
Apr 16, 2015
8d0da5d
Merge branch 'meme-tn' of tn.cmd.com.ar:repositories/proyectos/meme i…
Apr 16, 2015
69576c2
more meme
Apr 16, 2015
f25485f
gitigonre
Apr 16, 2015
a458982
gitigonre
Apr 16, 2015
34c28cc
minor fix upload
Apr 16, 2015
e7ad19b
merge
Apr 16, 2015
b5bf3cf
merge
Apr 16, 2015
9c005b8
gitignore
Apr 16, 2015
9f858dd
remove files
Apr 16, 2015
36585db
some deploy things
Apr 16, 2015
f807b4e
varios
Apr 16, 2015
1ee1994
varios
Apr 16, 2015
a3121bd
fix layout
Apr 16, 2015
c2c1138
Merge branch 'meme-tn' of tn.cmd.com.ar:repositories/proyectos/meme i…
Apr 16, 2015
525b820
overlays colors
Apr 16, 2015
4d493ff
design emojis
Apr 16, 2015
975e46b
varios
Apr 16, 2015
8d78ad2
Merge branch 'meme-tn' of tn.cmd.com.ar:repositories/proyectos/meme i…
Apr 16, 2015
dbd748d
fix box
Apr 16, 2015
6584bd2
fix
Apr 16, 2015
974484c
Merge branch 'meme-tn' of tn.cmd.com.ar:repositories/proyectos/meme i…
Apr 16, 2015
04b4e42
more fixs
Apr 16, 2015
0364d12
Merge branch 'meme-tn' of tn.cmd.com.ar:repositories/proyectos/meme i…
Apr 16, 2015
97054f0
css
Apr 16, 2015
13c86b9
Merge branch 'meme-tn' of tn.cmd.com.ar:repositories/proyectos/meme i…
Apr 16, 2015
7783040
sprite
Apr 16, 2015
8856950
Merge branch 'meme-tn' of tn.cmd.com.ar:repositories/proyectos/meme i…
Apr 16, 2015
48263fa
fix
Apr 16, 2015
1c5f746
fix canvas
Apr 16, 2015
6f5ff81
fix
Apr 16, 2015
1dc475a
fix sprite
Apr 16, 2015
3ab5263
fix
Apr 16, 2015
82e0cc2
fix conflict
Apr 16, 2015
65f13c0
fix
Apr 16, 2015
c413b6b
fix
Apr 16, 2015
903419a
fix conflict
Apr 16, 2015
99d87e1
fix gitignore
dientuki Apr 17, 2015
bc35ee9
removed eclipse files
dientuki Apr 17, 2015
67565f7
more fixs
dientuki Apr 17, 2015
68d35ac
more fix
dientuki Apr 17, 2015
a18d40c
fix
Apr 17, 2015
b6cfb1a
Merge branch 'meme-tn' of tn.cmd.com.ar:repositories/proyectos/meme i…
Apr 17, 2015
3ab954c
fix
Apr 17, 2015
a02b6e4
tinypng
dientuki Apr 17, 2015
3647e65
Merge branch 'meme-tn' of tn.cmd.com.ar:repositories/proyectos/meme i…
dientuki Apr 17, 2015
f59c054
fix download
dientuki Apr 17, 2015
cf36f37
some fixs
dientuki Apr 21, 2015
8edc7a4
some responsive shit
Apr 21, 2015
277d4e2
responsive canvas
Apr 21, 2015
a7239c6
more responsive
Apr 21, 2015
66a4a9d
more responsive
Apr 21, 2015
c8a590c
fix shadow
Apr 21, 2015
39737d3
added animation
Apr 21, 2015
d4ba8a3
added fixed animation
Apr 21, 2015
fc4190b
fix style
Apr 21, 2015
dc4b653
fix
Apr 21, 2015
62154fd
fix emojis
Apr 21, 2015
f6330b3
fix responsive
Apr 21, 2015
c6ed471
removed console
Apr 21, 2015
f0f86cf
fix canvas
Apr 22, 2015
a1f69d2
some mq fixs
Apr 23, 2015
da13052
fix bg
Apr 23, 2015
12cfb0e
fix bg
Apr 23, 2015
1006ffc
fix redaccion
Apr 28, 2015
9a3de90
fix mediakit
dientuki Jun 1, 2015
5dad6f6
update README.md to use in apache
Jun 3, 2015
84f1ae4
more readme text
Jun 3, 2015
5b09533
footer and try to fix mobile
Jun 10, 2015
8dd4d6f
fix mobile drag
Jun 10, 2015
7e27688
update README
Jun 10, 2015
e055a82
added font
Jun 10, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,15 @@

# Ignore .DS_store file
.DS_Store

# IDE files
.project
.idea
.idea/*
.idea/workspace.xml
/.idea/workspace.xml
.settings/
.buildpath

# Gemfile.lock
Gemfile.lock
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
source 'http://rubygems.org'

gem "middleman", "~>3.3.3"
gem "middleman-minify-html"

# Live-reloading plugin
gem "middleman-livereload", "~> 3.1.0"
Expand All @@ -11,4 +12,4 @@ gem "middleman-livereload", "~> 3.1.0"
gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]

# Windows does not come with time zone data
gem "tzinfo-data", platforms: [:mswin, :mingw]
gem "tzinfo-data", platforms: [:mswin, :mingw]
121 changes: 0 additions & 121 deletions Gemfile.lock

This file was deleted.

28 changes: 27 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@ Meme is a generator that Vox Media uses to create social sharing images. See wor
* Highly (and easily!) customizable editor and theme options.
* Watermark selector.

## What's new in meme-tn version?

* New responsive UI.
* Add ribbons feature.
* Add and position emojis features.
* Change image proportions for Twitter and Facebook.
* Choose between different background patterns for transparent background images.
* Improved image generation, no more DOM access in every rendering.
* Better drag n’ drop behaviour when the image doesn't fit in the canvas.
* Better drag n’ drop behaviour in touch devices.

## Install

* `git clone https://github.com/voxmedia/meme.git`
Expand Down Expand Up @@ -47,6 +58,21 @@ If you're hosting this application on the same domain that serves your images, t

2. Embed all of your watermark images as base64 data URIs within the `settings.js.erb` file. The asset pipeline's `asset_data_uri` helper method makes this very easy, and effectively embeds all image data within your JavaScript. The downside here is that your JavaScript will become a very large payload as you include more images. In the long term, getting CORS headers configured will be a better option.

## Installing in Apache

It uses Middleman to run. You must use this command to build it:

* `bundle exec middleman build`

### Fixing Assets

Before you use it, you have to fix the asset. Add these lines to the build block in [config file](https://github.com/voxmedia/meme/blob/master/config.js.erb#L36)

* `activate :minify_html`
* `activate :relative_assets`

To fix the paths, use [middleman's helpers](https://middlemanapp.com/advanced/asset_pipeline/#helpers) in your CSS, and the `asset_data_uri` function in your [settings file](https://github.com/voxmedia/meme/blob/master/source/javascripts/settings.js.erb).

## Examples

* http://www.sbnation.com/a/meme
Expand All @@ -60,4 +86,4 @@ If you're hosting this application on the same domain that serves your images, t
2. Create your feature branch (`git checkout -b my-new-feature`)
3. Commit your changes (`git commit -am 'Add some feature'`)
4. Push to the branch (`git push origin my-new-feature`)
5. Create a new Pull Request
5. Create a new Pull Request
7 changes: 6 additions & 1 deletion config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,20 @@ def get_url
set :css_dir, 'stylesheets'
set :js_dir, 'javascripts'
set :images_dir, 'images'
set :url_prefix, '/'
set :url_prefix, ''
set :absolute_prefix, 'http://localhost:4567'

# Build-specific configuration
configure :build do
puts "local build"
set :url_prefix, ""
set :absolute_prefix, ""
#set :images_dir, 'images'

activate :asset_hash
activate :minify_javascript
activate :minify_css

activate :minify_html
activate :relative_assets
end
Binary file added png/emojis.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/fonts/Impact.eot
Binary file not shown.
Loading