Skip to content
This repository has been archived by the owner. It is now read-only.

Pull Request for New Variable Changes #49

Merged
merged 8 commits into from Feb 11, 2015
Merged

Pull Request for New Variable Changes #49

merged 8 commits into from Feb 11, 2015

Commits on Feb 3, 2015

  1. Synced with Master 

    Syncing with Master using github terminal commands
    Jessika Mika Caldera authored and Jessika Mika Caldera committed Feb 3, 2015
    Copy the full SHA
    520f207 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.uconn.edu/jem08002/sherman 

    Conflicts:
	css/sherman-black.css
	css/sherman-blue.css
	css/sherman-grey.css
	css/sherman-red.css
	sass/sherman-common.scss
    Jessika Mika Caldera authored and Jessika Mika Caldera committed Feb 3, 2015
    Copy the full SHA
    683221e View commit details
    Browse the repository at this point in the history

  3. Committed with conflicts 

    Conflict kill my soul.
    Jessika Mika Caldera authored and Jessika Mika Caldera committed Feb 3, 2015
    Copy the full SHA
    b80bcef View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2015

  1. Starting Changes to Cal #1 

    Starting changes to cal #1
    Jessika Mika Caldera authored and Jessika Mika Caldera committed Feb 5, 2015
    Copy the full SHA
    590c3ae View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2015

  1. Changes to Sherman Color Variables 

    Mega footer changes
Calendar Changes
Search Bar: Header, Content, and footer
    Jessika Mika Caldera authored and Jessika Mika Caldera committed Feb 10, 2015
    Copy the full SHA
    5acc006 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2015

  1. Syncing up with Sherman Master 

    Syncing up with sherman master, conflicts only found in
sherman-common.scss
    Jessika Mika Caldera authored and Jessika Mika Caldera committed Feb 11, 2015
    Copy the full SHA
    1266c67 View commit details
    Browse the repository at this point in the history

  2. Check compile with New cornerstone 

    Checking to see if it complied correctly.
    Jessika Mika Caldera authored and Jessika Mika Caldera committed Feb 11, 2015
    Copy the full SHA
    a413919 View commit details
    Browse the repository at this point in the history

  3. Committing with new cornerstone 

    Compiling Sherman with most recent cornerstone.
    Jessika Mika Caldera authored and Jessika Mika Caldera committed Feb 11, 2015
    Copy the full SHA
    46dc4e7 View commit details
    Browse the repository at this point in the history