mozilla / makerstrap

A bootstrap extension for Webmaker
http://mozilla.github.io/makerstrap/demo
21 stars 22 forks source link

Style updates for navbars #44

Closed k88hudson closed 10 years ago

k88hudson commented 10 years ago

Small style tweaks to navbars to bring them closer to webmaker.org

For all navbars:

For .navbar-inverse, we need

Current: image

Intended: image

k88hudson commented 10 years ago

Looks good to land except for that one type -- fix that up and merge this

k88hudson commented 10 years ago

Yep, looks good now - just needs a rebase

k88hudson commented 10 years ago

@mlveis hey can you rebase and merge this?

mlveis commented 10 years ago

@k88hudson I tried rebasing this and I no longer have any merge conflicts and the pull request can be merged. The only thing is that it is showing everything I pulled over as new stuff in the commit and I am not sure if that is suppose to be happening or not.

mlveis commented 10 years ago

@k88hudson I think this should be ok now, do you want to just check it one more time and then i'll merge it if its ok.

k88hudson commented 10 years ago

R+ merge away