Skip to content

Commit

Permalink
Merge branch 'working' of https://github.com/Oshanath/WebApp into wor…
Browse files Browse the repository at this point in the history 
…king
  • Loading branch information
@Oshanath
Oshanath committed Mar 16, 2021
2 parents 12e85e3 + e83089d commit 1451702
Show file tree
Hide file tree
Showing 29 changed files with 210 additions and 79 deletions.
Binary file removed profilePics/7f4cea96-932d-42b1-bec9-ae7e5fec8090-DSC_1867.JPG
View file
Binary file not shown.
Binary file added profilePics/b05480b5-eff3-41a6-9352-734a64d7538c-Prof.JPG
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/assets/css/deleteAcc_styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ body{

.container{
background-color:rgba(255,255,255,0.7);
border-radius: 10px;
border-radius: 15px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
width: 35%;
max-width: 100%;
Expand Down
77 changes: 65 additions & 12 deletions public/assets/css/forgotPassword_styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@ body{
justify-content: center;
min-height: 100vh;
margin: 0;
background-image: linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0.2)),url(/resources/casey-horner-9XRpNnTqdJE-unsplash.jpg);
background-image: linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0.2)),url(../resources/pexels-pixabay-326240.jpg);
background-size: cover;
width: 100%;
height: 100%;
font-family: 'Ubuntu', sans-serif;
}

.container{
background-color:rgba(207,224,195,0.5);
border-radius: 40px;
background-color:rgba(255,255,255,0.8);
border-radius: 15px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3);
width: 450px;
width: 35%;
max-width: 100%;
opacity: 0.8;
height: 450px;
position: relative;
}

Expand All @@ -39,6 +40,9 @@ body{
position: relative;
color: white;
border-radius: 20px;
margin-top: 5%;
font-size: 17px;
font-weight: bold;
}

