From 14ebe8128a84a1c13dc397770bbcfa705b105c8c Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Tue, 24 Feb 2015 21:43:07 -0600 Subject: [PATCH 1/4] Misc header tweaks --- sass/_project-sass/_project-Header.scss | 4 ++-- sass/_project-sass/_project-Main.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sass/_project-sass/_project-Header.scss b/sass/_project-sass/_project-Header.scss index a2ea1497..7955e5ec 100644 --- a/sass/_project-sass/_project-Header.scss +++ b/sass/_project-sass/_project-Header.scss @@ -98,9 +98,9 @@ margin-left: 8px; } - h2{ + h3 { margin-bottom: 0px; - font-size: 1.725em; + font-size: 1.7em; } p { diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 2b31a539..9456688a 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -99,7 +99,7 @@ font-size: 1em; } .content.misc-page h1 { - font-size: 2em; + font-size: 1.8em; margin-bottom: 20px; } .content.misc-page hr { From fbf66be7b0025153e8e8b4fc66588fa42e6a3f9b Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Tue, 24 Feb 2015 21:44:42 -0600 Subject: [PATCH 2/4] Assuming "websome" was a typo ;) --- views/activity.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/activity.erb b/views/activity.erb index 31522a3f..29961c04 100644 --- a/views/activity.erb +++ b/views/activity.erb @@ -14,7 +14,7 @@

All the latest Neocities site news!

- Neocities allows everyone create a free web site to express themselves. Want to create your own websome site? Join us! + Neocities allows everyone create a free web site to express themselves. Want to create your own awesome site? Join us!

<% end %> From 804067d9c30f8b0cd539d2f31a37a052976df711 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Tue, 24 Feb 2015 22:33:22 -0600 Subject: [PATCH 3/4] Quick conversion of Global Activity page into the standard one-column layout. This will eventually be turned into a two-col layout. --- views/activity.erb | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/views/activity.erb b/views/activity.erb index 29961c04..641920a7 100644 --- a/views/activity.erb +++ b/views/activity.erb @@ -1,26 +1,19 @@ -
-
-
-

Latest Activity on Neocities

-
+
+
+

Latest Activity on Neocities

- -
-
-
-
- <% if !signed_in? %> -
-

All the latest Neocities site news!

-

- Neocities allows everyone create a free web site to express themselves. Want to create your own awesome site? Join us! -

-
- <% end %> - - <%== erb :'_news', locals: {current_site: nil, events: @events} %> +
+
+ <% if !signed_in? %> +
+

All the latest Neocities site news!

+

+ Neocities allows anyone to create a free web site to express themselves. Want to create your own awesome site? Join us! +

-
+ <% end %> + + <%== erb :'_news', locals: {current_site: nil, events: @events} %>
-
+
\ No newline at end of file From 671f5af4934ec86903f2aa52f6dc1ab78a405b6f Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Tue, 24 Feb 2015 22:58:24 -0600 Subject: [PATCH 4/4] Site profile - fixed pluralization of values in header, moved Number of Updates from sidebar to header #64 --- views/site.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/views/site.erb b/views/site.erb index 1a167b93..f2924c6e 100644 --- a/views/site.erb +++ b/views/site.erb @@ -22,10 +22,11 @@

<%= site.title %> <% if site.supporter? %> <% end %>

<%= site.host %>

-
<%= site.views.format_large_number %> views
+
<%= site.views.format_large_number %> view<%= site.views == 1 ? '' : 's' %>
<% follows_count = site.follows_dataset.count %> -
<%= follows_count.format_large_number %> follower<%= follows_count == 0 ? '' : 's' %>
- +
<%= follows_count.format_large_number %> follower<%= follows_count == 1 ? '' : 's' %>
+
<%= site.changed_count.format_large_number %> update<%= site.changed_count == 1 ? '' : 's' %>
+
<% if current_site == site %> @@ -107,7 +108,6 @@ <% end %>
-
Number of updates<%= site.changed_count.format_large_number %>
Created<%= site.created_at.strftime('%b %-d, %Y') %>