Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: voxmedia/meme
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: dxe/meme
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 26 files changed
  • 4 contributors

Commits on Apr 26, 2020

  1. Update code to work with latest version of Ruby and Middleman (#1) 

    * disable compass

* bump middleman

* add sprockets to fix 'undefined method ' bug

* remove compass import; compass is no longer maintained

* migrating

* rename stylesheet to fix file ext

* disable sprockets to fix CSS issue. removes support for 'asset_data_uri'

* remove sprockets Javascript requires

* uninstall sprockets gem

* update Gemfile so that bundle install and bundle update work properly
    @liamkirsh
    liamkirsh authored Apr 26, 2020
    Configuration menu
    Copy the full SHA
    80449aa View commit details
    Browse the repository at this point in the history

  2. bugfix: autoprefixer doesn't handle -moz and -webkit appearance prefixes

    @liamkirsh
    liamkirsh committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    724853e View commit details
    Browse the repository at this point in the history

  3. updating for DxE use

    @jakehobbs @liamkirsh
    jakehobbs authored and liamkirsh committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    6e12a46 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2020

  1. Merge pull request #3 from dxe/jake 

    updating for DxE use
    @jakehobbs
    jakehobbs authored Apr 27, 2020
    Configuration menu
    Copy the full SHA
    dff54e3 View commit details
    Browse the repository at this point in the history

  2. more changes for dxe 

    - remove options if there are no choices
- add black bg color
- change text size to a slider
- remove .eot font source since not used
- allow manual line breaks instead of word wrap
- add more aspect ratios (1:1 or 4:5, 8.5x14")
    @jakehobbs
    jakehobbs committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    1c52b4a View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2020

  1. added fb cover photo size

    @jakehobbs
    jakehobbs committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    7e62b9b View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. add new logos from paul

    @jakehobbs
    jakehobbs committed May 1, 2020
    Configuration menu
    Copy the full SHA
    44a0936 View commit details
    Browse the repository at this point in the history
Loading