From 2ec71cc659a86c23eb38a9af401d4a5a62e95a5f Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 23 Apr 2014 01:43:49 -0700 Subject: [PATCH] News feed css and placeholder content --- .../css/_project-sass/_project-Main.scss | 216 ++++++++++++++++-- public/assets/css/neo.css | 2 +- views/home_mockup.erb | 179 ++++++++++++++- 3 files changed, 372 insertions(+), 25 deletions(-) diff --git a/public/assets/css/_project-sass/_project-Main.scss b/public/assets/css/_project-sass/_project-Main.scss index 3fbaa0e6..26894272 100644 --- a/public/assets/css/_project-sass/_project-Main.scss +++ b/public/assets/css/_project-sass/_project-Main.scss @@ -30,7 +30,7 @@ } .interior .header-Outro h1 { font-size: 2.5em; - margin-top: 20px; + margin-top: 15px; } .site-url { font-size:18px; @@ -282,7 +282,7 @@ margin-right: auto; } .misc-icon { - background: url(../img/misc-file.png) no-repeat -1px -1px; + background: url(../img/misc-file.png) no-repeat 0px 0px; width: 67px; height: 67px; display: block; @@ -337,27 +337,80 @@ .site-actions a { color: #666; } -.page-with-columns .col-66 { - background-color: white; - padding: 30px; +@media(min-width:1200px) { + .container { + width: 1200px; + } +} +@media(min-width:700px) and (max-width:1200px) { + .container { + width: 100%; + } +} +.content.misc-page.columns { //.colmask + float: left; + padding: 0; + position: relative; + clear: both; + width: 100%; + overflow: hidden; +} +.col-left { + float: left; + width: 100%; + position: relative; border-right: 1px solid #ddd; } -.page-with-columns .col-33 { - padding: 30px; +.right-menu { + background: #FAF6F1; } -.content.misc-page.columns { - padding: 0; +.right-menu .col-left { + background-color: white; + right: 33%; } -.page-with-columns { +.content.misc-page.columns .col { + padding: 25px 30px 30px 30px; + position: relative; + overflow:hidden; +} +.content.misc-page.columns .col-66 { + width: 67%; + left: 33%; +} +.content.misc-page.columns .col-33 { + width: 33%; + left: 33%; +} +.interior .header-Outro.with-columns { + padding-top: 22px; +} +.header-Outro.with-columns h3 { float: left; + margin-bottom: 0; + font-size: 1.7em; +} +.header-Outro.with-columns .content { padding: 0; } .header-Outro.with-columns .col { - padding-left: 0; + padding: 25px 0 8px 30px; } -.header-Outro.short h3 { +.header-Outro.with-columns .col-32 { + width: 33%; +} +.header-Outro.with-columns .col-66 { + width: 67%; + border-right: 1px solid #0B0F11; +} +.feed-filter { float: left; - margin-bottom: 0; + margin-top: 1.5em; + font-size: 0.8em; + margin-left: 2.2em; +} +.interior .header-Outro .feed-filter a { + color: white; + margin-left: 13px; } .site-suggestion { float: left; @@ -366,6 +419,21 @@ margin-bottom: 20px; height: 160px; } +.stats { + margin-bottom: 2em; + float: left; + width: 100%; +} +.content.misc-page.columns .stats .col { + padding: 0; + margin-bottom: 2em; +} +.large-portrait { + border: 10px solid white; + -moz-box-shadow: 1px 1px 2px 1px rgba(0,0,0,.2); + -webkit-box-shadow: 1px 1px 2px 1px rgba(0,0,0,.2); + box-shadow: 1px 1px 2px 1px rgba(0,0,0,.2); +} .site-portrait { border: 5px solid white; -moz-box-shadow: 1px 1px 2px 1px rgba(0,0,0,.2); @@ -405,10 +473,130 @@ a.tag:hover { .following { width: 100%; float: left; + margin-bottom: 2em; } -.following .avatar { +.avatar { height:37px; width:37px; margin: 0 4px 4px 0; float: left; +} +.news-item { + width: 100%; + float: left; +} +.news-item.update, .news-item.tags, .news-item.comment.for-me, .news-item.tip.for-me { + margin: 1.8em 0; +} +.news-item:nth-of-type(1) { + margin-top: 0; +} +.news-item.first { + margin-top: 0; +} +.news-item .user { + font-weight: bold; + color: #000; +} +.news-item .comment { + color: #999; + font-style: italic; + font-size: .8em; +} +.news-item.for-me .comment { + color: #000; + font-style: normal; + margin-top: .2em; + font-size: .9em; + margin-bottom: -.4em; +} +.news-item .icon { + width: 20px; + height: 20px; + background: #E6E6E6; + float: left; + margin-right: 12px; +} +.news-item.comment .icon { + background: #DAEEA5; +} +.news-item.comment.for-me .icon, .news-item.tip.for-me .icon { + background-size: 62px 62px; + width: 82px; + height: 62px; + background-position: right top; + background-repeat: no-repeat; +} +.news-item .icon-mini { + +} +.news-item.update .icon { + background: #E93250; +} +.news-item.tip .icon { + background: #FFCC00; +} +.news-item.follow .icon { + background: #3399CC; +} +.news-item .title { + margin-bottom: .4em; + position: relative; + width: 100%; + float: left; +} +.news-item .date { + float: right; + color: #aaa; + font-size: 11px; + margin-top: .5em; +} +.news-item .files { + background: white; +} +.news-item .file { + width: 90px; + margin-bottom: 0; + padding: 0; +} +.news-item .file a:hover { + text-decoration: none; +} +.news-item .html-thumbnail { + margin-top: 1px; + margin-left: 0px; + width: auto; +} +.news-item .site-suggestion { + height: auto; + margin-bottom: 10px; +} +.news-item .tag { + float: none; + margin-left: 4px; +} +.news-item .actions { + font-size: 11px; +} +.news-item .actions a { + margin-right: 6px; +} +.news-item .content { + padding: 0 0 0 32px; +} +.news-item .comments { + margin-bottom: 1.5em; + margin-top: .7em; +} +.news-item .comments .comment { + font-size: .8em; +} +.news-item .comments .comment .user { + margin-right: 5px; +} +.news-item .comments .comment .actions { + margin-top: .3em; +} +.news-item .avatar { + margin-right: 10px; } \ No newline at end of file diff --git a/public/assets/css/neo.css b/public/assets/css/neo.css index 33c659c6..3fe4d078 100644 --- a/public/assets/css/neo.css +++ b/public/assets/css/neo.css @@ -12,6 +12,6 @@ .constant-Nav{margin-left:-88px;-moz-transition:all 0.35s;-ms-transition:all 0.35s;-o-transition:all 0.35s;-webkit-transition:all 0.35s;transition:all 0.35s}@media (max-device-width: 480px), screen and (max-width: 800px){.constant-Nav{margin-left:0}}.constant-Nav.in-View{margin-left:0;padding-left:70px}@media (max-device-width: 480px), screen and (max-width: 800px){.constant-Nav.in-View{padding-left:0}} .add-Stripe{border-bottom:6px solid #E93250}@media (max-device-width: 480px), screen and (max-width: 800px){.add-Stripe{border:0}} .interior .page{padding-top:22px;float:left;width:100%}.interior .signup-Form{top:0}.interior .header-Base{left:0;overflow:visible;position:fixed;top:0;width:100%;z-index:9}.int-Logo{left:0;position:absolute;top:0;width:70px;z-index:9}.interior .header-Nav{padding-left:70px}@media (max-device-width: 480px), screen and (max-width: 800px){.interior .header-Nav{width:100%}} -.interior .constant-Nav{margin:0}.content-Base{background:#f6f0e6;min-height:500px;padding-bottom:50px;padding-top:10px}.content-Base h1,.content-Base h2,.content-Base h3,.content-Base h4,.content-Base h5,.content-Base h6{color:#e93250}.content,.footer-Content,.footer-Content{padding:20px 3%}.single-Col{max-width:800px}.twitter-tweet.twitter-tweet-rendered{margin:0 auto 30px !important}.interior .header-Outro{padding-top:30px;overflow:hidden}.interior .header-Outro h1{font-size:2.5em;margin-top:20px}.site-url{font-size:18px;margin-bottom:8px}.site-url a{color:#e93250;font-weight:bold}.interior .header-Outro .subtitle{font-size:1em;margin-top:-15px}.content.wide,.wide.footer-Content{padding-left:6%;padding-right:6%}.content.misc-page,.misc-page.footer-Content{background:#FAF6F1;-moz-box-shadow:0px 1px 1px 1px rgba(0,0,0,0.1);-webkit-box-shadow:0px 1px 1px 1px rgba(0,0,0,0.1);box-shadow:0px 1px 1px 1px rgba(0,0,0,0.1);padding:1px 3% 40px 3%}.content.misc-page h3,.misc-page.footer-Content h3,.content.misc-page h4,.misc-page.footer-Content h4,.content.misc-page h5,.misc-page.footer-Content h5,.content.misc-page h6,.misc-page.footer-Content h6{margin-top:1em}.content.misc-page h2,.misc-page.footer-Content h2{font-size:1.6em;margin-top:1em}.content.misc-page h3,.misc-page.footer-Content h3,.content.misc-page h4,.misc-page.footer-Content h4,.content.misc-page h5,.misc-page.footer-Content h5{font-size:1.2em}.content.misc-page h6,.misc-page.footer-Content h6{font-size:1em}.content.misc-page h1,.misc-page.footer-Content h1{font-size:2.2em;margin-bottom:20px}.content.misc-page hr,.misc-page.footer-Content hr{margin:35px 0 25px 0}.interior .header-Outro .col.col-50.signup-Area{padding-left:0}.interior .header-Outro a{color:#E93250}.interior .signup-Area{min-height:164px}.interior .signup-Area img{-moz-box-shadow:1px 2px 5px 2px rgba(0,0,0,0.1);-webkit-box-shadow:1px 2px 5px 2px rgba(0,0,0,0.1);box-shadow:1px 2px 5px 2px rgba(0,0,0,0.1);border:3px solid white}.interior .header-Outro .screenshot{width:235px;height:141px}.interior .header-Outro ul{margin:0;padding:0}.interior .header-Outro ul li{list-style:none;font-size:80%;margin-bottom:2px}.interior .signup-Form fieldset{padding:20px}.interior .header-Outro h2{margin-top:12px;font-size:1.8em}.welcome{background:#daeea5 url(../img/heartcat.png) no-repeat 20px center;background-size:77px 81px;padding:20px 20px 20px 108px;margin-bottom:30px}.welcome h4{font-size:1.2em;margin-bottom:4px}.welcome .close-button{float:right;background:url(../img/welcome-close.png) no-repeat;width:19px;height:19px}.files{float:left;background:#E4D8CB;width:100%;position:relative}.files .header{background:#5E95A1;color:#fff;float:left;width:100%;padding:10px 20px}.files .breadcrumbs{float:left;font-weight:bold;margin-top:4px}.files .actions{float:right}.files .btn-Action{margin-left:8px}.btn-Action span{background-repeat:no-repeat}.btn-Action.new-Page span{background-image:url(../img/new-page.png);background-position-y:1px;padding-left:29px}.btn-Action.new-Folder span{background-image:url(../img/new-folder.png);padding-left:26px}.btn-Action.upload span{background-image:url(../img/upload.png);padding-left:24px}.files .list{padding:20px}.files .list .upload-Boundary{float:left;border:3px dashed #F6F0E6;width:100%;margin:18px 0;padding:10px;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;min-height:300px}.files .list .upload-Boundary.with-instruction{background:url(../img/drag-drop.png) no-repeat center center}.files .uploading-overlay{width:100%;height:100%;position:absolute;background-color:rgba(0,0,0,0.35);z-index:100}.files .uploading{background:#fff;font-style:italic;margin-left:auto;margin-right:auto;width:400px;margin-top:14%;padding:25px 40px 28px 40px;-webkit-box-shadow:1px 1px 21px 5px rgba(50,50,50,0.5);-moz-box-shadow:1px 1px 21px 5px rgba(50,50,50,0.5);box-shadow:1px 1px 21px 5px rgba(50,50,50,0.5);border-radius:10px}.files .uploading p{margin-bottom:2px}.files .progress-bar{background:#CCCCCC;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;width:100%;position:relative;margin-top:14px;height:10px}.files .progress-bar .progress{background:#E93250;height:100%;-webkit-border-top-right-radius:0px;-webkit-border-bottom-right-radius:0px;-moz-border-radius-topright:0px;-moz-border-radius-bottomright:0px;border-top-right-radius:0px;border-bottom-right-radius:0px;-webkit-border-top-left-radius:20px;-webkit-border-bottom-left-radius:20px;-moz-border-radius-topleft:20px;-moz-border-radius-bottomleft:20px;border-top-left-radius:20px;border-bottom-left-radius:20px}.file{float:left;padding:5px 0px;margin-right:10px;margin-bottom:10px;width:125px;text-align:center;display:block;position:relative}.file .title{font-weight:bold;font-size:12px;color:#666;margin-top:4px;text-decoration:none;white-space:nowrap;overflow:hidden;display:block}.html-thumbnail{font-size:11px;margin-top:5px;margin-left:10px;display:block;position:relative;width:105px;height:63px}.html-thumbnail.html img{width:105px;height:63px;-webkit-box-shadow:0px 1px 4px 0px rgba(0,0,0,0.3);-moz-box-shadow:0px 1px 4px 0px rgba(0,0,0,0.3);box-shadow:0px 1px 4px 0px rgba(0,0,0,0.3)}.html-thumbnail.image img{max-width:105px;max-height:63px;width:auto;height:auto}.html-thumbnail.misc{width:63px;height:63px;margin-left:auto;margin-right:auto}.misc-icon{background:url(../img/misc-file.png) no-repeat -1px -1px;width:67px;height:67px;display:block;padding-top:35px;font-size:14px;color:#bbb;font-weight:bold;margin-left:auto;margin-right:auto}.overlay a{color:white;text-decoration:none;font-size:14px;display:block}.overlay i{font-weight:bold}.overlay{position:absolute;top:0;width:0;width:100%;height:100%;background-color:rgba(0,0,0,0.5);display:none}.link-overlay{display:block;position:absolute;bottom:0px;left:0px;width:123px;height:30px}.file>.overlay{-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;padding-top:15px;background-color:rgba(0,0,0,0.15)}.filehover:hover .overlay,.fileimagehover:hover .overlay{display:block}.site-actions{float:left;margin-top:20px;font-size:90%}.site-actions a{color:#666}.page-with-columns .col-66{background-color:white;padding:30px;border-right:1px solid #ddd}.page-with-columns .col-33{padding:30px}.content.misc-page.columns,.misc-page.columns.footer-Content{padding:0}.page-with-columns{float:left;padding:0}.header-Outro.with-columns .col{padding-left:0}.header-Outro.short h3{float:left;margin-bottom:0}.site-suggestion{float:left;width:156px;margin-right:20px;margin-bottom:20px;height:160px}.site-portrait{border:5px solid white;-moz-box-shadow:1px 1px 2px 1px rgba(0,0,0,0.2);-webkit-box-shadow:1px 1px 2px 1px rgba(0,0,0,0.2);box-shadow:1px 1px 2px 1px rgba(0,0,0,0.2);float:left;margin-bottom:.5em}.site-portrait img{width:146px}.site-portrait .caption{display:block;clear:both;font-size:.8em;margin-top:.2em;margin-bottom:-.2em}a.tag{font-size:.7em;text-transform:uppercase;background:#FFFFCC;color:#C1A009;float:left;padding:1px 5px;-moz-box-shadow:1px 1px 1px 0px rgba(0,0,0,0.2);-webkit-box-shadow:1px 1px 1px 0px rgba(0,0,0,0.2);box-shadow:1px 1px 1px 0px rgba(0,0,0,0.2);margin-right:3px;margin-right:10px;margin-bottom:7px}a.tag:hover{text-decoration:none;background:#FFEE8A}.following{width:100%;float:left}.following .avatar{height:37px;width:37px;margin:0 4px 4px 0;float:left}.footer-Base{color:#5e5b56;float:left;width:100%}.footer-Base h1,.footer-Base h2,.footer-Base h3,.footer-Base h4{color:#8b9a7a}.footer-Intro{background:#daeea5;border-top:1px solid #cedbab;-moz-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);-webkit-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);position:relative}.footer-Intro .footer-Content{padding-top:40px;padding-bottom:40px}.f-Col{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;min-height:125px;padding-bottom:28px;position:relative}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col{min-height:2px;padding-left:15px !important;padding-right:100px !important}}.f-Col .action-Link{bottom:0;position:absolute;right:12px}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col .action-Link{position:static}} +.interior .constant-Nav{margin:0}.content-Base{background:#f6f0e6;min-height:500px;padding-bottom:50px;padding-top:10px}.content-Base h1,.content-Base h2,.content-Base h3,.content-Base h4,.content-Base h5,.content-Base h6{color:#e93250}.content,.footer-Content,.footer-Content{padding:20px 3%}.single-Col{max-width:800px}.twitter-tweet.twitter-tweet-rendered{margin:0 auto 30px !important}.interior .header-Outro{padding-top:30px;overflow:hidden}.interior .header-Outro h1{font-size:2.5em;margin-top:15px}.site-url{font-size:18px;margin-bottom:8px}.site-url a{color:#e93250;font-weight:bold}.interior .header-Outro .subtitle{font-size:1em;margin-top:-15px}.content.wide,.wide.footer-Content{padding-left:6%;padding-right:6%}.content.misc-page,.misc-page.footer-Content{background:#FAF6F1;-moz-box-shadow:0px 1px 1px 1px rgba(0,0,0,0.1);-webkit-box-shadow:0px 1px 1px 1px rgba(0,0,0,0.1);box-shadow:0px 1px 1px 1px rgba(0,0,0,0.1);padding:1px 3% 40px 3%}.content.misc-page h3,.misc-page.footer-Content h3,.content.misc-page h4,.misc-page.footer-Content h4,.content.misc-page h5,.misc-page.footer-Content h5,.content.misc-page h6,.misc-page.footer-Content h6{margin-top:1em}.content.misc-page h2,.misc-page.footer-Content h2{font-size:1.6em;margin-top:1em}.content.misc-page h3,.misc-page.footer-Content h3,.content.misc-page h4,.misc-page.footer-Content h4,.content.misc-page h5,.misc-page.footer-Content h5{font-size:1.2em}.content.misc-page h6,.misc-page.footer-Content h6{font-size:1em}.content.misc-page h1,.misc-page.footer-Content h1{font-size:2.2em;margin-bottom:20px}.content.misc-page hr,.misc-page.footer-Content hr{margin:35px 0 25px 0}.interior .header-Outro .col.col-50.signup-Area{padding-left:0}.interior .header-Outro a{color:#E93250}.interior .signup-Area{min-height:164px}.interior .signup-Area img{-moz-box-shadow:1px 2px 5px 2px rgba(0,0,0,0.1);-webkit-box-shadow:1px 2px 5px 2px rgba(0,0,0,0.1);box-shadow:1px 2px 5px 2px rgba(0,0,0,0.1);border:3px solid white}.interior .header-Outro .screenshot{width:235px;height:141px}.interior .header-Outro ul{margin:0;padding:0}.interior .header-Outro ul li{list-style:none;font-size:80%;margin-bottom:2px}.interior .signup-Form fieldset{padding:20px}.interior .header-Outro h2{margin-top:12px;font-size:1.8em}.welcome{background:#daeea5 url(../img/heartcat.png) no-repeat 20px center;background-size:77px 81px;padding:20px 20px 20px 108px;margin-bottom:30px}.welcome h4{font-size:1.2em;margin-bottom:4px}.welcome .close-button{float:right;background:url(../img/welcome-close.png) no-repeat;width:19px;height:19px}.files{float:left;background:#E4D8CB;width:100%;position:relative}.files .header{background:#5E95A1;color:#fff;float:left;width:100%;padding:10px 20px}.files .breadcrumbs{float:left;font-weight:bold;margin-top:4px}.files .actions{float:right}.files .btn-Action{margin-left:8px}.btn-Action span{background-repeat:no-repeat}.btn-Action.new-Page span{background-image:url(../img/new-page.png);background-position-y:1px;padding-left:29px}.btn-Action.new-Folder span{background-image:url(../img/new-folder.png);padding-left:26px}.btn-Action.upload span{background-image:url(../img/upload.png);padding-left:24px}.files .list{padding:20px}.files .list .upload-Boundary{float:left;border:3px dashed #F6F0E6;width:100%;margin:18px 0;padding:10px;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;min-height:300px}.files .list .upload-Boundary.with-instruction{background:url(../img/drag-drop.png) no-repeat center center}.files .uploading-overlay{width:100%;height:100%;position:absolute;background-color:rgba(0,0,0,0.35);z-index:100}.files .uploading{background:#fff;font-style:italic;margin-left:auto;margin-right:auto;width:400px;margin-top:14%;padding:25px 40px 28px 40px;-webkit-box-shadow:1px 1px 21px 5px rgba(50,50,50,0.5);-moz-box-shadow:1px 1px 21px 5px rgba(50,50,50,0.5);box-shadow:1px 1px 21px 5px rgba(50,50,50,0.5);border-radius:10px}.files .uploading p{margin-bottom:2px}.files .progress-bar{background:#CCCCCC;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;width:100%;position:relative;margin-top:14px;height:10px}.files .progress-bar .progress{background:#E93250;height:100%;-webkit-border-top-right-radius:0px;-webkit-border-bottom-right-radius:0px;-moz-border-radius-topright:0px;-moz-border-radius-bottomright:0px;border-top-right-radius:0px;border-bottom-right-radius:0px;-webkit-border-top-left-radius:20px;-webkit-border-bottom-left-radius:20px;-moz-border-radius-topleft:20px;-moz-border-radius-bottomleft:20px;border-top-left-radius:20px;border-bottom-left-radius:20px}.file{float:left;padding:5px 0px;margin-right:10px;margin-bottom:10px;width:125px;text-align:center;display:block;position:relative}.file .title{font-weight:bold;font-size:12px;color:#666;margin-top:4px;text-decoration:none;white-space:nowrap;overflow:hidden;display:block}.html-thumbnail{font-size:11px;margin-top:5px;margin-left:10px;display:block;position:relative;width:105px;height:63px}.html-thumbnail.html img{width:105px;height:63px;-webkit-box-shadow:0px 1px 4px 0px rgba(0,0,0,0.3);-moz-box-shadow:0px 1px 4px 0px rgba(0,0,0,0.3);box-shadow:0px 1px 4px 0px rgba(0,0,0,0.3)}.html-thumbnail.image img{max-width:105px;max-height:63px;width:auto;height:auto}.html-thumbnail.misc{width:63px;height:63px;margin-left:auto;margin-right:auto}.misc-icon{background:url(../img/misc-file.png) no-repeat 0px 0px;width:67px;height:67px;display:block;padding-top:35px;font-size:14px;color:#bbb;font-weight:bold;margin-left:auto;margin-right:auto}.overlay a{color:white;text-decoration:none;font-size:14px;display:block}.overlay i{font-weight:bold}.overlay{position:absolute;top:0;width:0;width:100%;height:100%;background-color:rgba(0,0,0,0.5);display:none}.link-overlay{display:block;position:absolute;bottom:0px;left:0px;width:123px;height:30px}.file>.overlay{-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;padding-top:15px;background-color:rgba(0,0,0,0.15)}.filehover:hover .overlay,.fileimagehover:hover .overlay{display:block}.site-actions{float:left;margin-top:20px;font-size:90%}.site-actions a{color:#666}@media (min-width: 1200px){.container{width:1200px}}@media (min-width: 700px) and (max-width: 1200px){.container{width:100%}}.content.misc-page.columns,.misc-page.columns.footer-Content{float:left;padding:0;position:relative;clear:both;width:100%;overflow:hidden}.col-left{float:left;width:100%;position:relative;border-right:1px solid #ddd}.right-menu{background:#FAF6F1}.right-menu .col-left{background-color:white;right:33%}.content.misc-page.columns .col,.misc-page.columns.footer-Content .col{padding:25px 30px 30px 30px;position:relative;overflow:hidden}.content.misc-page.columns .col-66,.misc-page.columns.footer-Content .col-66{width:67%;left:33%}.content.misc-page.columns .col-33,.misc-page.columns.footer-Content .col-33{width:33%;left:33%}.interior .header-Outro.with-columns{padding-top:22px}.header-Outro.with-columns h3{float:left;margin-bottom:0;font-size:1.7em}.header-Outro.with-columns .content,.header-Outro.with-columns .footer-Content{padding:0}.header-Outro.with-columns .col{padding:25px 0 8px 30px}.header-Outro.with-columns .col-32{width:33%}.header-Outro.with-columns .col-66{width:67%;border-right:1px solid #0B0F11}.feed-filter{float:left;margin-top:1.5em;font-size:0.8em;margin-left:2.2em}.interior .header-Outro .feed-filter a{color:white;margin-left:13px}.site-suggestion{float:left;width:156px;margin-right:20px;margin-bottom:20px;height:160px}.stats{margin-bottom:2em;float:left;width:100%}.content.misc-page.columns .stats .col,.misc-page.columns.footer-Content .stats .col{padding:0;margin-bottom:2em}.large-portrait{border:10px solid white;-moz-box-shadow:1px 1px 2px 1px rgba(0,0,0,0.2);-webkit-box-shadow:1px 1px 2px 1px rgba(0,0,0,0.2);box-shadow:1px 1px 2px 1px rgba(0,0,0,0.2)}.site-portrait{border:5px solid white;-moz-box-shadow:1px 1px 2px 1px rgba(0,0,0,0.2);-webkit-box-shadow:1px 1px 2px 1px rgba(0,0,0,0.2);box-shadow:1px 1px 2px 1px rgba(0,0,0,0.2);float:left;margin-bottom:.5em}.site-portrait img{width:146px}.site-portrait .caption{display:block;clear:both;font-size:.8em;margin-top:.2em;margin-bottom:-.2em}a.tag{font-size:.7em;text-transform:uppercase;background:#FFFFCC;color:#C1A009;float:left;padding:1px 5px;-moz-box-shadow:1px 1px 1px 0px rgba(0,0,0,0.2);-webkit-box-shadow:1px 1px 1px 0px rgba(0,0,0,0.2);box-shadow:1px 1px 1px 0px rgba(0,0,0,0.2);margin-right:3px;margin-right:10px;margin-bottom:7px}a.tag:hover{text-decoration:none;background:#FFEE8A}.following{width:100%;float:left;margin-bottom:2em}.avatar{height:37px;width:37px;margin:0 4px 4px 0;float:left}.news-item{width:100%;float:left}.news-item.update,.news-item.tags,.news-item.comment.for-me,.news-item.tip.for-me{margin:1.8em 0}.news-item:nth-of-type(1){margin-top:0}.news-item.first{margin-top:0}.news-item .user{font-weight:bold;color:#000}.news-item .comment{color:#999;font-style:italic;font-size:.8em}.news-item.for-me .comment{color:#000;font-style:normal;margin-top:.2em;font-size:.9em;margin-bottom:-.4em}.news-item .icon{width:20px;height:20px;background:#E6E6E6;float:left;margin-right:12px}.news-item.comment .icon{background:#DAEEA5}.news-item.comment.for-me .icon,.news-item.tip.for-me .icon{background-size:62px 62px;width:82px;height:62px;background-position:right top;background-repeat:no-repeat}.news-item.update .icon{background:#E93250}.news-item.tip .icon{background:#FFCC00}.news-item.follow .icon{background:#3399CC}.news-item .title{margin-bottom:.4em;position:relative;width:100%;float:left}.news-item .date{float:right;color:#aaa;font-size:11px;margin-top:.5em}.news-item .files{background:white}.news-item .file{width:90px;margin-bottom:0;padding:0}.news-item .file a:hover{text-decoration:none}.news-item .html-thumbnail{margin-top:1px;margin-left:0px;width:auto}.news-item .site-suggestion{height:auto;margin-bottom:10px}.news-item .tag{float:none;margin-left:4px}.news-item .actions{font-size:11px}.news-item .actions a{margin-right:6px}.news-item .content,.news-item .footer-Content{padding:0 0 0 32px}.news-item .comments{margin-bottom:1.5em;margin-top:.7em}.news-item .comments .comment{font-size:.8em}.news-item .comments .comment .user{margin-right:5px}.news-item .comments .comment .actions{margin-top:.3em}.news-item .avatar{margin-right:10px}.footer-Base{color:#5e5b56;float:left;width:100%}.footer-Base h1,.footer-Base h2,.footer-Base h3,.footer-Base h4{color:#8b9a7a}.footer-Intro{background:#daeea5;border-top:1px solid #cedbab;-moz-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);-webkit-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);position:relative}.footer-Intro .footer-Content{padding-top:40px;padding-bottom:40px}.f-Col{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;min-height:125px;padding-bottom:28px;position:relative}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col{min-height:2px;padding-left:15px !important;padding-right:100px !important}}.f-Col .action-Link{bottom:0;position:absolute;right:12px}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col .action-Link{position:static}} .footer-icon{background-repeat:no-repeat;position:absolute;right:0;top:-70px}@media (max-device-width: 480px), screen and (max-width: 800px){.footer-icon{-moz-background-size:100%;-ms-background-size:100%;-o-background-size:100%;-webkit-background-size:100%;background-size:100%;height:90px !important;top:0;width:77px !important}} .f-Col-1{padding-right:12px}.f-Col-1 .footer-icon{background-image:url(../img/support-us.png);height:104px;right:5px;width:92px}.f-Col-2{padding-left:15px;padding-right:6px;position:relative}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col-2{border-bottom:1px solid rgba(0,0,0,0.1);border-top:1px solid rgba(0,0,0,0.1);margin:20px 0;overflow:hidden;padding:20px 0}.f-Col-2 .footer-icon{top:14px}}.f-Col-2:before,.f-Col-2:after{background:url("../img/border.png") no-repeat 0 -20px;content:"";height:200px;opacity:0.2;position:absolute;top:0;width:1px}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col-2:before,.f-Col-2:after{display:none}}.f-Col-2:before{left:-14px}.f-Col-2:after{right:-14px}.f-Col-2 .footer-icon{background-image:url(../img/about-neocities.png);width:100px;height:106px}.f-Col-3{padding-left:20px}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col-3{padding-left:0}}.f-Col-3 .footer-icon{background-image:url(../img/latest-news.png);height:103px;width:134px}.footer-Outro{background:#ccdf9b;border-top:1px solid #b3c388;overflow:hidden}.footer-Outro a{color:#5e5b56}.credits{margin-bottom:0}.footer-Nav{text-transform:uppercase}.footer-Nav .h-Nav,.footer-Nav .bread{float:right}@media (max-device-width: 480px), screen and (max-width: 800px){.footer-Nav .h-Nav,.footer-Nav .bread{float:none;margin-top:15px}.footer-Nav .h-Nav li:first-child a,.footer-Nav .bread li:first-child a{padding-left:0}}.footer-Nav .h-Nav a,.footer-Nav .bread a{padding:0 8px}.footer-Nav .h-Nav li:last-child a,.footer-Nav .bread li:last-child a{padding-right:0}.alert{background-color:#F5BA00;color:#fff}.website-Gallery{list-style:none;padding:10px 0}.website-Gallery li{float:left;margin-bottom:8px}@media (max-device-width: 480px), screen and (max-width: 800px){.website-Gallery li{width:50%}}.website-Gallery a{padding:0 8px;display:block}.website-Gallery.int-Gall li{border:1px solid #ccc;margin:0 .5% 12px;width:24%}@media (max-device-width: 480px), screen and (max-width: 800px){.website-Gallery.int-Gall li{width:49%}}.website-Gallery.int-Gall li a{padding:8px}.neo-SS,.neo-Screen-Shot{background:#fff;-moz-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);-webkit-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);display:block;height:auto !important;padding:8px;position:relative;width:100%}.img-Holder{-moz-background-size:cover !important;-webkit-background-size:cover !important;background-size:cover !important;display:block}.hp-Gallery img,.neo-Screen-Shot img{width:100%} diff --git a/views/home_mockup.erb b/views/home_mockup.erb index 22b84489..3e314fe0 100644 --- a/views/home_mockup.erb +++ b/views/home_mockup.erb @@ -2,17 +2,18 @@

My Feed

-

All Activity Activity on your profile

+
All Activity Activity on your profile
-
+

My Website

-
-
+
+
+ <% if false %>

Welcome to your Neocities news feed!

You aren't following any websites yet! Once you do, updates will show up here and you can like and comment on them. Here are some website suggestions based on your tags, or check out all the sites on Neocities!

@@ -84,16 +85,174 @@
Games
+ <% end %> + + + +
+
+
+ Foo commented on Derp's website: I really like your site, your graphics are awesome and... + 30m +
+
+
+
+
+ New sites in games3h +
+
+
+
+ + + dragonquest + +
+
+
+
+ + + dragonquest + +
+
+
+
+ + + dragonquest + +
+
+
+
+ + + dragonquest + +
+
+
+
+ + + +
+
+
+ You tipped Derp's website: Wow, great work here! Please keep updating :)Apr 23 +
+
+ +
+
+
+ Foo commented on Derp's website: I had a question - how did you make it so that the... + Apr 20 +
+
+ + + +
+
+
+ Derp made an update Apr 7 +
+
+
+
+
cssstyles.css
+
+
+
styles.css
+
+
+
jsstyles.css
+
+
+
cat.jpg
+
+
+
jsstyles.css
+
+
+
Like (1) Reply
+
+
+ +
+
+
+ Derpie + Apr 7 +
Your site is amazing. Very helpful information. Would love to see more updates if you have time. Your site is amazing. Very helpful information. Would love to see more updates if you have time.
+
+
+
Like (1) Reply
+
+
+ + victoria Indeed, it's great!Apr 7 +
Like (1)
+
+
+
+
+ +
+
+
+ Foo commented on Derp's website: I had a question - how did you make it so that the... + Apr 7 +
+
+ + + +
+
+
+ victoria tipped you .01 BTC + Apr 7 +
Hey, this looks great!
+
+
+
Like (1) Reply
+
+
+

http://<%= current_site.username %>.neocities.org

-
Last updated <%= current_site.updated_at.ago %>
-
<%= current_site.hits.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> hits - 24 followers - 3 tips ($13.55) +
+
Last updated
<%= current_site.updated_at.ago %>
+
+
<%= current_site.hits.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> hits
+
24 followers
+
3 tips ($13.55)
+
+
- +

Following

@@ -123,5 +282,5 @@ Art Cooking
-
+
\ No newline at end of file