@@ -155,4 +246,4 @@
}
return passwordmatching;
}
-
+
\ No newline at end of file
diff --git a/website/profile.php b/website/profile.php
index 0ecdda1..2dc9891 100644
--- a/website/profile.php
+++ b/website/profile.php
@@ -1,18 +1,21 @@
-
-
-
+
+
-
+ /* Add your view files here. */
+ include("views/profile.php");
+
+ /* This adds the footer. */
+ include("views/footer.php");
+ ?>
+
diff --git a/website/search.php b/website/search.php
new file mode 100644
index 0000000..6a045c3
--- /dev/null
+++ b/website/search.php
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/website/settings.php b/website/settings.php
new file mode 100644
index 0000000..8d154b1
--- /dev/null
+++ b/website/settings.php
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css
new file mode 100644
index 0000000..f22de20
--- /dev/null
+++ b/website/styles/adminpanel.css
@@ -0,0 +1,63 @@
+.admin-panel {
+ margin: auto;
+ background-color: white;
+ border-radius: 10px;
+ padding: 15px;
+ box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+}
+
+.admin-actions {
+ display: inline-block;
+ margin: 10px;
+ vertical-align: top;
+}
+
+.admin-searchbar {
+ display: inline-block;
+ margin: 10px;
+ vertical-align: top;
+}
+
+.admin-searchinput {
+ border: 2px solid #B78996;
+ border-radius: 2px;
+ margin-bottom: 10px;
+}
+
+.admin-filter {
+ display: inline-block;
+ margin: 10px;
+ vertical-align: top;
+ margin-right: 100px;
+}
+
+
+.admin-users {
+ margin: 10px;
+}
+
+.usertable {
+ width: 100%;
+}
+
+.usertable .table-checkbox {width: 20px}
+.usertable .table-username {width: 150px}
+.usertable .table-status {width: 100px}
+.usertable .table-action {width: 200px}
+
+.usertable th, td {
+ border-bottom: 1px solid #ddd;
+ padding: 3px;
+}
+
+.usertable tr {
+ text-align: left;
+}
+
+.usertable tr:hover {
+ background-color: #f5f5f5;
+}
+
+/*div {
+ border: 1px solid black;
+}*/
diff --git a/website/styles/chat.css b/website/styles/chat.css
index 6874372..7df2169 100644
--- a/website/styles/chat.css
+++ b/website/styles/chat.css
@@ -19,9 +19,7 @@
}
.chat-recent, .chat-history {
- border-radius: 20px;
width: 100%;
- background-color: white;
}
/* List of chats. */
@@ -47,7 +45,7 @@
.chat-history {
overflow-y: auto;
height: 100%;
- padding-bottom: 10px;
+ padding: 0 0 10px 0;
}
.chat-message {
@@ -80,20 +78,35 @@
/* Chat reply field */
.chat-field {
- padding: 15px;
+ width: 100%;
+ padding: 15px 0;
+ display: table;
}
-.chat-field input {
- border-radius: 8px;
+.chat-field form {
+ width: 100%;
+ overflow: hidden;
+}
+
+.chat-field span {
+ display: block;
+ overflow: hidden;
}
.chat-field input[type="text"] {
- width: calc(100% - 80px);
+ width: 100%;
+ border-top-left-radius: 10px;
+ border-bottom-left-radius: 10px;
+ box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
.chat-field input[type="submit"] {
- width: 60px;
+ width: auto;
+ float: right;
background-color: #845663;
color: white;
- padding: 5px;
+ padding: 5px 10px;
+ border-top-right-radius: 10px;
+ border-bottom-right-radius: 10px;
+ box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
\ No newline at end of file
diff --git a/website/styles/header.css b/website/styles/header.css
index dfbd8a0..ffeaab6 100644
--- a/website/styles/header.css
+++ b/website/styles/header.css
@@ -26,16 +26,13 @@ header {
}
#header-search input[type="text"] {
- padding: 5px 10px;
- height: 19px;
-
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}
-#header-search input[type="submit"] {
- margin: 0 0 0 -4px;
- padding: 5px;
+#header-search input[type="submit"] {
+ background: none;
+ color: white;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}
diff --git a/website/styles/main.css b/website/styles/main.css
index d109a3e..1346635 100644
--- a/website/styles/main.css
+++ b/website/styles/main.css
@@ -41,6 +41,14 @@ body {
min-height: 100%;
}
+.platform {
+ padding: 20px;
+ margin-bottom: 10px;
+ border-radius: 10px;
+ background-color: #FFFFFF;
+ box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+}
+
::selection {
background: #845663;
color: white;
@@ -58,11 +66,6 @@ body {
border: 0;
}
-
-input[type="text"] {
- padding: 5px;
-}
-
/* Move element down (clear), below floating elements */
.clear {
clear: both;
@@ -99,6 +102,10 @@ h5 {
font-size: 1.4em;
}
+ul {
+ list-style-type: none;
+}
+
p {
font-size: 1.2em;
}
@@ -108,6 +115,21 @@ a, a:link, a:visited, a:hover, a:active {
text-decoration: none;
}
+button, input, select {
+ width: auto;
+ height: 32px;
+ padding: 0 5px;
+
+ background: white;
+ color: #3333333;
+
+ cursor: pointer;
+ border: none;
+
+ font-family: Arial;
+ font-size: 16px;
+}
+
/* Tables */
table {
border-spacing: 0;
@@ -120,11 +142,12 @@ td {
}
/* Custom title box, appears instantaneously */
-a:hover {
+a[data-title]:hover, img[data-title]:hover, span[data-title]:hover, div[data-title]:hover {
position: relative;
}
-a[data-title]:hover:after {
+a[data-title]:hover:after, img[data-title]:hover:after, span[data-title]:hover:after,
+div[data-title]:hover:after{
content: attr(data-title);
padding: 4px 4px;
color: #FFFFFF;
@@ -140,4 +163,7 @@ a[data-title]:hover:after {
-webkit-box-shadow: 0px 0px 4px #222;
box-shadow: 0px 0px 4px #222;
background-color: #333;
+ font-size: 15px;
+ line-height: normal;
+ font-family: Arial, sans-serif;
}
diff --git a/website/styles/profile.css b/website/styles/profile.css
index da4cc64..1ac9a2b 100644
--- a/website/styles/profile.css
+++ b/website/styles/profile.css
@@ -1,14 +1,10 @@
-.profile-box, .item-box, .post-box {
- box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
-}
-
.profile-box {
min-height: 150px;
padding: 25px;
background-color: #FFFFFF;
}
-.profile-box .profile-picture {
+.profile-box .profile-picture, .profile-box .group-picture {
width: 150px;
height: 150px;
margin: 0 20px 20px 0;
@@ -18,45 +14,80 @@
padding-top: 50px;
}
-.item-box {
- width: calc(50% - 60px);
+.item-box, .item-box-full-width {
margin: 20px 0 0 0;
padding: 25px;
background-color: #FFFFFF;
}
+.item-box {
+ width: calc(50% - 60px);
+}
+
+@media only screen and (max-width: 900px) {
+ .item-box {
+ width: calc(100% - 50px);
+ }
+}
+
+.item-box-full-width {
+ width: calc(100% - 50px);
+}
+
.posts {
- background-color: red;
- margin-top: 20px;
+ z-index: -1;
+ margin-right: 0;
+ width: calc(100% + 15px);
}
.post-box {
- float: left;
- width: 250px;
- margin: 20px 20px 0 0;
+ display: inline-flex;
+ margin: 20px 15px 0 0;
padding: 25px;
background-color: #FFFFFF;
}
-.post-box img {
- width: 250px;
+/* fullscreen */
+.post-box {
+ width: calc(25% - 68px);
}
-.post-box .post-date {
+@media only screen and (max-width: 1500px) {
+ .post-box {
+ width: calc(50% - 67px);
+ }
+}
+
+/* mobile */
+@media only screen and (max-width: 1000px) {
+ .post-box {
+ width: calc(100% - 65px);
+ }
+}
+
+.post {
+ width: 100%;
+}
+
+.post img {
+ width: 100%;
+}
+
+.post .post-date {
float: right;
color: #aaaaaa;
font-size: 0.8em;
}
-.friend-request {
+.profile-button {
float: right;
padding: 10px;
- border-radius: 3px;
+ border-radius: 5px;
background-color: #845663;
color: #FFFFFF;
transition-duration: 250ms;
}
-.friend-request:hover {
+.profile-button:hover {
background-color: #B78996;
}
\ No newline at end of file
diff --git a/website/styles/search.css b/website/styles/search.css
new file mode 100644
index 0000000..912723e
--- /dev/null
+++ b/website/styles/search.css
@@ -0,0 +1,3 @@
+.search-form input {
+ border-bottom: #845663 solid 1px;
+}
\ No newline at end of file
diff --git a/website/styles/settings.css b/website/styles/settings.css
new file mode 100644
index 0000000..933f8b0
--- /dev/null
+++ b/website/styles/settings.css
@@ -0,0 +1,33 @@
+.settings {
+
+}
+
+.settings input,
+.settings textarea{
+ padding: 10px;
+ margin: 5px;
+ border-radius: 10px;
+ width: 200px;
+}
+
+.settings label {
+ width: 125px;
+ display: inline-block;
+ text-align: right;
+}
+
+.settings input[type="password"],
+.settings input[type="text"],
+.settings input[type="date"],
+.settings input[type="email"],
+.settings textarea{
+ border: 1px solid black;
+}
+
+.settings-password {
+
+}
+
+.settings-profile {
+
+}
\ No newline at end of file
diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php
new file mode 100644
index 0000000..2723e40
--- /dev/null
+++ b/website/views/adminpanel.php
@@ -0,0 +1,97 @@
+
+
+
+
+
+
Admin Panel
+
+
+
+
+
+
diff --git a/website/views/chat-view.php b/website/views/chat-view.php
index d0a3f53..99a64fc 100644
--- a/website/views/chat-view.php
+++ b/website/views/chat-view.php
@@ -1,7 +1,7 @@
-
-