From bc39a77dc0d8fa685e038635007a5e7ca085cab2 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 15 Oct 2014 15:41:08 -0700 Subject: [PATCH 1/7] Changed popover colors --- sass/_project-sass/_project-Main.scss | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 491ca4c6..1df110b5 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -553,7 +553,6 @@ a.tag:hover { .news-item.tip .icon { background: #FFCC00; } - .news-item.follow .icon { background: #3399CC; } @@ -704,6 +703,15 @@ a.tag:hover { display: inline; } } +.popover { + background-color: #5E95A1; + a { + color: white; + } +} +.popover.bottom .arrow:after { + border-bottom-color: #5E95A1; +} .col-33 .stats .stat { margin-bottom: .4em; } From ae2bd68858138f67f82a97bb7881f96a76262e64 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 15 Oct 2014 16:17:29 -0700 Subject: [PATCH 2/7] Fixes to following/follower lists --- sass/_project-sass/_project-Main.scss | 2 +- views/_follows.erb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 1df110b5..ca85cfba 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -484,7 +484,7 @@ a.tag:hover { text-decoration: none; background: #FFEE8A; } -.follower-list { +.follower-list, .following-list { width: 100%; float: left; margin-bottom: 2em; diff --git a/views/_follows.erb b/views/_follows.erb index 7f999493..9304b0a0 100644 --- a/views/_follows.erb +++ b/views/_follows.erb @@ -1,7 +1,7 @@ <% site_followings = site.followings %> <% if (!is_current_site && !site_followings.empty?) || is_current_site %> -

<%= is_current_site ? 'You follow' : 'This site follows' %>

-
+
+

<%= is_current_site ? 'You follow' : 'This site follows' %>

<% if site_followings.empty? %>

You are not following any sites yet. Add some by browsing sites or looking at your tags. <% else %> @@ -14,8 +14,8 @@ <% site_follows = site.follows %> <% if (!is_current_site && !site_follows.empty?) || is_current_site %> -

Followers

+

Followers

<% if site_follows.empty? %> No followers yet. <% else %> From 275314513e4885de3c03e5804847598bdf8e8034 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 15 Oct 2014 16:52:48 -0700 Subject: [PATCH 3/7] Tweaks to browse page --- .../_project-Website-Gallery.scss | 43 +++++++++++++------ views/browse.erb | 11 +++-- 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/sass/_project-sass/_project-Website-Gallery.scss b/sass/_project-sass/_project-Website-Gallery.scss index 33e04e16..a4216577 100644 --- a/sass/_project-sass/_project-Website-Gallery.scss +++ b/sass/_project-sass/_project-Website-Gallery.scss @@ -11,7 +11,7 @@ float:left; margin-bottom:$spacing*2; color: #666; - @include box-shadow(1px 1px 2px 0px rgba(0, 0, 0, 0.15)); + @include box-shadow(1px 1px 2px 0px rgba(0, 0, 0, 0.18)); @media (max-device-width:480px), screen and (max-width:800px){ width:50% @@ -21,22 +21,40 @@ // li a { // display:block; // } - .site-info a { - color: #666; - font-size: 80%; + .site-info { + a { + color: #666; + font-size: 80%; + } + .username { + float: left; + overflow: hidden; + width: 70%; + } + .site-stats { + float: right; + overflow: hidden; + width: 28%; + text-align: right; + } + .fa-user { + margin-right: .45em; + display: inline; + } + .site-tags { + width: 100%; + height: 1.4em; + float: left; + margin-top: -4px; + } + .site-tags .fa-tag { + vertical-align: -2px; + } } .title { margin-top: 8px; margin-bottom: 2px; } - .site-tags { - width: 100%; - clear: both; - height: 1.4em; - } - .site-tags .fa-tag { - vertical-align: -2px; - } &.int-Gall{ @@ -71,6 +89,7 @@ -webkit-background-size:cover!important; background-size:cover!important; display:block; + border: 1px solid #eee; } .hp-Gallery img, .neo-Screen-Shot img{ width:100% diff --git a/views/browse.erb b/views/browse.erb index b0ce966b..41659937 100644 --- a/views/browse.erb +++ b/views/browse.erb @@ -73,18 +73,17 @@ <%= site.title.shorten(30) %>
-
+
- - <%= site.username %> + <%= site.username %>
-
+
<% if params[:sort_by] == 'hits' %> - <%= site.hits %> hit<%= site.hits == 1 ? '' : 's' %> + <%= site.hits %> hit<%= site.hits == 1 ? '' : 's' %> <% else %> - <%= site.views %> view<%= site.views == 1 ? '' : 's' %> + <%= site.views %> view<%= site.views == 1 ? '' : 's' %> <% end %>
From 6bb76f18940c8bbbb0b27cee180ae6bb56527fb8 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 15 Oct 2014 17:38:19 -0700 Subject: [PATCH 4/7] News feed suggestions now using the same site gallery style as the browse page --- sass/_project-sass/_project-Main.scss | 5 ++- .../_project-Website-Gallery.scss | 14 ++++++ views/home.erb | 44 ++++++++++++++----- 3 files changed, 50 insertions(+), 13 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index ca85cfba..8e323777 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -1080,7 +1080,10 @@ a.tag:hover { .pagination .arrow { vertical-align: 1px; } - +.view-all-sites { + font-size: 1.2em; + margin-top: 1em; +} .interior .header-Outro.with-columns .col.filter { padding-top: 0px; padding-bottom: 4px; diff --git a/sass/_project-sass/_project-Website-Gallery.scss b/sass/_project-sass/_project-Website-Gallery.scss index a4216577..17eb828f 100644 --- a/sass/_project-sass/_project-Website-Gallery.scss +++ b/sass/_project-sass/_project-Website-Gallery.scss @@ -54,6 +54,7 @@ .title { margin-top: 8px; margin-bottom: 2px; + white-space: nowrap; } &.int-Gall{ @@ -73,6 +74,19 @@ width:49% } } + &.suggestions { + padding: .25em 0 0 0; + + li { + margin: 0 1.33% 12px 0; + width: 32%; + @include box-shadow(1px 1px 2px 1px rgba(0, 0, 0, 0.1)); + + @media (max-width:1000px){ + width:48% + } + } + } } } diff --git a/views/home.erb b/views/home.erb index 9e2aa9ae..ce44c116 100644 --- a/views/home.erb +++ b/views/home.erb @@ -29,27 +29,47 @@

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. + 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 for you. Want to find some sites to follow? Check out all the sites on Neocities!

+ +

View all sites

<% end %>
From 0937bc030651d9a3bd902f9dc56e5ab5a857a8cc Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 15 Oct 2014 17:49:17 -0700 Subject: [PATCH 5/7] Header dropdown menu tweaks --- sass/_project-sass/_project-Header.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sass/_project-sass/_project-Header.scss b/sass/_project-sass/_project-Header.scss index b4fa7739..ec9c33f2 100644 --- a/sass/_project-sass/_project-Header.scss +++ b/sass/_project-sass/_project-Header.scss @@ -299,10 +299,9 @@ } .dropdown-menu { + width: 100%; margin-left: -1px; - top: 0; margin-top: -1px; - margin-right: 3px; li { overflow: hidden; From 570db1211bed261c135f9e864bf3c409aad668b6 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 15 Oct 2014 18:11:17 -0700 Subject: [PATCH 6/7] Removing tips data for now --- views/home.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/views/home.erb b/views/home.erb index ce44c116..9ca99075 100644 --- a/views/home.erb +++ b/views/home.erb @@ -87,7 +87,6 @@
<%= site.views_english %> unique views
<%= site.hits_english %> hits
<%= site.follows_dataset.count %> followers
-
<%= site.tips_dataset.count %> tips ($<%= site.tip_amount %>)
From 1c2433c670421a6bacf74bb054d9209bc110689b Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 15 Oct 2014 19:04:57 -0700 Subject: [PATCH 7/7] Fixed site portrait in news feed sidebar --- sass/_project-sass/_project-Main.scss | 5 +++++ views/home.erb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 8e323777..96583a9c 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -448,6 +448,11 @@ .large-portrait { border: 10px solid white; @include box-shadow(1px 1px 2px 1px rgba(0, 0, 0, 0.15)); + width: 322px; + height: 241px; + background-size: cover; + float: left; + margin-bottom: 20px; } .site-portrait { border: 5px solid white; diff --git a/views/home.erb b/views/home.erb index 9ca99075..55318524 100644 --- a/views/home.erb +++ b/views/home.erb @@ -90,9 +90,9 @@
- + -
+
View Site Profile