From a524ef7de57e9bdc98c4739552cd47cb68df3be0 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Tue, 23 Sep 2014 13:53:58 -0700 Subject: [PATCH 1/2] More progress on new homepage css --- public/img/hpgallery-next.png | Bin 0 -> 3468 bytes public/img/hpgallery-prev.png | Bin 0 -> 3436 bytes sass/_project-sass/_project-Header.scss | 5 +- sass/_project-sass/_project-Main.scss | 32 +++++- .../_project-Website-Gallery.scss | 32 +++--- views/newindex_mockup.erb | 95 ++++++++++-------- 6 files changed, 101 insertions(+), 63 deletions(-) create mode 100644 public/img/hpgallery-next.png create mode 100644 public/img/hpgallery-prev.png diff --git a/public/img/hpgallery-next.png b/public/img/hpgallery-next.png new file mode 100644 index 0000000000000000000000000000000000000000..9ae5ff62c27f76b4684fe6cbf550f02115a901df GIT binary patch literal 3468 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 aWpj_uvUpydGKK#~Bw%ahV9CK8O8gJUev4xO literal 0 HcmV?d00001 diff --git a/public/img/hpgallery-prev.png b/public/img/hpgallery-prev.png new file mode 100644 index 0000000000000000000000000000000000000000..512957cd8cb75c9cdfd468d928e6f3d3610577a6 GIT binary patch literal 3436 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 literal 0 HcmV?d00001 diff --git a/sass/_project-sass/_project-Header.scss b/sass/_project-sass/_project-Header.scss index 2b246565..7b0da328 100644 --- a/sass/_project-sass/_project-Header.scss +++ b/sass/_project-sass/_project-Header.scss @@ -13,12 +13,15 @@ border-bottom: 0; } +.row.header-Content.content { + padding-bottom:27px; +} + .header-Content{ @media(max-device-width:480px), screen and (max-width:800px){ padding:0; } } - .blurb{background:#fff} .header-Intro{ diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 70782018..f68dc207 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -757,10 +757,28 @@ a.tag:hover { .section { padding: 50px 10%; margin: 0 auto; + float: left; } .section.featured-Websites { background:#971D31; - padding: 10px 2% 1px 2%; + padding: 30px 0; + width: 100%; + position:relative; +} +.section.featured-Websites .nav { + float:left; + width:4.25%; + height:45px; + background-size: 22px; + background-repeat: no-repeat; + background-position: center center; + margin-top: 3%; +} +.section.featured-Websites .nav.prev { + background-image:url(/img/hpgallery-prev.png); +} +.section.featured-Websites .nav.next { + background-image:url(/img/hpgallery-next.png); } .section.features { background: #4F7E89; @@ -769,13 +787,19 @@ a.tag:hover { color: #fff; } .section h2 { - font-size: 1.6em; + font-size: 1.7em; + text-align:center; +} +.section h3 { + font-size: 1.4em; + margin-top: 1.5em; + margin-bottom: .2em; } .section.last { - background: #666666; + background: #fff; } .section.last h2, .section.last blockquote { - color: white; + color: black; } .selected { font-weight: bold; diff --git a/sass/_project-sass/_project-Website-Gallery.scss b/sass/_project-sass/_project-Website-Gallery.scss index 72dfdb98..571937fc 100644 --- a/sass/_project-sass/_project-Website-Gallery.scss +++ b/sass/_project-sass/_project-Website-Gallery.scss @@ -30,16 +30,15 @@ &.int-Gall{ - li{ - + li { margin:0 .5% 12px; width:24%; background-color: white; border: 9px solid white; - -moz-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2); - box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.3); + box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.3); @media (max-device-width:480px), screen and (max-width:800px){ width:49% @@ -48,8 +47,8 @@ } } -.neo-SS, .neo-Screen-Shot{ - border: 1px solid #eee; +.neo-SS, .z{ + border: 4px solid #eee; display:block; height:auto!important; position:relative; @@ -62,14 +61,19 @@ background-size:cover!important; display:block; } - .hp-Gallery img, .neo-Screen-Shot img{ width:100% } -.hp-Gallery li { - width: 14%; - margin-right: 2%; -} -.hp-Gallery { - padding: 24px 24px; +.hp-Gallery { + padding: 0px; + margin-bottom: 0; + + li { + width: 14%; + margin-right: 1.5%; + margin-bottom: 0; + } + li:last-child { + margin-right: 0; + } } diff --git a/views/newindex_mockup.erb b/views/newindex_mockup.erb index 8b8249ce..27a32c16 100644 --- a/views/newindex_mockup.erb +++ b/views/newindex_mockup.erb @@ -121,7 +121,6 @@

