diff options
| -rwxr-xr-x | public/assets/stylesheets/app.css | 93 | ||||
| -rw-r--r-- | views/partials/header.ejs | 9 | ||||
| -rw-r--r-- | views/profile.ejs | 2 |
3 files changed, 34 insertions, 70 deletions
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 672f8f3..496d7f4 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -45,6 +45,15 @@ a{ text-decoration: none; } +#header { + position: fixed; + width: 100%; + top: 0; + left: 0; + background: white; + z-index: 6; +} + /*page*/ .topLogo { @@ -58,9 +67,6 @@ a{ cursor: -moz-grabbing; } -.floatimgImg.edit { - -} .floatingSwatch { width: 50px; @@ -168,7 +174,9 @@ h5 { .page.profile { color:white; } - +.profilepage { + margin-top:63px; +} .page .profilepage, .page .projectList { width: 100%; @@ -198,7 +206,7 @@ iframe.embed { } .projectList .room { - width: 33.3333%; + width: 50%; height:40vh; display:table; position: relative; @@ -206,13 +214,13 @@ iframe.embed { border-top:1px solid; } -.projectList .room:nth-child(4n+3) { - border-left:1px solid black; +.projectList .room:nth-child(3n+2) { border-right:1px solid black; } -.projectList .room:nth-child(4n+1){ - width:100%; +.projectList .room:nth-child(3n+1) { + width: 100%; + height: 50vh; } .projectList .room:hover .holder{ background: rgba(255,255,255,0); @@ -266,57 +274,6 @@ iframe.embed { } - -/* -.room1 { - position: relative; - overflow: hidden; - background-image:url(https://s3.amazonaws.com/luckyplop/7eb159e99924e6e371046d6fa12e566fd77901c9.jpg); -} -.room2 { - background-image:url(https://s3.amazonaws.com/luckyplop/fd4ebe8a7a4246c8273fc999fb1ef0d6a8260b8c.png); -} - -.room1 form textarea { - width: 226px; -} - -.room1 .radio-group { - width: 226px; -} - -.room1 .radio-group__label { - width: 106px; - font-size: 13px; -} - -.room1 .formHolder { - top: 0; - padding-top: 10px; - display: table; - width: 100%; - height: 100%; - background: rgba(255,255,255,0.9); - -webkit-transform:translateY(-100%); - transform:translateY(-100%); -} - -.room1 form { - padding: 0 10px; - max-width: 440px; -} - -.room1 .formInner { - display: table-cell; - vertical-align: middle; -} - -.room1.editing .formHolder { - -webkit-transform:translateY(0); - transform:translateY(0); -} -*/ - .page .questions { background: #55efcb; color:white; @@ -433,6 +390,7 @@ iframe.embed { background-color: lightyellow; display: table; height: 50vh; + border-top: 1px solid; float: left; } @@ -951,7 +909,7 @@ iframe.embed { left: 50%; padding: 26px 20px; margin-left: -200px; - background: white; + background: rgba(255,255,255,0.9); z-index: 4; -webkit-transform: translateY(-1000%); -webkit-transition: -webkit-transform 0.6s ease-in-out; @@ -1778,12 +1736,13 @@ form li textarea { } .hero { - float:left; - width:100%; - clear:both; - height:70vh; - display:table; - background-size:cover; + float: left; + width: 100%; + clear: both; + height: 80vh; + display: table; + background-size: cover; + margin-top: 63px; } .hero .circle { font-size: 20px; diff --git a/views/partials/header.ejs b/views/partials/header.ejs index a48c5e1..d46155f 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -1,3 +1,4 @@ +<div id="header"> <a href="/" class="logo"><img src="/assets/img/logo4.svg"></a> <div id="minotaur"> @@ -8,10 +9,13 @@ [[ if (logged_in) { ]] [[ if (user.isStaff) { ]] - <a href="/layout" data-role="show-layouts-modal" class="topLink">Layouts</a> + <a href="/layout" data-role="show-layouts-modal" class="topLink" style="border-right:1px solid">Layouts</a> [[ } ]] - <a href="/project" data-role="show-projects-modal" class="topLink">Projects</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> + [[ if (profile && String(user._id) == String(profile._id)) { ]] <a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Settings</a> @@ -24,3 +28,4 @@ <a href="/login" data-role="show-signin-modal" class="signIn topLink">Sign In</a> [[ } ]] </span> +</div>
\ No newline at end of file diff --git a/views/profile.ejs b/views/profile.ejs index 34b0bee..9cfb40d 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -45,7 +45,7 @@ [[ include projects/list-projects ]] - <a href="#" data-role="new-project-modal" class="viewMore btn">create project</a> + <a href="#" class="viewMore btn">view more</a> [[ include partials/edit-profile ]] [[ include projects/layouts-modal ]] |