diff options
| -rwxr-xr-x | public/assets/stylesheets/app.css | 81 | ||||
| -rw-r--r-- | views/controls/editor/light-control.ejs | 2 | ||||
| -rw-r--r-- | views/profile.ejs | 20 |
3 files changed, 54 insertions, 49 deletions
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index ebc21a8..d47f196 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -42,6 +42,7 @@ body.pastePaper .wallpaper.active span:hover{ a{ color:black; + text-decoration: none; } /*page*/ @@ -170,10 +171,10 @@ h5 { .page .profilepage, .page .projectList { - width: 100%; - margin: 40px 0 0 0; - border-spacing: 0; - clear: both; + width: 100%; + clear: both; + float:left; + display: inline-block; } .page .showcase { @@ -334,11 +335,12 @@ iframe.embed { } .page h1 { - font-size: 80px; - font-weight: 100; - padding-top: 25px; + font-size: 80px; + font-weight: 100; + padding: 20px 0 25px 0; float: left; width: 100%; + border-top: 1px solid; } /* DOCUMENTATION / ABOUT SECTION / FAQ PAGES */ @@ -380,10 +382,13 @@ iframe.embed { /* PROFILE PAGE */ -.profilepage .profilePic { - font-size: 148px; - background-size: cover; - background-position: center; +.profilePic { + font-size: 148px; + background-size: cover; + background-position: center; + width: 33.3333%; + height: 50vh; + float: left; } .editProfile { margin-right: 10px; @@ -417,13 +422,15 @@ iframe.embed { color: white; } .profilepage .bio { - text-align: left; - padding: 0 5%; - width: 66.5%; - background-image:url(../img/pattern.png); - background-size:100%; - background-color: lightyellow; - box-shadow: -4px 6px 7px rgba(0,0,0,0.1) inset; + text-align: left; + padding: 0 5%; + width: 66.5%; + background-image: url(../img/pattern.png); + background-size: 100%; + background-color: lightyellow; + display: table; + height: 50vh; + float: left; } .profilepage .bio.one { @@ -493,31 +500,35 @@ iframe.embed { background-size: contain; background-repeat: no-repeat; background-color: #fff; - background-image: url(http://upload.wikimedia.org/wikipedia/commons/d/d9/Graceland_Memphis_TN_Floorplan_Basement.jpg); width: 20vw; height: 20vh; display: inline-block; margin: 4vw; - border:1px solid white; + border:1px solid black; position: relative; } .templates span:after { - content: attr(data-name); - position: absolute; - top: 100%; - width: 100%; - left: 0; - background: #fff; - padding: 5px; - border-top: 1px solid black; + content: attr(data-name); + position: absolute; + top: 100%; + width: 100%; + left: 0; + background: #fff; + padding: 5px; + border-top: 1px solid black; + font-weight: 300; } .templates span:hover { - border:1px dashed black; + border:1px solid blue; cursor:pointer; } +.templates span:hover:after { + border-top: 1px solid blue; +} + .templates h1 { font-weight: 300; font-size: 21px; @@ -1304,8 +1315,8 @@ span:hover .swatch { .color-swatches span:nth-child(1),.color-swatches span:nth-child(2){ margin-bottom:5px; } -.color-swatches span.active{ - background:red; +.color-swatches span.active, .color-swatches span.active:hover{ + background:#000; color:white; } .color-swatches span:nth-child(3){ @@ -1315,9 +1326,6 @@ span:hover .swatch { background:#eee; } -.color-swatches span.active:hover { - background:red; -} .color-swatches label { font-size: 14px; font-weight: 300; @@ -1327,9 +1335,6 @@ span:hover .swatch { cursor: pointer; top: -2px; } -.color-swatches span.active label { - font-weight: 600; -} .settings.info { @@ -1549,7 +1554,7 @@ button { } #builder-units { - width:100%; + width:75%; } #mediaEditor .warn { width:100%; diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs index 8b133a5..b90b646 100644 --- a/views/controls/editor/light-control.ejs +++ b/views/controls/editor/light-control.ejs @@ -3,7 +3,7 @@ </div> <div class="slider"> - <h4>Brightness Control</h4> + <h4>Luminance Control</h4> <input type="range" min="0" max="110" value="0" id="brightness-control" /> </div> diff --git a/views/profile.ejs b/views/profile.ejs index ada3d52..34b0bee 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -8,17 +8,17 @@ <div class="rapper page"> [[- include partials/header ]] - <table class="profilepage"> - <tr> + <div class="profilepage"> [[ if (profile.photo && profile.photo.length) { ]] - <td class="border profilePic" style="background-image:url([[- profile.photo ]])"> - </td> + <div class="profilePic" style="background-image:url([[- profile.photo ]])"> + </div> [[ } else { ]] - <td class="border profilePic"> + <div class="profilePic"> <span class="icon-ios7-person-outline"></span> - </td> + </div> [[ } ]] - <td class="bio"> + <div class="bio"> + <div class="holder"> <h2>[[- profile.displayName ]]</h2> [[ if (profile.location) { ]] <span> @@ -35,9 +35,9 @@ <a href="https://twitter.com/[[- profile.twitterName ]]">@[[- profile.twitterName ]]</a> </span> [[ } ]] - </td> - </tr> - </table> + </div> + </div> + </div> [[ if (projects.length) { ]] <h1>[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]</h1> |