-
Notifications
You must be signed in to change notification settings - Fork 2
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
PixelMedia1
wants to merge
216
commits into
pix-app
Choose a base branch
from
master
base: pix-app
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
b #29
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: css/pix.css less/html.less
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
Correccion URL ajax
probando con url directa
Usar Url directa de app node
pix embed & print url
ruta de reemplazo de los iconos
ruta absoluta a los iconos
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
b