Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More customization, more options in waterbug #88

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
6bec368
update npm package format
ryanmark Jun 15, 2017
ac71f45
add delimiter option for waterbug credit config
ryanmark Jun 15, 2017
35d7e8b
support prefix in credit config
ryanmark Jun 15, 2017
697f648
add 1:1 instagram option to waterbug
ryanmark Jun 16, 2017
0144471
support different names for s3 bucket and url
ryanmark Jun 16, 2017
90544e0
added editorconfig
ryanmark Jun 16, 2017
b0ebe9d
added configurable crops, plus a few new options
ryanmark Jun 16, 2017
46f63ec
add movable logo and credit text
ryanmark Jun 20, 2017
1399ded
make lunchbox title customizable
ryanmark Jun 20, 2017
f9d6d83
make favicon configurable
ryanmark Jun 20, 2017
2149df8
remove console.logs, expand crop button bar if there is space and the…
ryanmark Jun 20, 2017
e4f1920
update html2canvas to allow for scaling and add scale 2 to options ob…
Aug 8, 2017
427573e
add variables and styles for facebook ratio in quotable #1
Aug 9, 2017
0ab8ba2
add facebook ratio to factlist and scale #2 #7
Aug 9, 2017
0149636
started work on adding highlight ability #3
Aug 9, 2017
74e5bb6
add toggle highlighting on and off as well as reset ref #3
Aug 9, 2017
51def85
started working on saving placement of multiple nodes
Aug 10, 2017
64bc7d1
text highlighting working pretty well ref #3
Aug 11, 2017
0c06afb
fix so that it will maintain correct highlight during/after edit ref #3
Aug 11, 2017
d2e8f57
remove extra function
Aug 17, 2017
f030e6d
Merge pull request #8 from voxmedia/fb-ratio
ryanmark Feb 15, 2019
749c2dd
fork message
ryanmark Feb 15, 2019
c7e0fb3
make it work with Pipenv
ryanmark Feb 15, 2019
7e8a7c0
add highlighter icon https://www.iconfinder.com/icons/4514/highlight_…
ryanmark Feb 15, 2019
b8ea5d9
Merge pull request #9 from voxmedia/highlight
ryanmark Feb 15, 2019
09b66f6
reset photographer/source entry boxes on copyright holder change
ryanmark Feb 19, 2019
b852fd3
update twitter ratio on factlist
ryanmark Feb 26, 2019
c4d93ed
update twitter ratio on factlist and quotable
ryanmark Feb 26, 2019
5b5d909
update readme
ryanmark Feb 26, 2019
d061180
Merge pull request #10 from voxmedia/twitter-ratio
ryanmark Feb 26, 2019
50f4297
add proper logo vars for twitter ratio
ryanmark Feb 27, 2019
d299a6a
make quotable highlighting themable
ryanmark Feb 27, 2019
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
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# EditorConfig is awesome: http://EditorConfig.org

root = true

[*.{js,py}]
charset = utf-8
indent_style = space
indent_size = 4
44 changes: 44 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
[[source]]
name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]

[packages]
bcdoc = "==0.12.0"
boto = "==2.34.0"
botocore = "==0.31.0"
clan = "==0.1.3"
colorama = "==0.2.5"
copytext = "==0.1.9"
docutils = "==0.11"
facebook-sdk = "==0.4.0"
gunicorn = "==19.1.1"
httplib2 = "==0.9"
jmespath = "==0.2.1"
nose = "==1.2.1"
odict = "==1.5.1"
openpyxl = "==2.2.0"
ply = "==3.4"
pyasn1 = "==0.1.7"
pycrypto = "==2.6"
python-dateutil = "==2.2"
requests = "==2.5.0"
six = "==1.5.2"
slimit = "==0.7.4"
smartypants = "==1.8.6"
ssh = "==1.7.14"
termcolor = "==1.1.0"
twitter = "==1.14.3"
wsgiref = "==0.1.2"
Authomatic = "==0.0.13"
Fabric = "==1.4.3"
Flask = "==0.9"
Jinja2 = "==2.7.3"
MarkupSafe = "==0.23"
PyYAML = "==3.11"
Werkzeug = "==0.8.3"

[requires]
python_version = "2.7"
276 changes: 276 additions & 0 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
=============

* [What is this?](#what-is-this)
* [Vox.com Fork](#vox-fork)
* [Assumptions?](#assumptions)
* [What's in here?](#what-is-in-here)
* [Quick start](#quick-start)
Expand All @@ -18,6 +19,19 @@ What is this?
* *Factlist*: Produces a branded image with a list of items.
* *Waterbug*: Creates a watermarked image with attribution.

Vox Fork
-------------

This is a fork of the original project with a few extra features. The `master` branch retains branding
and configuration from the original project. The `voxdotcom` branch contains Vox.com customization
and branding.

This fork includes a few extra features:

* A *facebook* aspect ratio in *Quotable*, *Factlist* and *Waterbug*
* Ability to highlight parts of text in *Quotable*
* An updated *twitter* aspect ratio of 2x1 in *Quotable*, *Factlist* and *Waterbug*. The 16x9 aspect ratio is retained as well.

Assumptions
-------------

Expand Down
Loading