Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync main with develop #205

Merged
merged 37 commits into from Jan 2, 2022
Merged

Sync main with develop #205

merged 37 commits into from Jan 2, 2022

Conversation

Rucha1499
Copy link
Contributor

Sync main with develop

Manie-oss and others added 30 commits October 16, 2021 16:15
* added a link for a particular FAQ

* removed inline style to class

* renamed the class

* renamed the class

* renamed the class

* formatted with prettier

* simplified js code

* modified js code

* simplified js code

* removed unnecessary console logs

* modified js code

* modified js code

* button content is made empty and set using css

* removed the inner loop which was used to handle the button inner content

* added pseudo selectors on button

* removed the unused id

* added the vairable for expand button icon
* changes to my owm repo

* responsive welcome website

* JS file modified

* Conflicts resolved

* final changes to CSS made

* changes to CSS made

* changes to my owm repo

* responsive welcome website

* JS file modified

* Conflicts resolved

* final changes to CSS made

* changes to CSS made

* files changed

* pictures added

* changes to my owm repo

* merge conflicts resolved

* Conflicts resolved

* changes to CSS made

* pictures added

* renamed files

* deleted unwanted pic folder

* corrected backward slashes

* unutilized classes removed

* Js variable names changed

* added ref

* removed target

* added target to navbar

* spelling changes made
* merged first and second screen

* added shorthand css properties

* added class to h3

* merged first and second screen
* re-designed header and nav bar

* final changes for header and navbar made

* requested changes made

* Added changes for resdesign of welcome site

* Added prettier  changes for all html files

* Added rem for font-size

* made requested changes to he code

* commented code removed

* navbar contens styling enhanced

* hover effect given to nav contents

* unwanted file removed

* added link to new-feeds container

* Revert "re-designed header and nav bar"

* Added requested changes

* Delete .DS_Store

* Delete .DS_Store

* add link for a particular FAQ (#188)

* added a link for a particular FAQ

* removed inline style to class

* renamed the class

* renamed the class

* renamed the class

* formatted with prettier

* simplified js code

* modified js code

* simplified js code

* removed unnecessary console logs

* modified js code

* modified js code

* button content is made empty and set using css

* removed the inner loop which was used to handle the button inner content

* added pseudo selectors on button

* removed the unused id

* added the vairable for expand button icon

* Implement the top part of the new design of homepage

* changes to my owm repo

* responsive welcome website

* JS file modified

* Conflicts resolved

* final changes to CSS made

* changes to CSS made

* changes to my owm repo

* responsive welcome website

* JS file modified

* Conflicts resolved

* final changes to CSS made

* changes to CSS made

* files changed

* pictures added

* changes to my owm repo

* merge conflicts resolved

* Conflicts resolved

* changes to CSS made

* pictures added

* renamed files

* deleted unwanted pic folder

* corrected backward slashes

* unutilized classes removed

* Js variable names changed

* added ref

* removed target

* added target to navbar

* spelling changes made

* redesign second screen (#178)

* merged first and second screen

* added shorthand css properties

* added class to h3

* merged first and second screen

* Added changes for resdesign of welcome site

* Added changes for resdesign of welcome site

* Added prettier  changes for all html files

* Delete .DS_Store

* Delete .DS_Store

* Added prettier for modified files

* Added css and html changes

* Added css changes

* Modified css changes

* Modified css changes

Co-authored-by: ghosharnab969 <ghosharnab969@gmail.com>
Co-authored-by: Pujarini Jena <pujarinijena@Pujarini-MacBook-Pro.local>
Co-authored-by: Rucha Patil <66248039+Rucha1499@users.noreply.github.com>
Co-authored-by: Mansi Patel <53491434+Manie-oss@users.noreply.github.com>
Co-authored-by: ARNAB GHOSH <66074296+ghosharnab969@users.noreply.github.com>
Co-authored-by: Ishika Baid <59817624+Ishikabaid@users.noreply.github.com>
fix for faq page css on develop branch
Link renamed css files to discord, coc and faq pages
Refactored linked pages and Image folder
@netlify
Copy link

netlify bot commented Jan 2, 2022

✔️ Deploy Preview for staging-welcome-site ready!

🔨 Explore the source changes: 2c830c7

🔍 Inspect the deploy log: https://app.netlify.com/sites/staging-welcome-site/deploys/61d14061653c79000827e2ac

😎 Browse the preview: https://deploy-preview-205--staging-welcome-site.netlify.app

@netlify
Copy link

netlify bot commented Jan 2, 2022

✔️ Deploy Preview for staging-welcome ready!

🔨 Explore the source changes: 2c830c7

🔍 Inspect the deploy log: https://app.netlify.com/sites/staging-welcome/deploys/61d1406161fea400070446ed

😎 Browse the preview: https://deploy-preview-205--staging-welcome.netlify.app

@Rucha1499 Rucha1499 merged commit bdca385 into main Jan 2, 2022
kush-x7 pushed a commit that referenced this pull request Nov 14, 2022
fix: undefined properties reading 'url'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants