merge

2 files changed, 115 insertions, 7 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 5922ab5..17a7dc0 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -161,23 +161,26 @@ h5 {
   text-align:center;
 }
 
-.page .profile {
+.page.profile {
   color:white;
 }
-.page table {
+.page table.demo,
+.page table.profilepage,
+.page table.projectList {
   width: 100%;
   border-top: 1px solid;
   margin: 40px 0 0 0;
   border-spacing: 0;
-  clear:nboth;
+  clear: both;
 }
-.page tr {
+.page table.profilepage tr,
+.page table.projectList tr {
   height: 400px;
 }
 .page table.showcase {
   height:70vh;
 }
-.page table td.border {
+.page table.projectList td.border {
 	position: relative;
   border-right: 1px solid;
 }
@@ -191,7 +194,9 @@ iframe.embed {
 	z-index: -1;
 	pointer-events: none;
 }
-.page table td {
+.page table.demo td,
+.page table.profilepage td,
+.page table.projectList td {
   width: 33.3333%;
   background-size: cover;
   background-repeat: no-repeat;
@@ -238,7 +243,7 @@ iframe.embed {
   color:white;
 }
 
-#projectList .editBtn {
+.projectList .editBtn {
   position: absolute;
   right: 10px;
   top: 10px;
diff --git a/public/assets/stylesheets/staff.css b/public/assets/stylesheets/staff.css
new file mode 100644
index 0000000..aa21f9b
--- /dev/null
+++ b/public/assets/stylesheets/staff.css
@@ -0,0 +1,103 @@
+* {
+  font-weight: 300;
+}
+th, b {
+  font-weight: bold;
+}
+table {
+  display: inline-block;
+  margin-right: 40px;
+  vertical-align: top;
+}
+td, th {
+  text-align: left;
+  padding: 2px 5px;
+}
+.page {
+  text-align: left;
+}
+.footer {
+  text-align: center;
+}
+h1 {
+  text-align: left;
+  display: inline-block;
+}
+nav {
+  display: inline-block;
+  text-align: left;
+}
+nav a {
+  padding-left: 20px;
+}
+hr {
+  border: 1px solid #bbb;
+  margin: 5px auto 10px;
+}
+.body {
+  width: 80%;
+  margin: 0 auto;
+}
+.json {
+  display: none;
+}
+.jsonview {
+  border: 1px solid #ddd;
+  background: rgba(238,238,238,0.5);
+  padding: 4px;
+  margin: 0 auto;
+  max-width: 100%;
+  overflow-x: auto;
+  margin-bottom: 20px;
+  max-height: 60vh;
+}
+.jsonview * {
+  font-family: monospace !important;
+  font-size: 12px;
+}
+.jsonview .collapser {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}
+.staff {
+  font-size: 15px;
+}
+.staff .editLinks a {
+  color: #00f;
+}
+#iframe-embed, #iframe-embed tr, #iframe-embed td {
+  width: 79vw;
+}
+#iframe-embed td {
+  padding: 0;
+}
+h2 {
+  margin: 20px auto;
+}
+.avatar {
+  height: 40px;
+  width: 40px;
+  display: inline-block;
+  background-size: cover;
+}
+#actions button {
+  float: none;
+  width: auto;
+}
+iframe.embed {
+  position: static;
+  width: 100%;
+  height: 44vw;
+  border: 1px solid black;
+}
+.page table.projectList,
+.page table.projectList td.border {
+  border: 0;
+}
+#pagination {
+  margin: 10px 0;
+}
+#pagination a {
+  color: #00f;
+}
\ No newline at end of file