.form-control label{
Expand All @@ -48,15 +52,57 @@ body{
}

.form-control input{
border:none;
border-radius: 6px;
display: block;
font-size: 14px;
padding: 10px;
width: 100%;
/*border: 2px solid #f0f0f0;*/
border:none;
color: #373636;
font-weight: 520;
display: block;
font-size: 14.7px;
padding: 7px;
width: 100%;
outline: none;
background: transparent;
border-bottom: 2.3px solid black;
transition: all .3s;

}

.form-control input:-webkit-autofill {
-webkit-background-clip: text;
}

.form-control input:focus{
box-shadow: none;
outline: none;

border-color:#4E8975;
}

.form-control select:focus{
box-shadow: none;
outline: none;

border-color:#4E8975;
}
.form-control input::placeholder{
color: transparent;
}
.form-control input::placeholder{
color: transparent;
}

.form-control .form-label{
position: absolute;
transform: translateY(-1.6em);
transform-origin: 0 0;
transition: all .3s;
}

.form-control input:focus + .form-label,
.form-control input:not(:placeholder-shown) + .form-label{
transform: translateY(-2.9em) scale(0.8);

}
.form-control.success input{
border-color: #2ecc71;
}
Expand Down Expand Up @@ -119,9 +165,16 @@ body{
opacity: 2;
color: white;
outline-style: none;
position: relative;
position: absolute;
margin-left: 10%;
margin-top: 5%;


}
.img{
position: relative;
text-align: center;
}

.button:hover{
background-color: #70a9a1;
Expand Down
2 changes: 1 addition & 1 deletion public/assets/css/forgotPswChange_styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ body{

.container{
background-color:rgba(255,255,255,0.7);
border-radius: 10px;
border-radius: 15px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
width: 35%;
height: 550px;
Expand Down
2 changes: 1 addition & 1 deletion public/assets/css/styles_editProfile.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ body{

.container{
background-color:rgba(255,255,255,0.7);
border-radius: 10px;
border-radius: 15px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3);
width: 35%;
max-width: 100%;
Expand Down
59 changes: 37 additions & 22 deletions public/assets/css/styles_threadView.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*{
font-family: monospace;
font-family: 'Ubuntu', sans-serif;
}

*:focus {
Expand All @@ -10,7 +10,8 @@
width: 10px;
}
::-webkit-scrollbar-thumb{
background: linear-gradient(#bdc3c7 , #2c3e50);
/*background: linear-gradient(#bdc3c7 , #2c3e50);*/
background: #40798c;
border-radius: 6px;
}

Expand All @@ -21,7 +22,11 @@ body{
margin: auto;
width: 100%;
height: 100%;
background-image: url(../resources/threadViewBackground.png);
/*background-image: url(../resources/soft-cloudy-is-gradient-pastel-abstract-sky-background-sweet-color_6529-1434.jpg);*/
background-image: linear-gradient(rgba(0,0,0,0.2),rgba(0,0,0,0.2)),url(../resources/pexels-henry-&-co-2341290.jpg);
background-size:cover;
background-repeat: no-repeat;
background-attachment: fixed;
}

.navigation{
Expand All @@ -32,10 +37,11 @@ body{
height: 90px;
position: fixed;
display: block;
background: linear-gradient(to right, #42275a, #734b6d);
/*background: linear-gradient(to right, #42275a, #734b6d);*/
/* background: whitesmoke; */
background-color: #0f3443;
width: 100%;
opacity: 0.7;
font-family: 'Ubuntu', sans-serif;
}

.sidePanel,
Expand Down Expand Up @@ -73,14 +79,16 @@ body{
padding: auto;
background: transparent;
color: lightgrey;
width: 70px;
width: 80px;
height: 60px;
cursor: pointer;
justify-content: center;
outline: none;
font-family: monospace;
font-size: 1.2rem;
font-weight: 600;
font-family: 'Ubuntu', sans-serif;
font-size: 1.1rem;
font-weight: 500;
transition: all .3s;

}

.sidePanel button{
Expand All @@ -89,8 +97,9 @@ body{

.sidePanel button:hover,
.nav button:hover{
background: lightgrey;
color: black;
/*background: lightgrey;*/
color: white;
font-size: 1.15rem;
}

.sidePanel button:active,
Expand All @@ -114,15 +123,16 @@ body{
margin-left: auto;
margin-right: auto;
padding: 10px;
height: 500px;
height: 515px;
max-height: 100%;
box-sizing: border-box;
max-width: 100%;
opacity: 0.8;
/*opacity: 0.8;*/
border-radius: 10px;
background-image: url(../resources/background-test.jpg);
position: relative;
overflow: hidden;
margin-top: 3%;
/* box-shadow: -4px 4px 5px -1px rgba(0,0,0,0.75); */
/* background-color: grey; */
/* display: flex; */
Expand All @@ -131,7 +141,7 @@ body{

.column.left{
width: 30%;
margin-right: 2px;
margin-right: 3px;
/* background: linear-gradient(90deg, #757474 0%, #464646 49%, #080808 100%); */
}

Expand All @@ -145,13 +155,13 @@ body{
.search-bar input[type=text]{
/* float: left; */
display: inline;
padding: 6px;
padding: 9px;
border: 1px solid lightgrey;
margin: auto;
font-size: 15px;
width: 500px;
position: relative;
border-radius: 10px;
border-radius: 8px;
}

.searchButton{
Expand All @@ -160,13 +170,14 @@ body{
right: 5px;
background: white;
border: none;
border-radius: 50%;
border-radius: 30%;
margin-top: auto;
margin-bottom: auto;
padding: 5px;
}
.searchButton:hover{
background: whitesmoke;

}

.tab{
Expand All @@ -175,7 +186,8 @@ body{
position: fixed;
top: 0;
left: 0;
background: linear-gradient(to right, #bdc3c7 , #2c3e50);
background: linear-gradient(to right, #40798c ,#1f363d);
/*background: #40798c;*/
overflow-x: hidden;
padding-top: 60px;
z-index: 1;
Expand All @@ -189,12 +201,14 @@ body{
font-size: 36px;
margin: 0;
padding: 0;
color: white;
}

.tab a{
padding: 8px 8px 8px 32px;
text-decoration: none;
font-size: 25px;
font-weight: 500;
color: #818181;
display: block;
transition: 0.3s;
Expand All @@ -213,9 +227,10 @@ body{
outline: none;
text-align: left;
cursor: pointer;
font-size: 1.2rem;
font-size: 1.1rem;
transition: 0.3s;
position: relative;
font-family: 'Ubuntu', sans-serif;
}

.tab .material-icons{
Expand Down Expand Up @@ -289,7 +304,7 @@ body{
height: 60px;
display: block;
text-align: left;
font-family: monospace;
font-family: 'Ubuntu', sans-serif;
position: relative;
}

Expand Down Expand Up @@ -335,12 +350,12 @@ body{
}

.btn-group button:first-child{
border-radius: 10px 10px 0 0;
/*border-radius: 10px 10px 0 0;*/
border-top: none;
}

.btn-group button:last-child{
border-radius: 0 0 10px 10px;
/*border-radius: 0 0 10px 10px;*/
}

.btn-group button:hover {
Expand Down
Loading

0 comments on commit 1451702

Please sign in to comment.