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

b #29

Open
wants to merge 216 commits into
base: pix-app
Choose a base branch
from
Open

b #29

wants to merge 216 commits into from

Conversation

PixelMedia1
Copy link

b

hspencer and others added 30 commits August 5, 2014 22:59
Conflicts:
	css/pix.css
	less/html.less
grunt-webfont full integration
now PiX.css is loaded separately
styles (/css) is for general purpose styling and pix (/fonts) is the
font styles that can be re-used
possible collisions with grunt exported file
removed the ‘arrow-‘ or ‘arrows-‘ prefix
no hands, just the touching points
Conflicts:
	.gitignore
	build/fonts/Pix-ae653cea290ff6ab86c68c76b7acc221.eot
	build/fonts/Pix-ae653cea290ff6ab86c68c76b7acc221.svg
	build/fonts/Pix-ae653cea290ff6ab86c68c76b7acc221.ttf
	build/fonts/Pix-ae653cea290ff6ab86c68c76b7acc221.woff
	build/fonts/Pix.css
	build/fonts/Pix.html
	pix.sublime-workspace
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants