Skip to content

Commit

Permalink
Merge branch 'master' into akhil
Browse files Browse the repository at this point in the history
  • Loading branch information
ishika1727 authored Oct 10, 2021
2 parents 3ab2dcc + 58239d3 commit 7f39705
Show file tree
Hide file tree
Showing 6 changed files with 378 additions and 45 deletions.
2 changes: 2 additions & 0 deletions .replit
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
language = "html"
run = "run index.html"
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ Check it out [here](https://ishika1727.github.io/Stress-master/)!
### Frontend:
* HTML
* CSS
* Boostrap
* Bootstrap
* Javascript

### Backend+db (preferred):
* NodeJS
* EpressJS
* ExpressJS
* MongoDB

### Learning the Tech Stack
1. HTML: https://www.w3schools.com/html/
2. CSS: https://www.w3schools.com/css/
3. BOOSTRAP: https://www.w3schools.com/bootstrap/
4. JAVSCRIPT: https://www.w3schools.com/js/
3. BOOTSTRAP: https://www.w3schools.com/bootstrap/
4. JAVASCRIPT: https://www.w3schools.com/js/

## Components

Expand All @@ -36,7 +36,7 @@ It contains a small test where users enter the values based on their experience
This section provides user with methods to reduce stress through calm music, motivational videos, etc. Contact to counsellor option is also given to seek proper help when and if necessary.

## Ongoing work :woman_technologist:
Creating and linking to database using MonoDB and NodeJS
Creating and linking to database using MongoDB and NodeJS

## Screenshots

Expand Down
1 change: 0 additions & 1 deletion css/clone.css
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ a:hover, a:active
display: flex;
flex-direction: column;
width: 100%;
height: 40vh;
background-color: black;
justify-content: flex-start;
align-items: left;
Expand Down
5 changes: 3 additions & 2 deletions css/clonediet.css
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ a:link, a:visited
font-weight: bold;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;;
padding: 14px 25px;
z-index:2;
z-index:2;
}
.plan
{
Expand All @@ -69,9 +69,10 @@ a:link, a:visited
max-width: 490px;
margin: 50px auto;
background: #fff;
opacity: 0.6;
border-radius: 2px;
padding: 30px;
font-family: Georgia, "Times New Roman", Times, serif;
font-family: Georgia, "Times New Roman", Times, serif;
}
.form h1
{
Expand Down
Loading

0 comments on commit 7f39705

Please sign in to comment.