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.

Sign up for GitHub

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

Jump to bottom

Avoid conflicts with existing stylesheets by adding specifity to css files. #36

Closed
wants to merge 9 commits into from
Closed

Avoid conflicts with existing stylesheets by adding specifity to css files. #36

wants to merge 9 commits into from

Commits on Sep 13, 2013

  1. Update README.md

    @mduvall
    mduvall committed Sep 13, 2013
    Configuration menu
    Copy the full SHA
    8ca77fd View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2013

  1. Moved body styles to index.html. Cleaned css files to avoid conflicts… 

    … with existing stylesheets.
    @teemualap
    teemualap committed Sep 15, 2013
    Configuration menu
    Copy the full SHA
    df86f24 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2013

  1. Merge pull request #37 from mduvall/css-animations 

    CSS animations
    @mduvall
    mduvall committed Sep 16, 2013
    Configuration menu
    Copy the full SHA
    cbd9aa4 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2013

  1. Add opts with animate parameter

    @mduvall
    mduvall committed Sep 17, 2013
    Configuration menu
    Copy the full SHA
    23f158b View commit details
    Browse the repository at this point in the history

  2. Update README with optional parameters

    @mduvall
    mduvall committed Sep 17, 2013
    Configuration menu
    Copy the full SHA
    a9f7552 View commit details
    Browse the repository at this point in the history

  3. Move included files in README

    @mduvall
    mduvall committed Sep 17, 2013
    Configuration menu
    Copy the full SHA
    2ac5edb View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2013

  1. Moved body styles to index.html. Cleaned css files to avoid conflicts… 

    … with existing stylesheets.
    @teemualap
    teemualap committed Sep 21, 2013
    Configuration menu
    Copy the full SHA
    1a0daa8 View commit details
    Browse the repository at this point in the history

  2. Bootstrap 2 compatibility.

    @teemualap
    teemualap committed Sep 21, 2013
    Configuration menu
    Copy the full SHA
    34f9d6c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'clean-css' of https://github.com/teemualap/grande.js in… 

    …to clean-css-pull

Conflicts:
	css/editor.css
	css/menu.css
	index.html
    @teemualap
    teemualap committed Sep 21, 2013
    Configuration menu
    Copy the full SHA
    a1b7b9a View commit details
    Browse the repository at this point in the history