From 24614e0764ec4655ded8b66ba6832bf8cd3cda1d Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 29 Sep 2014 18:56:38 -0400 Subject: css --- public/assets/stylesheets/app.css | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'public') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index e136e03..e08cc0b 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -1302,9 +1302,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:white; +.color-swatches span.active, .color-swatches span.active:hover{ + background:#eee; } .color-swatches span:nth-child(3){ clear:left; @@ -1313,9 +1312,6 @@ span:hover .swatch { background:#eee; } -.color-swatches span.active:hover { - background:red; -} .color-swatches label { font-size: 14px; font-weight: 300; @@ -1326,7 +1322,7 @@ span:hover .swatch { top: -2px; } .color-swatches span.active label { - font-weight: 600; + font-weight: 500; } -- cgit v1.2.3-70-g09d2 From 166834f03505ec7e766cb5d6d7151310fbf54d49 Mon Sep 17 00:00:00 2001 From: ryderr Date: Tue, 30 Sep 2014 11:47:11 -0400 Subject: profile stuff --- public/assets/stylesheets/app.css | 77 ++++++++++++++++++++++----------------- views/profile.ejs | 20 +++++----- 2 files changed, 53 insertions(+), 44 deletions(-) (limited to 'public') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 299f757..d5dab4f 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 { @@ -492,31 +499,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,7 +1315,8 @@ span:hover .swatch { margin-bottom:5px; } .color-swatches span.active, .color-swatches span.active:hover{ - background:#eee; + background:#000; + color:white; } .color-swatches span:nth-child(3){ clear:left; @@ -1322,9 +1334,6 @@ span:hover .swatch { cursor: pointer; top: -2px; } -.color-swatches span.active label { - font-weight: 500; -} .settings.info { @@ -1544,7 +1553,7 @@ button { } #builder-units { - width:100%; + width:75%; } #mediaEditor .warn { width:100%; 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 @@
[[- include partials/header ]] - - +
[[ if (profile.photo && profile.photo.length) { ]] -
+
+
[[ } else { ]] - + [[ } ]] - - -
- +
-
+
+

[[- profile.displayName ]]

[[ if (profile.location) { ]] @@ -35,9 +35,9 @@ @[[- profile.twitterName ]] [[ } ]] -
+
+ + [[ if (projects.length) { ]]

[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]

-- cgit v1.2.3-70-g09d2 From 915b0e3c15f59103803bc1514b414b86aff92b6c Mon Sep 17 00:00:00 2001 From: ryderr Date: Tue, 30 Sep 2014 11:54:03 -0400 Subject: fade thing --- public/assets/stylesheets/app.css | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'public') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index d47f196..3748401 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -196,6 +196,7 @@ iframe.embed { float: left; width: 100%; } + .projectList .room { width: 33.3333%; height:40vh; @@ -203,10 +204,20 @@ iframe.embed { position: relative; float:left; border-top:1px solid black; + } .projectList .room:nth-child(4n+1){ width:100%; } +.projectList .room:hover .holder{ + background: rgba(255,255,255,0); +} +.projectList .holder{ + background: rgba(255,255,255,0.7); + -webkit-transition:2s background; + -moz-transition:2s background; + transition:2s background; +} .page .btn { clear: both; padding: 30px 0; -- cgit v1.2.3-70-g09d2