Merge branch 'v2' of github.com:neocities/neocities into v2

public/assets/css/_project-sass/_project-Footer.scss

@@ -24,11 +24,18 @@
 	border-top:1px solid #cedbab;
 	@include box-shadow($bs-4);
 	position:relative;
-	
-	.footer-Content{	
-    padding-top:40px;
-    padding-bottom:40px;
 }
+.footer-Content{	
+  padding-top:20px;
+  padding-bottom:20px;
+  padding-left: 40px;
+  padding-right: 20px;
+  @media (max-device-width:480px), screen and (max-width:800px){
+    padding-left: 20px; 
+  }
+}
+.footer-Content .row {
+  margin-left: 0;
 }
 
 .f-Col{

public/assets/css/_project-sass/_project-Main.scss

@@ -84,6 +84,7 @@
 // Dashboard
 .interior .header-Outro .col.col-50.signup-Area {padding-left: 0;}
 .interior .header-Outro a {color:#E93250}
+.interior .header-Outro .btn-Action {color:#fff}
 .interior .signup-Area {
   min-height: 164px;
 }
@@ -561,7 +562,10 @@ a.tag:hover {
   margin-top: .5em;
 }
 .news-item .files {
-  background: white;
+  background: #eee;
+  padding: 8px 10px 2px 10px;
+  border-top: 1px solid #ddd;
+  margin-bottom: 4px;
 }
 .news-item .file {
   width: 90px;
@@ -609,3 +613,61 @@ a.tag:hover {
 .news-item .avatar {
   margin-right: 10px;
 }
+//profile
+.signup-Area.large {
+  width: 418px;
+  height: 236px;
+}
+.interior .header-Outro.with-site-image {
+  padding-top: 20px;
+}
+.report {
+  margin-top: 2em;
+  float: left;
+  width: 100%;
+  font-size: .8em;
+}
+.report, .report a {
+  color: #999;
+}
+.header-Outro .actions a {
+  margin-right: 7px;
+}
+.header-Outro .stats {
+  margin-bottom: 1.2em;
+  float: left;
+  width: 100%;
+  margin-top: 2em;
+}
+.header-Outro .stats strong {
+  font-size: 1.5em;
+  font-weight: bold;
+  color: #DAEEA5;
+}
+.header-Outro .stats span {
+  font-size: .7em;
+  text-transform: uppercase;
+  clear: both;
+  display: block;
+}
+.header-Outro .stats .stat {
+  float: left;
+  width: 90px;
+  text-align: center;
+}
+.header-Outro .stats .stat.tips {
+  width: 60px;
+}
+.btn-Action.follow span {
+  background-image: url(../img/follow.png);
+  padding-left: 22px;
+}
+.btn-Action.tip span {
+  background-image: url(../img/tip.png);
+  padding-left: 26px;
+  background-position-y: 1px;
+}
+.btn-Action.share span {
+  background-image: url(../img/share.png);
+  padding-left: 26px;
+}

views/dashboard.erb

@@ -24,8 +24,8 @@
 <div id="upload_status" style="font-size: 16pt"></div>
 -->
 
-<div class="header-Outro">
+<div class="header-Outro with-site-image">
-  <div class="row content wide" style="padding-top: 10px">
+  <div class="row content wide">
 
     <div class="col col-50 signup-Area" style="width: 289px;">
       <div class="signup-Form">

views/profile_mockup.erb

@@ -1,6 +1,26 @@
-<div class="header-Outro">
+<div class="header-Outro with-site-image">
   <div class="row content">
-      <h3>Derp's Website</h3>
+    <div class="col col-50 signup-Area large">
+      <div class="signup-Form">
+  	  <fieldset class="content">
+        <img class="screenshot" src="http://neocities.org/site_screenshots/codeventurer.jpg" style="width: 358px;height: 215px;">
+	    </fieldset>
+      </div>
+    </div>
+    <div class="col col-50">
+      <h2 class="eps">Derp's Website</h2>
+      <p class="site-url" style="margin-top: -9px;"><a href="http://<%= current_site.username %>.neocities.org" target="_blank">http://<%= current_site.username %>.neocities.org</a></p>
+      <div class="stats">
+        <div class="stat"><strong>23.5K</strong> <span>visitors</span></div>
+        <div class="stat"><strong>342</strong> <span>followers</span></div>
+        <div class="stat tips"><strong>7</strong> <span>tips</span></div>
+      </div>
+      <div class="actions">
+        <a href="" class="btn-Action follow"><span>Follow</span></a>
+        <a href="" class="btn-Action tip"><span>Tip</span></a>
+        <a href="" class="btn-Action share"><span>Share</span></a>
+      </div>
+    </div>
   </div>
 </div>
 
@@ -146,6 +166,10 @@
     <a class="tag" href="http://neocities.org">Anime</a>
     <a class="tag" href="http://neocities.org">Art</a>
     <a class="tag" href="http://neocities.org">Cooking</a>
+    
+    <div class="report">
+      <a href="">Report</a> | <a href="">Block</a>
+    </div>
   </div>
 </div></div>
 </div>