Skip to content

Commit

Permalink
Merge pull request #18 from phillip-che/phillip-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewjunggg authored Dec 5, 2023
2 parents 36607b0 + aa164b7 commit ebac004
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 6 deletions.
6 changes: 6 additions & 0 deletions client/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,9 @@ a {
color-scheme: light;
}
}

@media only screen and (max-width: 1000px) {
.main {
margin: 0 auto;
}
}
2 changes: 1 addition & 1 deletion client/components/LoginFields.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const LoginFields = () => {
const handleCreateRoomClick = () => {
setUsername(usernameInput);
sessionStorage.setItem("username", usernameInput);
socket.emit(EVENTS.CLIENT.CREATE_ROOM, {username: username});
socket.emit(EVENTS.CLIENT.CREATE_ROOM, {username: usernameInput});
};

useEffect(() => {
Expand Down
8 changes: 8 additions & 0 deletions client/styles/ChatContainer.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
.chat-container {
display: flex;
width: 1000px;
}

@media only screen and (max-width: 1000px) {
.chat-container {
display: flex;
flex-direction: column;
width: auto;
}
}
19 changes: 19 additions & 0 deletions client/styles/ChatRoomInfo.css
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,23 @@
50% {
opacity: 0.6;
}
}

@media only screen and (max-width: 1000px) {
.chat-room-info {
margin: auto;
display: flex;
flex-direction: column;
height: auto;
width: 350px;
gap: 5px;
}
.user-list {
text-align: center;
margin-top: 5px;
margin-bottom: 30px;
}
.user-count {
justify-content: center;
}
}
7 changes: 7 additions & 0 deletions client/styles/HomeContainer.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,11 @@ h2 {
padding: 10rem;
box-shadow: 0 1px 1px 0 #3E3E3D, 0 6px 20px 0 #3E3E3D;
border-radius: 10px;
}

@media only screen and (max-width: 1000px) {
.home-container {
padding: 0rem;
box-shadow: none;
}
}
16 changes: 12 additions & 4 deletions client/styles/LeaveChatButton.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
transform: translateY(-8px);
}
}
.bob-on-hover {
.bob-on-hover {
display: inline-block;
vertical-align: middle;
-webkit-transform: perspective(1px) translateZ(0);
transform: perspective(1px) translateZ(0);
box-shadow: 0 0 1px rgba(0, 0, 0, 0);
}
.bob-on-hover:hover, .bob-on-hover:focus, .bob-on-hover:active {
}
.bob-on-hover:hover, .bob-on-hover:focus, .bob-on-hover:active {
-webkit-animation-name: bob-on-hover-float, bob-on-hover;
animation-name: bob-on-hover-float, bob-on-hover;
-webkit-animation-duration: .3s, 1.5s;
Expand All @@ -58,4 +58,12 @@
animation-fill-mode: forwards;
-webkit-animation-direction: normal, alternate;
animation-direction: normal, alternate;
}
}

@media only screen and (max-width: 1000px) {
.leave-room-button {
display: flex;
margin-left: 0px;
align-self: center;
}
}
7 changes: 6 additions & 1 deletion client/styles/MessageInput.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
display: flex;
width: 750px;
margin-top: 10px;

}

.send-message-button {
Expand All @@ -23,4 +22,10 @@

.file-upload label:hover {
opacity: 0.5;
}

@media only screen and (max-width: 1000px) {
.message-input {
width: auto;
}
}
6 changes: 6 additions & 0 deletions client/styles/MessagesContainer.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,10 @@
margin-top: 1rem;
overflow-x: hidden;
border-radius: 5px;
}

@media only screen and (max-width: 1000px) {
.messages-container {
width: 350px;
}
}

0 comments on commit ebac004

Please sign in to comment.