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 committed Mar 20, 2021
2 parents d90c866 + 8edc1ea commit 1f465c8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
1 change: 1 addition & 0 deletions public/assets/css/styles_login.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ body{
opacity: 0.9;
position: relative;
background-image: url(../resources/pexels-damon-hall-1705254.jpg);

}


Expand Down
19 changes: 11 additions & 8 deletions public/assets/css/styles_threadView.css
Original file line number Diff line number Diff line change
Expand Up @@ -338,14 +338,14 @@ body{
}

.btn-group .item.sender{
font-size: 1.1rem;
font-size: 0.95rem;
margin-bottom: 3px;
}
.btn-group .item.date{
float: right;
}
.btn-group .type{
font-size: 1.1rem;
font-size: 0.95rem;
font-weight: 500;
}

Expand Down Expand Up @@ -392,15 +392,17 @@ body{
padding: 10px;
margin: 5px;
cursor: pointer;
width: 100px;
width: 115px;
display: inline-block;
text-align: center;
visibility: hidden;
font-size: 1.3rem;
font-size: 1.0rem;
position: relative;
transition: all .3s;
}
.replyBtn{
background: linear-gradient(to right, #bdc3c7, #2c3e50);
/*background: linear-gradient(to right, #bdc3c7, #2c3e50);*/
background-color:#1f363d;
}
.acceptBtn{
background: linear-gradient(to right, #02aab0, #00cdac);
Expand All @@ -410,7 +412,8 @@ body{
}

.replyBtn:hover{
background: linear-gradient(to right, #2c3e50, #bdc3c7);
/*background: linear-gradient(to right, #2c3e50, #bdc3c7);*/
background: #40798c;
}
.acceptBtn:hover{
background: linear-gradient(to right, #00cdac, #02aab0);
Expand All @@ -422,8 +425,8 @@ body{
.acceptBtn:active,
.declineBtn:active,
.replyBtn:active{
top: 2px;
right: 2px;
top: 1px;
right: 1px;
}

.reply-btn-group.visible button{
Expand Down
Binary file not shown.
Binary file not shown.

0 comments on commit 1f465c8

Please sign in to comment.