Skip to content
This repository was archived by the owner on Aug 17, 2024. It is now read-only.

This is our group project. #3

Open
rajgthub wants to merge 9 commits into
base: master
Choose a base branch
from
Open

This is our group project. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
65e40eb
Add border to header button
rajgthub Apr 2, 2018
bb6b9d6
Merge pull request #1 from rajgthub/group_changes_messagingApp
rajgthub Apr 2, 2018
2c8e484
change margine
Apr 3, 2018
f1abe1f
change margin and broder-radius
Apr 3, 2018
57c6ef6
Merge pull request #2 from Eliasadam/group_changes_messagingApp
rajgthub Apr 4, 2018
6fb9445
Merge pull request #3 from rajgthub/group_changes_messagingApp
rajgthub Apr 4, 2018
18da49f
Add footer with fully extende bottom bar and white background
rajgthub Apr 5, 2018
f480ff2
Merge branch 'group_changes_messaginApp'
rajgthub Apr 5, 2018
8d8da7b
Resolve conflict
rajgthub Apr 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="site-wrapper">
<header class="site-header">
<h1 class="site-header__title">Messages</h1>
<a href="#" class="button">My Archives</a>
<a href="#" class="button button--clear">My Archives</a>
</header>
<div class="messages">
<div class="message">
Expand Down Expand Up @@ -50,10 +50,12 @@ <h1 class="site-header__title">Messages</h1>
</div>
</div>
</div>
<form class="add-message">
<input type="text" class="add-message__input" placeholder="What would you like to say?">
<button class="button">Send</button>
</form>
<footer class="site-footer">
<form class="add-message">
<input type="text" class="add-message__input" autofocus placeholder="What would you like to say?">
<button class="button">Send</button>
</form>
</footer>
</div>
</body>

Expand Down
19 changes: 16 additions & 3 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@ input {
text-decoration: none;
cursor: pointer;
}

.button--clear {
border: 1px solid #fff;
box-shadow: 2px 2px #00000054;
}
/* Site title and top navigation */
.site-header {
.site-header, .site-footer {
display: flex;
justify-content: space-between;
align-items: center;
Expand All @@ -59,7 +62,7 @@ input {
padding: 0.5rem;
font-size: 14px;
line-height: 1.8em;
border-radius: 2px;
border-radius: 10px;
background: #fff;
box-shadow: 0 2px 2px rgba(0,0,0,0.1);
}
Expand All @@ -68,6 +71,7 @@ input {
font-size: 12px;
font-weight: 700;
color: rgba(0,0,0,0.6);

}

.message__content {
Expand All @@ -84,6 +88,12 @@ input {
.add-message {
padding: 0.5rem 1rem;
}
.message--self{
margin-left: 6rem;
border-color: rgb(21, 165, 223);
border-radius: 10PX;

}

.add-message__input {
padding: 0.25em 0.5em;
Expand All @@ -92,3 +102,6 @@ input {
box-shadow: 0 2px 2px rgba(0,0,0,0.1);
background: #fff;
}
.site-footer{
background: white;
}