Introducing the New Neocities

Now’s a great time to join our community of over <%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> websites! -
You get <%= Site::FREE_MAXIMUM_IN_MEGABYTES %> MB of free web space to make whatever you’d like.

  • @@ -196,57 +195,65 @@
    - + + +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce dapibus semper magna id euismod. Vivamus rutrum ultricies.

    -

    You own your own site

    -

    We support custom domains (yoursite.com) for free. This means you always control the content on your site, and you can move it to/from Neocities whenever you want. And of course, all sites still get a subdomain (sitename.neocities.org) for free.

    +
    +

    You own your own site

    +

    We support custom domains (yoursite.com) for free. This means you always control the content on your site, and you can move it to/from Neocities whenever you want. And of course, all sites still get a subdomain (sitename.neocities.org) for free.

    -

    Developer tools

    -

    We now have powerful APIs for developers building applications, and support for remote file uploading via command line tools. Using WebDAV, you can now mount your site to your computer, just like Dropbox.

    +

    Developer tools

    +

    We now have powerful APIs for developers building applications, and support for remote file uploading via command line tools. Using WebDAV, you can now mount your site to your computer, just like Dropbox.

    +
    + +
    +

    More space, more performance

    +

    Neocities now uses a distributed, globally-cached file system in tier-1 datacenters to serve your sites. It's a system that took us a year to build - and it's ready to serve your site with blazing speed, whether it's your personal home page, or your professional site. Go ahead, put your site on Neocities. We can handle it.

    +
    + +
    +

    Encrypted everything

    +

    Neocities now secures serving all your content with Snowden-grade cryptography, by default, preventing snoops, whether they are hackers or rogue government agencies, from seeing what you browse. And we're working on letting you use your own SSL (HTTPS) certificates for custom domains. -

    More space, more performance

    -

    Neocities now uses a distributed, globally-cached file system in tier-1 datacenters to serve your sites. It's a system that took us a year to build - and it's ready to serve your site with blazing speed, whether it's your personal home page, or your professional site. Go ahead, put your site on Neocities. We can handle it.

    - -

    Encrypted everything

    -

    Neocities now secures serving all your content with Snowden-grade cryptography, by default, preventing snoops, whether they are hackers or rogue government agencies, from seeing what you browse. And we're working on letting you use your own SSL (HTTPS) certificates for custom domains. - -Until January, Neocities will donate 5% of all Supporter plan proceeds to the Courage Foundation, an international organization that supports those who risk life or liberty to disclose privacy abuses online.

    + Until January, Neocities will donate 5% of all Supporter plan proceeds to the Courage Foundation, an international organization that supports those who risk life or liberty to disclose privacy abuses online.

    +
    From ec1a19e7e8cd6c7a3f23812ab3c94edf504583af Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Tue, 23 Sep 2014 14:14:47 -0700 Subject: [PATCH 2/2] Fixed issue with autocomplete field looking super wide in first second of loading on browse page. Still a little wonky --- sass/_project-sass/_project-Main.scss | 2 +- views/browse.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index f68dc207..6f7c4ee9 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -833,7 +833,7 @@ a.tag:hover { width: 40%; } .browse-page .input-Area { - width: 100%; + width: auto; padding: 4px 5px; } .header-Outro .twitter-typeahead { diff --git a/views/browse.erb b/views/browse.erb index 2fb8e8c5..2d4d9cd1 100644 --- a/views/browse.erb +++ b/views/browse.erb @@ -45,7 +45,7 @@
    - +