diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index ca8d13e3..817d30d5 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -57,7 +57,11 @@ font-weight: bold; } .interior .header-Outro .row.content { - + padding-left: 3%; + padding-right: 3%; + h1, h2, h3 { + padding-left: 2px; + } } .interior .header-Outro .subtitle { font-size: 1em; @@ -72,10 +76,13 @@ -moz-box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10); -webkit-box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10); box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10); - padding: 1px 3% 40px 3%; + padding: 25px 3% 40px 3%; h1, h2, h3, h4, h5, h6 { margin-top: 1em; + &:first-child { + margin-top: 0; + } } } .content.single-Col.misc-page { @@ -175,7 +182,7 @@ background: #daeea5 url(/img/heartcat.png) no-repeat 20px center; background-size: 77px 81px; padding: 20px 20px 20px 111px; - margin-bottom: 20px; + margin-bottom: 13px; } .welcome h4 { font-size: 1.2em; @@ -192,6 +199,7 @@ background: #E4D8CB; width: 100%; position: relative; + margin-top: 7px; } .files .header { background: #5E95A1; @@ -876,13 +884,14 @@ a.tag:hover { } } #followLink.is-following { - width: 8.7em; + .follow { display: none; } .following { - display: inline; + display: block; + width: 5.9em; } .unfollow { display: none; @@ -896,7 +905,8 @@ a.tag:hover { display: none; } .unfollow { - display: inline; + display: block; + width: 5.9em; } } .popover { @@ -1145,8 +1155,16 @@ a.tag:hover { float:left; background-repeat: no-repeat; margin-right: 30px; + background-size: 100%; - @media (max-device-width:480px), screen and (max-width:800px){ + @media (max-width:1170px) and (min-width:900px){ + margin-right: 25px!important; + + &:last-child { + margin-right: 0!important; + } + } + @media (max-device-width:480px), screen and (max-width:900px){ margin-top: 25px !important; display:block; float:none; @@ -1157,29 +1175,40 @@ a.tag:hover { width: 211px; height: 44px; background-image: url(/img/wired-logo.png); - background-size: 211px; margin-top: 6px; margin-right: 38px; + + @media (max-width:1170px) and (min-width:900px){ + width: 170px; + } } .section .logo.fastco { width: 262px; height: 39px; background-image: url(/img/fastcompany-logo.png); - background-size: 262px; - margin-top: 7px; + margin-top: 7px; + @media (max-width:1170px) and (min-width:900px){ + width: 220px; + } } .section .logo.vice { width: 160px; height: 50px; background-image: url(/img/vice-logo.png); - background-size: 160px; + @media (max-width:1170px) and (min-width:900px){ + width: 120px; + margin-top: 4px; + } } .section .logo.ars { width: 187px; height: 62px; background-image: url(/img/ars-logo.png); - background-size: 187px; margin-top: -4px; + @media (max-width:1170px) and (min-width:900px){ + width: 130px; + margin-top: 0; + } } .section .press .more { color: #A0BAC0; diff --git a/views/about.erb b/views/about.erb index becf9048..bfae797f 100644 --- a/views/about.erb +++ b/views/about.erb @@ -6,7 +6,6 @@
-

Neocities is bringing back the fun, creativity and independence that made the web great.

diff --git a/views/index.erb b/views/index.erb index 8096064d..6278c4e9 100644 --- a/views/index.erb +++ b/views/index.erb @@ -161,8 +161,8 @@
- - + + diff --git a/views/new.erb b/views/new.erb index d51fb0ff..51773104 100644 --- a/views/new.erb +++ b/views/new.erb @@ -11,7 +11,6 @@
-

diff --git a/views/not_found.erb b/views/not_found.erb index 95a98b40..433a2ad5 100644 --- a/views/not_found.erb +++ b/views/not_found.erb @@ -6,7 +6,6 @@
-

diff --git a/views/password_reset.erb b/views/password_reset.erb index 1e244edd..b5fc50eb 100644 --- a/views/password_reset.erb +++ b/views/password_reset.erb @@ -5,7 +5,6 @@

-

Note: If you provided your e-mail, you can reset your password. If you didn't, you will not be able to reset your password, and instead should create a new account. We cannot change a password without an entered email for security reasons. diff --git a/views/plan/thanks.erb b/views/plan/thanks.erb index e96a5db7..4eb1778d 100644 --- a/views/plan/thanks.erb +++ b/views/plan/thanks.erb @@ -6,7 +6,6 @@

-

diff --git a/views/privacy.erb b/views/privacy.erb index d1fdf1f8..7539b895 100644 --- a/views/privacy.erb +++ b/views/privacy.erb @@ -5,9 +5,7 @@
-
-

- +

Our Privacy Policy was last updated and posted on June 3, 2013. It governs the privacy terms of our Website, located at http://neocities.org. Any capitalized terms not defined in our Privacy Policy, have the meaning as specified in our Terms of Service.

Your Privacy
Neocities follows all legal requirements to protect your privacy. Our Privacy Policy is a legal statement that explains how we may collect information from you, how we may share your information, and how you can limit our sharing of your information. You will see terms in our Privacy Policy that are capitalized. These terms have meanings as described in the Definitions section below.

diff --git a/views/signin.erb b/views/signin.erb index bbeaa78e..c16ab1b5 100644 --- a/views/signin.erb +++ b/views/signin.erb @@ -6,8 +6,6 @@
-

- <% if flash.keys.length > 0 %>

diff --git a/views/site_files/mount_info.erb b/views/site_files/mount_info.erb index 50755aa8..dd3c46df 100644 --- a/views/site_files/mount_info.erb +++ b/views/site_files/mount_info.erb @@ -6,7 +6,6 @@

-

About

diff --git a/views/site_files/new_page.erb b/views/site_files/new_page.erb index dfb5a5dc..28fa090d 100644 --- a/views/site_files/new_page.erb +++ b/views/site_files/new_page.erb @@ -7,7 +7,6 @@
-

<% if @errors %>
diff --git a/views/stats.erb b/views/stats.erb index 765ec063..d707392d 100644 --- a/views/stats.erb +++ b/views/stats.erb @@ -5,7 +5,6 @@
-

General Stats

diff --git a/views/terms.erb b/views/terms.erb index 3a48b0af..789fb1e7 100644 --- a/views/terms.erb +++ b/views/terms.erb @@ -6,7 +6,6 @@
-

This web page represents a legal document that serves as our Terms of Service and it governs the legal terms of our website, https://neocities.org, sub-domains, and any associated web-based and mobile applications (collectively, "Website"), as owned and operated by Neocities.

Capitalized terms, unless otherwise defined, have the meaning specified within the Definitions section below. This Terms of Service, along with our Privacy Policy, any mobile license agreement, and other posted guidelines within our Website, collectively "Legal Terms", constitute the entire and only agreement between you and Neocities, and supersede all other agreements, representations, warranties and understandings with respect to our Website and the subject matter contained herein. We may amend our Legal Terms at any time without specific notice to you. The latest copies of our Legal Terms will be posted on our Website, and you should review all Legal Terms prior to using our Website. After any revisions to our Legal Terms are posted, you agree to be bound to any such changes to them. Therefore, it is important for you to periodically review our Legal Terms to make sure you still agree to them.

diff --git a/views/tutorials.erb b/views/tutorials.erb index d424755d..d6111415 100644 --- a/views/tutorials.erb +++ b/views/tutorials.erb @@ -1,12 +1,10 @@

Learn How to Make Web Sites!

-

-

Learning how to make web sites is one of the most important things you can learn. It allows you to create any content you want, arrange that content in any way you like, and share that content with the world. Be it an information portal for teaching people how to repair bikes, or an interesting graphics project, or your poetry. These are things you can't do with traditional social networks, but that you can do with HTML.