Comparing master...gh-pages · tmray/pl-store · GitHub
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: tmray/pl-store
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: tmray/pl-store
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: gh-pages
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 3 commits
  • 0 files changed
  • 1 contributor

Commits on Mar 14, 2016

  1. Merge pull request #1 from tmray/master

    merge master to production
    tmray committed Mar 14, 2016
    Configuration menu
    Copy the full SHA
    f061b87 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2016

  1. New cart added to dev (#3)

    * added variables file and images, updated header design
    
    * changed nav colors
    
    * updated featured component and images
    
    * updated cards, added images
    
    * button styles and bundle summary text
    
    * updated footer links and images
    
    * added more album pages
    
    * button links added to parallax on home page
    
    * parallax text design
    
    * updated album page info
    
    * changed card image height and flex size, new title description
    
    * bg color body
    
    * figured out how to set the cards to offset:1 on the index page. That skips the first one now. Updated cards to fit in one row
    
    * more paralax design updates, this time for mobile
    
    * updated footer mobile set up
    
    * updated footer links and colors
    
    * test player set up on album1 page, added font matter and new test folders with a file example
    
    * added new album images and changed cards loop and links to album on page layout to add nil if statement if album and page url are the same
    
    * changed card loop value on homepage to album to work with new card include setup
    
    * resized album artwork for web and deleted large original art files
    
    * resized dvd artwork for web and deleted large original art files
    
    * update bundle art and page
    
    * site design updates and changed page max-width to 980px to match main site
    
    * updated gitignore files
    
    * added sample audio links
    
    * made album page sample links
    
    * added player to cards and set up custom tag for pages to use with player ids
    
    * changed player class on album pages, removed hover link styles from cards component
    
    * removed box-shadow on cards
    
    * added album audio info to pages
    
    * added bundle to album cards, if statememnt only shows player in cards for caregory == albums on page
    
    * updated bower components
    
    * removed bundle feature from index page
    
    * updated card siszes to make them 3 across, updated player style and renamed album pages to put them in release order
    
    * created dvd section on index page, set up as a grid-item, added scss and includes for this
    
    * removed gap on home headers
    
    * added dvd images and updated grid item styles
    
    * added favicon
    
    * linked head to favicon
    
    * updated button text
    
    * changed grid-item backgrounds from image to color
    
    * changed grid-item border color
    
    * added dvd info and buttons to grid-items updated styles
    
    * updated card playlist method
    
    * updated player playlist in album pages and styles, using playlist type again
    
    * updated song list
    
    * updated song list
    
    * updated song list
    
    * nav update
    
    * added test cart
    
    * ended up embedding the single purchase cashmusic elements into the cards, re-configured the styles and added cd and mp3 download sections
    
    * added cd cart items
    
    * added bundle cart items
    
    * updated homepage with text card to make the bundles section 2 columns
    
    * switched bundle box sides, added open-sans font, updated bundle announce design
    
    * changed page section titles and styles, renamed make-happy album to new-untitled
    
    * changed track listings on new-untitled album
    
    * changed page title on new-untitled album
    
    * updated bundle box callout text
    
    * changed home nav link to main website url
    
    * removed commented html in nav
    
    * changed the way .page-title worked, was adding space to store header, got to be a less messy way to design this part
    
    * added another line to the bundle callout
    
    * changed bundle art work, added image and new link in bundles page
    
    * changed site description in config.yml
    
    * changed site description in config.yml
    
    * added bundle downloads, removed description card height
    
    * added movie download elements
    
    * updated the navigation links
    
    * added subnavs to each section of the page, new subnav include, and subnav design, added bundle card to cd and mp3 sections
    
    * updated text, neat & javascript, added arrow image to bundle title card, restyled updated player
    
    * removed old album page includes. They were mucking up the build
    
    * changed height of grid item for videos
    
    * cleaned up scss
    
    * minor spelling change
    
    * new album art
    
    * removed =nil from album page check, it was throwing an error
    
    * renamed new album page
    
    * updated track list
    
    * changed album image link
    
    * added nav bg image and updated it in nav design
    
    * 404 added
    
    * test cart added
    
    * added cashmusic cart and removed cards they replaced
    
    * ✔️ removed subnav links, using cart module now. added calendar image and linked it in footer instead of image on live site
    tmray authored Sep 14, 2016
    Configuration menu
    Copy the full SHA
    a1f4b2f View commit details
    Browse the repository at this point in the history
  2. Revert "New cart added to dev" (#5)

    accidentally pushed to personal account instead of org
    tmray authored Sep 14, 2016
    Configuration menu
    Copy the full SHA
    352b906 View commit details
    Browse the repository at this point in the history
Loading