diff --git a/.DS_Store b/.DS_Store index 8aff74e..ec8337d 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/chatmate-app.xd b/chatmate-app.xd index 8318228..b8aefca 100644 Binary files a/chatmate-app.xd and b/chatmate-app.xd differ diff --git a/css/groupchat.css b/css/groupchat.css new file mode 100644 index 0000000..fad37d0 --- /dev/null +++ b/css/groupchat.css @@ -0,0 +1,37 @@ +body{ + background-color: darkslateblue; + width: 90vw; + height: 100vh; + margin: 0 auto; +} + +#searchMsg{ + width:100%; + text-indent: 50px; + height: 30px; + background-color: #ffffff; + border-radius: 15px; + border:2px solid #f9d861; + font-family: 'Josefin Sans', sans-serif; + margin-left: 20px; +} + +.flex-box{ + display: flex; + align-items: center; + justify-content: space-around; + margin-top: 5vh; +} + +h2{ + color: white; + font-family: 'Josefin Sans', sans-serif; +} + +h4{ + font-family: 'Josefin Sans', sans-serif; + color: black; + background-color: #f9d861; + border-radius: 15px; + padding: 15px 10px; +} diff --git a/groupchat.html b/groupchat.html new file mode 100644 index 0000000..8da0279 --- /dev/null +++ b/groupchat.html @@ -0,0 +1,31 @@ + + + + + + + + + Group Chats + + +
+ + + + +
+
+

Channels

+

DMD3440 Chat Room

+

DMD3470 Scripting

+
+ +
+

Contacts

+

Joel Salisbury

+
+ + + + \ No newline at end of file diff --git a/imgs/.DS_Store b/imgs/.DS_Store index 2496990..203c0e1 100644 Binary files a/imgs/.DS_Store and b/imgs/.DS_Store differ diff --git a/imgs/back.png b/imgs/back.png deleted file mode 100644 index 7090789..0000000 Binary files a/imgs/back.png and /dev/null differ diff --git a/imgs/back.svg b/imgs/back.svg new file mode 100644 index 0000000..babe893 --- /dev/null +++ b/imgs/back.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/imgs/backbutton.png b/imgs/backbutton.png new file mode 100644 index 0000000..4e627ae Binary files /dev/null and b/imgs/backbutton.png differ diff --git a/imgs/sendbutton.svg b/imgs/sendbutton.svg new file mode 100644 index 0000000..b39ac5a --- /dev/null +++ b/imgs/sendbutton.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/index.html b/index.html index f02c6bb..6718ad9 100755 --- a/index.html +++ b/index.html @@ -12,7 +12,7 @@
- Menu Icon + Menu Icon

DMD3440 Chat Room

@@ -27,6 +27,7 @@
+
@@ -45,7 +46,8 @@ - + + \ No newline at end of file diff --git a/main.css b/main.css index c0e315d..4ef1e29 100755 --- a/main.css +++ b/main.css @@ -37,12 +37,15 @@ header{ } */ #chatBox p.user-message { - display: inline-block; - padding: 7px 10px; + float: right; + display: inline-block; + margin-top: 10px; + padding: 7px 10px; + margin-bottom: 5px; background-color:#3e2fae; color: white; border-radius: 10px 0px 10px 10px; - float: right; + } #chatBox p.other-message { @@ -53,7 +56,8 @@ header{ } #chatBox h4.user-name{ - text-align: right; + text-align: right; + padding-top: 50px; } #chatInput { @@ -88,6 +92,10 @@ header{ color:#fff; border-radius: 15px; } +#chatInput button:focus{ + background-color: #f9d861; + +} header p{ background-color: #3e2fae; @@ -121,4 +129,7 @@ h4{ .time-date{ font-size: 0.7em; color: #707070; +} +.input{ + text-align: left; } \ No newline at end of file diff --git a/profile.html b/profile.html index 0094c0f..c29a592 100644 --- a/profile.html +++ b/profile.html @@ -22,8 +22,10 @@
-

Username:

-

Status:

+

Username

+

+

Status

+