From 0cb39bcf555ccc96b651053dac67409b794eb1d9 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 27 Oct 2014 17:58:52 -0700 Subject: [PATCH 1/4] Fix yellow tag visited color --- sass/_project-sass/_project-Main.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 7c8b8291..fe9b97a6 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -498,11 +498,11 @@ margin-top: .2em; margin-bottom: -.2em; } -a.tag { +a.tag, a.tag:visited { font-size: .7em; text-transform: uppercase; background: #FFFFCC; - color: #C1A009; + color: #C1A009!important; float: left; padding: 1px 5px; -moz-box-shadow: 1px 1px 1px 0px rgba(0,0,0,0.2); From 8e268d2ec35f5769d3f340878352a1737688480e Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 27 Oct 2014 18:15:34 -0700 Subject: [PATCH 2/4] Fix for post-comment field not working --- sass/_project-sass/_project-Main.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index fe9b97a6..0f2e6a17 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -807,10 +807,9 @@ a.tag:hover { } .post-comment { background: #DAEEA5; - float: left; width: 100%; - padding: 20px 0 10px 30px; - margin: 0 0 28px 0; + padding: 20px 0 15px 30px; + margin: 0 0 3px 0; } .post-comment input { width: 84%; From 84beecac20df0e978af2819ab0ef48301af5ea76 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 27 Oct 2014 18:23:24 -0700 Subject: [PATCH 3/4] Fixes bug with 'like' popovers being cut off on the left (due to overflow:hidden) but requires min-height for new feed and site profile main content areas. Main problem is site profiles with short sidebars are now longer than they should be. Need better solution later. --- sass/_project-sass/_project-Main.scss | 8 ++++++-- views/home.erb | 4 +--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 0f2e6a17..c659180f 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -377,7 +377,6 @@ position: relative; clear: both; width: 100%; - overflow: hidden; } .col-left { float: left; @@ -401,7 +400,6 @@ margin-top: 0; } .right-col .col-left { - background-color: white; right: 33%; } .content.misc-page.columns .col, .site-profile-padding { @@ -411,13 +409,19 @@ .content.misc-page.columns .col-66 { width: 67%; left: 33%; + background: white; } .site-profile .content.misc-page.columns .col-66 { padding: 0; + min-height: 38em; +} +.news-feed .content.misc-page.columns .col-66 { + min-height: 56em; } .content.misc-page.columns .col-33 { width: 33%; left: 33%; + float: right; } .interior .header-Outro.with-columns { padding-top: 22px; diff --git a/views/home.erb b/views/home.erb index 074297ba..7c353d15 100644 --- a/views/home.erb +++ b/views/home.erb @@ -19,12 +19,10 @@ -
+
- - <% if site.followings_dataset.count == 0 %>

Welcome to your Neocities news feed!

From e35d3dbc6fe9e149b8d8ba6b6793e525d667a129 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 27 Oct 2014 18:26:15 -0700 Subject: [PATCH 4/4] Wrap overly long url in newsfeed sidebar --- sass/_project-sass/_project-Main.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index c659180f..8b120f46 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -38,6 +38,7 @@ .site-url { font-size:18px; margin-bottom: 8px; + word-wrap: break-word; } .site-url a { color: #e93250;