UdacityMobileWebScholarship / showcase-app

This application is a collaborative project made by the Google Udacity Mobile Web Specialist Scholars.
13 stars 31 forks source link

Added Button component, set the theme colors and fonts #54

Open blenderskool opened 6 years ago

blenderskool commented 6 years ago

Fixes #48

Checklist

Changes proposed in this pull request:

blenderskool commented 6 years ago

@divyamrastogi I have improved the code based on your suggestions. Please let me know your thoughts :slightly_smiling_face: Also, thanks for all those hacks, they really made the code simpler and would surely benefit me in the future :+1:

anurag-majumdar commented 6 years ago

@divyamrastogi The code suggestions look great! Thanks for the detailed review.

divyamrastogi commented 6 years ago

@blenderskool : I've made a few changes for you and made a PR to your branch. You can merge that and then we'll merge this.

blenderskool commented 6 years ago

@divyamrastogi I see a merge conflict because of App.css file. Some help needed :sweat_smile:

saini-himanshu commented 6 years ago

Same problem happened with me divyam helped me with this -

App.css was deleted from the master. So, you don't have to push it. Just run the following in you command line:

rm src/App.css && git add . && git commit After that just save it. Then push your branch again.

blenderskool commented 6 years ago

Thanks @saini-himanshu