Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master

Merge branch 'master' of github.com:/malarkey/320andup

Conflicts:
	.gitignore
latest commit 3785b42274
Andy Clarke authored
..
Failed to load latest commit information.
upstarts Added @-viewport CSS
320andup-sass.sass update to match Andy's new stuff, again. :)
_1382.sass updating files to Andy's new stuff and cleaning up the compass files
_2x.sass updating files to Andy's new stuff and cleaning up the compass files
_480.sass updating files to Andy's new stuff and cleaning up the compass files
_600.sass updating files to Andy's new stuff and cleaning up the compass files
_768.sass update to match Andy's new stuff, again. :)
_992.sass updating files to Andy's new stuff and cleaning up the compass files
_buttons.sass Making Sass match the new LESS changes that Andy just made (error sty…
_colour.sass updating files again to match andy's stuff
_elements.sass updating files to Andy's new stuff and cleaning up the compass files
_font-awesome.sass updating files to Andy's new stuff and cleaning up the compass files
_forms.sass update to match Andy's new stuff, again. :)
_mixins.sass updating files again to match andy's stuff
_modernizr.sass updating files to Andy's new stuff and cleaning up the compass files
_page.sass update to match Andy's new stuff, again. :)
_print.sass updating files again to match andy's stuff
_reset.sass updating files to Andy's new stuff and cleaning up the compass files
_site.sass Added @-viewport CSS
_tables.sass updating files to Andy's new stuff and cleaning up the compass files
_texture.sass Making Sass match the new LESS changes that Andy just made (error sty…
_typography.sass updating files to Andy's new stuff and cleaning up the compass files
_variables.sass update to match Andy's new stuff, again. :)
Something went wrong with that request. Please try again.