Skip to content
This repository has been archived by the owner on Dec 23, 2021. It is now read-only.

Styles #141

Merged
merged 9 commits into from
Jul 15, 2016
Merged

Styles #141

merged 9 commits into from
Jul 15, 2016

Conversation

Kriesse
Copy link
Contributor

@Kriesse Kriesse commented Jul 15, 2016

This branch has a lot of cleanups in the mains.scss (removing unused styles, rewriting vanilla css to make use of scss nesting and variables, add a little breakpoint testing class).
I also started to style the header and dat layout to look like the mockups and reuse styles already built for dat-desktop.

This might overlap and not merge well with the ongoing work in the header branch – let me know if I can help to untangle.

Kriesse added 4 commits July 14, 2016 11:11
replace pngs with svgs
update dat-design
clean up scss and remove unused styles
# Conflicts:
#	src/scss/main.scss
# Conflicts:
#	src/scss/main.scss
…or stays neutral, which helps with adjusting text colors for legibility etc.)
@okdistribute
Copy link
Collaborator

no worries, I will do the untangling today!

@okdistribute okdistribute merged commit 2a7daf6 into master Jul 15, 2016
@okdistribute okdistribute deleted the styles branch July 15, 2016 23:19
@laurengarcia laurengarcia mentioned this pull request Aug 3, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants