diff options
| -rwxr-xr-x | public/assets/stylesheets/app.css | 88 | ||||
| -rwxr-xr-x | views/home.ejs | 3 | ||||
| -rw-r--r-- | views/partials/edit-profile.ejs | 5 | ||||
| -rw-r--r-- | views/partials/header.ejs | 2 | ||||
| -rw-r--r-- | views/partials/sign-in.ejs | 4 | ||||
| -rw-r--r-- | views/profile.ejs | 2 | ||||
| -rw-r--r-- | views/projects/list-projects.ejs | 3 |
7 files changed, 74 insertions, 33 deletions
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 8712a41..23d8e60 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -221,7 +221,8 @@ iframe.embed { } .viewMore:hover { - text-decoration:underline; + background: lightgreen; + color: white; } .page .roomName { @@ -388,7 +389,8 @@ iframe.embed { margin-right: 10px; color: black; font-weight: 100; - text-decoration: none + text-decoration: none; + padding: 50px 0 100px 0; } .editProfile span { vertical-align: middle; @@ -1356,6 +1358,9 @@ input[type="range"]::-webkit-slider-thumb { .settings .setting { margin-bottom:10px; } +.settings .setting a { + text-decoration:none; +} .setting.subButtons { display: inline-block; width: 100%; @@ -1472,6 +1477,7 @@ button:hover { table-layout: fixed; border-spacing: 0; border-collapse: separate; + overflow:hidden; } .radio-group__label { @@ -1481,7 +1487,7 @@ button:hover { vertical-align: middle; text-align: center; position: relative; - border: 1px solid #ccc; + border: 1px solid #000; cursor:pointer; border-style: solid none solid solid; /* border-radius: 5px 0 0 5px;*/ @@ -1494,19 +1500,19 @@ button:hover { } .radio-group__label + input + .radio-group__label:before { - content: " "; - display: block; - position: absolute; - top:-1px; - width: 100%; - height: 100%; - border: 1px solid #000; - /*border-radius: 5px 0 0 5px;*/ - -webkit-transform: translate3d(-103%,0,0); - -webkit-transition: all 250ms; - transform: translate3d(-103%,0,0); - transition: all 250ms; - background:; + content: " "; + display: block; + position: absolute; + top: 0px; + width: 94px; + height: 100%; + border: 0; + /* border-radius: 5px 0 0 5px; */ + -webkit-transform: translate3d(-103%,0,0); + -webkit-transition: all 250ms; + transform: translate3d(-103%,0,0); + transition: all 250ms; + background: rgba(0,0,0,0.1); } .radio-group__label + input:checked + .radio-group__label:before { @@ -1531,6 +1537,24 @@ form { form div { float:right; } +form div.hidden { + height: 0; + overflow: hidden; +} +form h3.link { + content:"?"; +} +form h3.link:after { + content:"?"; +} + +form h3.link:hover { + color:#017cfe; + cursor:pointer; +} + + + form li { font-size: 20px; font-weight: 300; @@ -1637,18 +1661,25 @@ form li textarea { } .close { - font-weight: 100; - font-size: 120px; - float: right; - cursor: pointer; - position: fixed; - right: 20px; - top: 20px; - z-index: 20; + font-weight: 100; + font-size: 70px; + float: right; + cursor: pointer; + position: fixed; + right: 20px; + top: 20px; + z-index: 20; + background: #f9f9f9; + width: 75px; + color: black; + border: 1px solid black; + box-shadow: -3px 4px black; + line-height: 75px; } .close:hover { - color:lightgreen; + background:lightgreen; + color:white; } @@ -1676,6 +1707,8 @@ form li textarea { margin-bottom: 18px; font-weight: 500; font-size: 12px; + border-bottom: 1px solid #444; + padding-bottom: 20px; letter-spacing: 2px; } .facebook b { @@ -1683,6 +1716,11 @@ form li textarea { font-size: 50px; } +a[data-role="forgot-password"] { + font-size:11px; + margin-top:10px; +} + .facebook span { vertical-align: bottom; padding-right: 14px; diff --git a/views/home.ejs b/views/home.ejs index 8b83a8f..5240ae1 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -16,8 +16,9 @@ <table class="demo"> <tr> <td class="video" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)"> + <span class="videoTitle">Create 3D Rooms</span><br> <span class="icon-ios7-play-outline"></span><br> - <span class="videoTitle">Welcome to VVALLS</span> + <span class="videoTitle">Watch video.</span> </td> </tr> </table> diff --git a/views/partials/edit-profile.ejs b/views/partials/edit-profile.ejs index 96e9da4..a39f856 100644 --- a/views/partials/edit-profile.ejs +++ b/views/partials/edit-profile.ejs @@ -61,8 +61,9 @@ </li> <li class="section_break"> - <h3>Change Password</h3> + <h3 class="link">Change Password</h3> </li> + <div class="hidden"> <li> <label class="description" for="profile_old_password">Old Password:</label> <div> @@ -81,7 +82,7 @@ <input id="profile_new_password2" class="element text medium" type="password" maxlength="255"> </div> </li> - + </div> <li class="buttons"> <input id="saveForm" class="button_text" type="submit" value="Submit" /> </li> diff --git a/views/partials/header.ejs b/views/partials/header.ejs index 6697aff..a48c5e1 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -14,7 +14,7 @@ <a href="/project" data-role="show-projects-modal" class="topLink">Projects</a> [[ if (profile && String(user._id) == String(profile._id)) { ]] - <a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Edit Profile <span class="icon-ios7-gear-outline"></span></a> + <a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Settings</a> [[ } else if (! profile) { ]] <a href="/profile" class="topLink">Profile</a> [[ } ]] diff --git a/views/partials/sign-in.ejs b/views/partials/sign-in.ejs index 8268b2a..98f0acc 100644 --- a/views/partials/sign-in.ejs +++ b/views/partials/sign-in.ejs @@ -6,7 +6,7 @@ <form id="signIn" method="post"> <input type="hidden" name="_csrf" value="[[- token ]]"> <a href="/auth/facebook" class="facebook"><b class="icon-social-facebook"></b><span>Sign in with Facebook</span></a> - <b class="signin-tagline">– or the ol' fashion way –</b> + <b class="signin-tagline">– or with your email –</b> <li> <label class="description" for="usernameInput">Username:</label> <div> @@ -39,7 +39,7 @@ <form id="signUp" method="post"> <input type="hidden" name="_csrf" value="[[- token ]]"> <a href="/auth/facebook" class="facebook"><b class="icon-social-facebook"></b><span>Sign up with Facebook</span></a> - <b class="signin-tagline">– or the ol' fashion way –</b> + <b class="signin-tagline">– or with your email –</b> <li> <label class="description" for="usernameInput">Username:</label> <div> diff --git a/views/profile.ejs b/views/profile.ejs index 8dd3c6d..ada3d52 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">create project</a> + <a href="#" data-role="new-project-modal" class="viewMore btn">create project</a> [[ include partials/edit-profile ]] [[ include projects/layouts-modal ]] diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs index c41ae07..2b6aa1e 100644 --- a/views/projects/list-projects.ejs +++ b/views/projects/list-projects.ejs @@ -2,8 +2,9 @@ <table class="projectList"> <tr> - + [[ projects.forEach(function(project, i) { ]] + [[ if (i % 4 == 1) { ]] </tr><tr> [[ } ]] |