summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpublic/assets/stylesheets/app.css24
-rw-r--r--views/partials/header.ejs4
-rw-r--r--views/projects/layouts-modal.ejs2
3 files changed, 19 insertions, 11 deletions
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 9050486..2cf65c0 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -50,10 +50,14 @@ a{
width: 100%;
top: 0;
left: 0;
- background: white;
z-index: 6;
}
+.page #header {
+ background: white;
+ border-bottom: 1px solid;
+}
+
/*page*/
.topLogo {
@@ -355,7 +359,7 @@ iframe.embed {
font-size: 148px;
background-size: cover;
background-position: center;
- width: 33.3333%;
+ width: 40%;
height: 50vh;
float: left;
}
@@ -375,7 +379,13 @@ iframe.embed {
font-weight: 300;
float:left;
text-decoration: none;
- border-bottom:1px solid transparent;
+}
+.page .topLinks a {
+ border-right:1px solid;
+}
+
+.topLinks a:last-child {
+ border-right:0px solid;
}
.topLinks a:hover {
background: black;
@@ -384,13 +394,12 @@ iframe.embed {
.profilepage .bio {
text-align: left;
padding: 0 5%;
- width: 66.5%;
+ width: 60%;
background-image: url(../img/pattern.png);
background-size: 100%;
background-color: lightyellow;
display: table;
height: 50vh;
- border-top: 1px solid;
float: left;
}
@@ -784,7 +793,7 @@ iframe.embed {
left: 0;
width: 100%;
height: 100%;
- z-index: 3;
+ z-index: 6;
overflow-y: scroll;
}
@@ -992,9 +1001,8 @@ iframe.embed {
}
.mediaDrawer h2{
- font-size: 18px;
+ font-size: 24px;
display: inline-block;
- margin-top: 20px;
position:relative;
z-index:4;
}
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index d46155f..57f39d8 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -9,12 +9,12 @@
[[ if (logged_in) { ]]
[[ if (user.isStaff) { ]]
- <a href="/layout" data-role="show-layouts-modal" class="topLink" style="border-right:1px solid">Layouts</a>
+ <a href="/layout" data-role="show-layouts-modal" class="topLink">Layouts</a>
[[ } ]]
<!--<a href="/project" data-role="show-projects-modal" class="topLink">Projects</a>-->
- <a href="#" data-role="new-project-modal" style="border-right:1px solid">New Project</a>
+ <a href="#" data-role="new-project-modal">New Project</a>
[[ if (profile && String(user._id) == String(profile._id)) { ]]
diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs
index 34dc9af..24a83b7 100644
--- a/views/projects/layouts-modal.ejs
+++ b/views/projects/layouts-modal.ejs
@@ -33,7 +33,7 @@
<span class="close">X</span>
<div class="box">
- <h1>Choose Room Template</h1>
+ <h2>Choose Room Template</h2>
<div class="templates">
</div>
<div class="no-templates">