Skip to content

Commit

Permalink
Bp 11 fix navigation and contact info (#17)
Browse files Browse the repository at this point in the history
* Download SCSS, fix project path for SCSS files, update ContactInfo and WIP for Navigation

* Finish refactoring SCSS for Navigation and TabDropdown, remove Theme JS from Material UI

* Revert "updated top bar colors"

This reverts commit 67ac0c8.

* Revert "Merge branch 'master' of https://github.com/MinhLu12/bergin-prosthodontics into BP-11_FixNavigationAndContactInfo"

This reverts commit 042ac1e, reversing
changes made to af4c1df.

* Revert "Revert "Merge branch 'master' of https://github.com/MinhLu12/bergin-prosthodontics into BP-11_FixNavigationAndContactInfo""

This reverts commit f0080a4.

* undid previous changes to Navigation.module.scss

s

Co-Authored-By: minhlu12 <[email protected]>
Co-Authored-By: micksumm <[email protected]>

* updated README.md to reflect recent changes

troubleshooting problems with BP-11 pull 17

Co-Authored-By: minhlu12 <[email protected]>
Co-Authored-By: micksumm <[email protected]>

* Remove ignore of package-lock.json sinc eit's actually important

Co-authored-by: Minh Lu <[email protected]>
Co-authored-by: minhlu12 <[email protected]>
Co-authored-by: micksumm <[email protected]>
  • Loading branch information
4 people authored Jul 3, 2020
1 parent 407015b commit 28bff9d
Show file tree
Hide file tree
Showing 6 changed files with 1,662 additions and 2,146 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
SASS_PATH=src/
NODE_PATH=src/
NODE_PATH=src/
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@

npm-debug.log*
yarn-debug.log*
yarn-error.log*
package-lock.json
yarn-error.log*
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ II. Steps to Run:
* Open Git-Bash
* Find the directory that contains the .json file
* Use npm to run the React application.
Type + enter 'npm install' to install npm. Type 'npm start' to launch the website in your browser
Type + enter 'npm install' to install npm. Type 'npm start' to launch the website in your browser. Make sure only to use npm ci in the build process to retain the dependency graph, and npm install to install specific dependencies.


NOTE: If you're running the website on a Windows machine, make sure to toggle the package.json and global.scss files to the LF end-of-line sequence mode! Otherwise you will get a build error in React.js
Expand Down
Loading

0 comments on commit 28bff9d

Please sign in to comment.