diff --git a/public/img/welcomingcat.png b/public/img/welcomingcat.png new file mode 100644 index 00000000..7fce69e4 Binary files /dev/null and b/public/img/welcomingcat.png differ diff --git a/sass/_project-sass/_project-Header.scss b/sass/_project-sass/_project-Header.scss index 28e64804..46a6f35a 100644 --- a/sass/_project-sass/_project-Header.scss +++ b/sass/_project-sass/_project-Header.scss @@ -14,7 +14,7 @@ } .row.header-Content.content { - padding-bottom:27px; + padding-bottom: 31px; } .header-Content.content{ @@ -28,7 +28,7 @@ background:url(/img/neocity.png) 95% bottom no-repeat; background-size: 734px; min-height:214px; - + @media (max-device-width:480px), screen and (max-width:800px){ @include vendor(background-size, cover); min-height:2px; @@ -64,7 +64,7 @@ color: #B8D375; font-size: .9em; margin-bottom: 1.8em; - + a { color: #B8D375; border-bottom: 1px solid rgba(184, 211, 117, 0.5); @@ -90,7 +90,7 @@ @include vendor(transform, scaleX(-1)); width: 100px; margin-right: 25px; - + &.float-Right { margin-left: 10px; } @@ -107,19 +107,19 @@ margin-bottom:20px; padding:4px 20px 4px 14px; } - + li{ padding-left:$spacing*9; padding-right:$spacing*3; margin-bottom:20px; margin-left: 8px; } - + h3 { margin-bottom: 0px; font-size: 1.7em; } - + p { color:#B2BCC1; line-height: 170%; @@ -139,14 +139,14 @@ .intro-Tools{position:relative} .intro-Question{ position:relative; - + .intro-Icon{ background-position:0 -40px; - } + } } .intro-Social { position:relative; - + .intro-Icon { background-position: 0 -80px; } @@ -166,7 +166,7 @@ position:absolute; top: -40px; margin-bottom: 15px; - + @media (max-device-width:480px), screen and (max-width:800px){ height:auto; margin:0; @@ -175,35 +175,35 @@ position:static; width:100%; } - + h2{ margin-bottom:0; text-shadow:0 1px 1px rgba(0,0,0,.5); font-size: 1.8em; } - + hr{ border-bottom:1px solid #4a6677; border-top:1px solid #1d282d; margin: 4px 0 21px; } - + fieldset{ padding: 25px 33px; - background:url(/img/sign-up-bg.png) repeat-x center top; + background:url(/img/sign-up-bg.png) repeat-x center top; border-radius: 4px 4px 0 0; } - + label{ color:#81b8c6; } - + label#domain-name { display: inline; vertical-align: 8px; color: #C2CFD4; } - + .input-Area{ background:#29383f; border:0 solid black; @@ -213,7 +213,7 @@ margin-right:$spacing; padding: 10px 10px 7px 10px; width:100%; - + // &:focus{color:#eee} } .input-Area#create-Input { @@ -223,7 +223,7 @@ margin-left: 0; position: static; } - .tooltip { + .tooltip { &.left .tooltip-arrow { border-left-color: #971D31; } @@ -249,41 +249,41 @@ .header-Nav{ background:#5e95a1; border-bottom:1px solid #92B4BD; - + @include vendor(transition, all 0.35s); - + @media (max-device-width:480px), screen and (max-width:800px){ position:fixed; top:-900px!important; } - + &.show-Nav{ top:0!important; padding-bottom: 2px; } - + a, a:visited{ - color:#fff; - padding:$spacing*2 $spacing*3; + color:#fff; + padding:$spacing*2 $spacing*3; text-decoration:none; - + @media (max-device-width:480px), screen and (max-width:800px){ display:block; } - + >.fa-heart { vertical-align: .5em; margin-left: .3em; font-size: 9px; - position: relative; + position: relative; color: rgba(255, 255, 255, 0.4); display: inline-block; - + >.fa-heart { display:none; } } - + &:hover{ background:#528995; text-decoration:underline; >.fa-heart { @@ -300,7 +300,7 @@ } &.selected, &:active{background:#528995; text-decoration:underline} } - + a.small-Nav{ background: #65a0ad; display:none; @@ -311,28 +311,28 @@ height:36px; z-index:9999; padding: 5px 12px 0px 12px; - + @media (max-device-width:480px), screen and (max-width:800px){ display:block; } } - + .notification-value { background: $c-Brand-1; padding: 2px 5px; @include border-radius(4px); } - + .dropdown { height: 2.6em; //not sure why I need this :/ - + a { width:100%; } .info { float:right; margin-left: 10px; - + .fa-caret-down { margin-left:10px; } @@ -345,10 +345,10 @@ min-width: 13em; @include border-radius(0px 0px 6px 6px); @include box-shadow(0 2px 7px rgba(0,0,0,0.2)); - + li { width:100%; - + a { float:left; } @@ -367,21 +367,21 @@ } .dropdown-submenu { float: left; - + &:hover > a, &:focus > a { background:#3C6670; } - + .dropdown-menu { width: 100%; margin-left: -1px; margin-top: -1px; - + li { overflow: hidden; } } - + >a:after { border-left-color: #fff; } @@ -390,27 +390,27 @@ .constant-Nav{ float:left; position:relative; - + @media (max-device-width:480px), screen and (max-width:800px){ float:none; - + li{float:none;} } } .status-Nav{ float:right; - + @media (max-device-width:480px), screen and (max-width:800px){ float:none; } - + li{ float:left; @media (max-device-width:480px), screen and (max-width:800px){ float:none } - } + } } // hp CSS @@ -429,12 +429,12 @@ left:-90px; position:fixed; @include vendor(transition, all 0.35s); - - + + &.in-View{ left:0!important; z-index:99; - + @media (max-device-width:480px), screen and (max-width:800px){ left:-90px!important; } @@ -456,11 +456,11 @@ @media (max-device-width:480px), screen and (max-width:800px){ margin-left:0; } - + &.in-View{ margin-left:0; padding-left:70px; - + @media (max-device-width:480px), screen and (max-width:800px){ padding-left:0 } @@ -504,7 +504,7 @@ padding-left:74px; @media (max-device-width:480px), screen and (max-width:800px){ width:100%; - } + } } .interior .constant-Nav, .hp.education .constant-Nav{margin:0} diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 3f27ce16..7098b095 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -2149,6 +2149,25 @@ pre, code { background: #1d1f21; color: #FFFFFF; } +.welcoming-cat { + width: 200px; + float: right; + margin-top: -40px; +} +.section.tutorial-welcome { + padding: 80px 18%; + + .option { + margin: 3.5em 0; + } + h3 { + margin-top: 0em; + font-size: 1.3em; + } + p { + font-size: 1.1em; + } +} .tagcloud .tag10 { font-size: 0.6em; font-weight: 90; } .tagcloud .tag9 { font-size: 0.7em; font-weight: 100; } diff --git a/views/dashboard.erb b/views/dashboard.erb index 7b8d7a52..bc1b855d 100644 --- a/views/dashboard.erb +++ b/views/dashboard.erb @@ -54,7 +54,7 @@

Hello! Welcome to your new site.

- To get started, click on the index.html file below to edit your home page. Once you make changes your website will begin appearing in our website gallery. You can add more files (such as images) by dragging them from your computer into the box below. Need help building web sites? Check out these tutorials! + To get started, click on the index.html file below to edit your home page. Once you make changes your website will begin appearing in our website gallery. You can add more files (such as images) by dragging them from your computer into the box below. Need help building web sites? Try our HTML tutorial!
<% end %> diff --git a/views/index.erb b/views/index.erb index ec9d336a..958509c9 100644 --- a/views/index.erb +++ b/views/index.erb @@ -59,22 +59,23 @@

Create your own free website.
Unlimited creativity, zero ads.

- Neocities is a community of <%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> sites that are bringing back the lost individual creativity of the web. We provide free web hosting and tools that allow anyone to make a website. Only your imagination is required. Join us! + Neocities is a community of <%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> sites that are bringing back the lost individual creativity of the web. We offer free web hosting and tools that allow anyone to make a website. Join us!

@@ -101,7 +102,7 @@

Sign up for free

- + @@ -241,7 +242,7 @@

Developer tools

-

Our fast static hosting comes with a great in-browser HTML editor, easy file uploading, RSS feeds for every site, powerful APIs for building developer applications, and much more! Upgrade to a supporter plan to get WebDAV publishing and support for custom domains.

+

Our fast static hosting comes with a great in-browser HTML editor, easy file uploading, RSS feeds for every site, powerful APIs for building developer applications, and much more! Upgrade to a supporter plan to get support for custom domains and WebDAV publishing.

diff --git a/views/tutorial/html/10.erb b/views/tutorial/html/10.erb index 3f3b5142..f9fdb815 100644 --- a/views/tutorial/html/10.erb +++ b/views/tutorial/html/10.erb @@ -2,14 +2,14 @@
And that's it for Chapter One! Congrats on your first ever version of <%= current_site.username %>.neocities.org!
-
- But you're not done yet! There's much in store for you: Adding colors, fonts, backgrounds, and more, all in chapter 2! +
+ This is just the beginning. Later you can learn about adding colors, fonts, backgrounds, page layouts, and more...

Thank you!

-

Thanks for trying out Chapter One of the Neocities tutorial! This is a work in progress—let us know if you have any questions or suggestions. We'd also love to hear your ideas for Chapter Two: Basic CSS.

+

Thanks for trying out the first edition of the Neocities tutorial! This is a work in progress—let us know if you have any questions or suggestions.

To continue working on your site, head to the dashboard!

-

You can also check out all the cool sites on Neocities and follow them via your news feed.

+

You can also check out all the cool sites on Neocities and follow them with your news feed.

diff --git a/views/tutorial/index.erb b/views/tutorial/index.erb index 268ee7b2..e03731d3 100644 --- a/views/tutorial/index.erb +++ b/views/tutorial/index.erb @@ -1,11 +1,24 @@ -
-

Welcome to Neocities!

+
+

Let's Get Started!

-

Start the Tutorial!

-

Learn how to build websites from scratch -with interactive lessons from Neocities' head cat, Penelope. -The first chapter on basic HTML is out now, and more chapters -are in the works!

+ -

Go to the dashboard

+
+

New to coding?

+

Learn how to build websites from scratch +with interactive lessons from Neocities' head cat, Penelope!

+

Start the tutorial >>

+
+ +
+

Already know HTML?

+

Get started right away on building your website!

+

Go to the dashboard >>

+
+ +
+

Want to start by browsing?

+

Discover new sites related to your interests, and keep track of your favorites.

+

Check out your news feed >> +

\ No newline at end of file diff --git a/views/tutorial/layout.erb b/views/tutorial/layout.erb index 590691da..492d20a1 100644 --- a/views/tutorial/layout.erb +++ b/views/tutorial/layout.erb @@ -17,6 +17,7 @@
<% if request.path =~ /\/html\/9/ %>
+

Saving your tutorial work will replace anything currently in your index.html. If you've modified it before, make sure there isn't anything valuable there before you proceed!

Don't Save Save to <%= current_site.username %>.neocities.org
diff --git a/views/tutorials.erb b/views/tutorials.erb index 6fbbfa07..f21b8db4 100644 --- a/views/tutorials.erb +++ b/views/tutorials.erb @@ -5,14 +5,12 @@
+

Available now: The Neocities HTML course! <% if !signed_in? %>(requires login)<% end %>

+ +

Never coded before? Our fun interactive tutorial will show you the ropes! Join Penelope the cat in crafting your own personal spot on the web.

Learning how to make websites allows you to create any content you want, arrange that content in any way you like, and share that content with the world. It could be an information portal for teaching people how to repair bikes, a graphics project, or a collection of your poetry.

-

- Coming Soon: The Neocities HTML/CSS course! -

- -

We are currently developing a website building course that will work seamlessly with Neocities. Until that project is complete, check out the following resources from other sites:

- +

Other Resources

HTML

HTML is short for "HyperText Markup Language", and is the basic building block used to build all websites.