Fakultas Ilmu Komputer UI

Commit fadc24ef authored by Jonathan's avatar Jonathan
Browse files

Merge branch 'jonathan' into 'master'

Jonathan

See merge request !35
parents 300aeb66 2399fe19
...@@ -42,7 +42,7 @@ export default function Search(props) { ...@@ -42,7 +42,7 @@ export default function Search(props) {
</h1> </h1>
<ThreadList thread={threads} /> <ThreadList thread={threads} />
{totalItems == 0 && ( {totalItems == 0 && (
<p>Can't find any thread with your keyword.</p> <p>No threads with keyword "{searchParam}" found.</p>
)} )}
{totalItems != 0 && ( {totalItems != 0 && (
<div className="paginationContainer"> <div className="paginationContainer">
......
...@@ -112,20 +112,22 @@ export default function Thread(props) { ...@@ -112,20 +112,22 @@ export default function Thread(props) {
<div id="addCommentSection"> <div id="addCommentSection">
<h3>Write a Comment</h3> <h3>Write a Comment</h3>
<form onSubmit={handleSubmit}> <form onSubmit={handleSubmit}>
<textarea <div className="commentFormContainer">
className="commentBox" <textarea
placeholder="Write your comment here" className="commentBox"
required="false" placeholder="Write your comment here"
{...bindInput} required="false"
/> {...bindInput}
<div> />
<button <div>
className="submitComment" <button
id="addCommentButton" className="submitComment"
type="submit" id="addCommentButton"
> type="submit"
Post Comment >
</button> Post Comment
</button>
</div>
</div> </div>
</form> </form>
</div> </div>
......
...@@ -49,7 +49,7 @@ const Navbar = (props) => { ...@@ -49,7 +49,7 @@ const Navbar = (props) => {
className="form-control mr-sm-2" className="form-control mr-sm-2"
placeholder="Search thread" placeholder="Search thread"
aria-label="Search" aria-label="Search"
required={false} required="false"
{...bindSearch} {...bindSearch}
/> />
<button className="btn my-2 my-sm-0 search" type="submit"> <button className="btn my-2 my-sm-0 search" type="submit">
......
body {
min-height: 100vh;
}
@media only screen and (min-device-width : 320px) and (max-device-width : 480px) { @media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
p { p {
font-size: 14px; font-size: 14px;
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
align-items: center; align-items: center;
color: #003F5A; color: #003F5A;
font-family: "DM Sans"; font-family: "DM Sans";
margin-bottom: 184px; min-height: 100vh;
margin-bottom: 72px;
} }
.loginFormContainer h1{ .loginFormContainer h1{
......
.searchresultContainer { .searchresultContainer {
margin: 36px 72px margin: 36px 72px;
min-height: 100vh;
margin-bottom: 72px;
} }
.searchresultContainer h1{ .searchresultContainer h1{
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
margin-top: 36px; margin-top: 36px;
margin-left: 72px; margin-left: 72px;
margin-right: 72px; margin-right: 72px;
min-height: 100vh;
margin-bottom: 72px;
} }
.profile_section { .profile_section {
......
.formContainer { .formContainer {
margin: 36px 72px!important; margin: 36px 72px!important;
min-height: 100vh;
margin-bottom: 72px;
} }
.back { .back {
......
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
.listThreadsContainer { .listThreadsContainer {
margin-top: 36px; margin-top: 36px;
margin-left: 72px; margin-left: 72px;
margin-right:72px; margin-right: 72px;
min-height: 100vh;
margin-bottom: 72px;
} }
.header h1 { .header h1 {
......
...@@ -3,10 +3,11 @@ ...@@ -3,10 +3,11 @@
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
margin-top: 36px; margin-top: 36px;
margin-bottom: 36px;
font-family: "DM Sans"; font-family: "DM Sans";
margin-left: 72px; margin-left: 72px;
margin-right: 72px; margin-right: 72px;
min-height: 100vh;
margin-bottom: 72px;
} }
.back { .back {
...@@ -53,7 +54,7 @@ ...@@ -53,7 +54,7 @@
} }
.commentBox { .commentBox {
min-width: 1120px; min-width: 1056px;
max-width: 1776px; max-width: 1776px;
font-family: "DM Sans"; font-family: "DM Sans";
height: 120px; height: 120px;
...@@ -83,6 +84,11 @@ textarea:focus { ...@@ -83,6 +84,11 @@ textarea:focus {
margin-bottom: 0px!important; margin-bottom: 0px!important;
} }
.commentFormContainer {
display: flex;
flex-direction: column;
}
@media only screen and (min-device-width : 320px) and (max-device-width : 480px) { @media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
.threadContainer { .threadContainer {
margin-top: 24px; margin-top: 24px;
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
margin-top: 36px; margin-top: 36px;
margin-left: 72px; margin-left: 72px;
margin-right: 72px; margin-right: 72px;
min-height: 100vh;
margin-bottom: 72px;
} }
.header h1 { .header h1 {
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
.topics { .topics {
display: flex; display: flex;
justify-content: center;
} }
.topicCards { .topicCards {
...@@ -51,6 +50,11 @@ ...@@ -51,6 +50,11 @@
font-size: 16px; font-size: 16px;
} }
.topicCard {
width: 200px;
min-height: 108px;
}
.topicContainer h1{ .topicContainer h1{
font-family: "DM Sans"; font-family: "DM Sans";
font-size: 28px; font-size: 28px;
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
justify-content: space-between; justify-content: space-between;
font-family: "DM Sans"; font-family: "DM Sans";
padding: 36px 72px; padding: 36px 72px;
margin-top: 72px;
} }
#fasilkomLogo p { #fasilkomLogo p {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment