zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge violasong changes

Browse source
This commit is contained in:
Kyle Drake 2014-10-20 17:03:42 -07:00
commit 1a55ca93d8
4 changed files with 38 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sass/_project-sass/_project-Header.scss
View file

@ -140,7 +140,6 @@
border-radius:4px 4px 0 0;
@include box-shadow($signupShadow);
height:700%;
overflow:hidden;
position:absolute;
top: -40px;
@ -200,6 +199,15 @@
}
.col.col-50 {
margin-left: 0;
position: static;
}
.tooltip {
&.left .tooltip-arrow {
border-left-color: #971D31;
}
.tooltip-inner {
background-color: #971D31;
}
}
.btn-Action{
padding:10px 25px;

27
sass/_project-sass/_project-Main.scss
View file

@ -791,6 +791,8 @@ a.tag:hover {
padding: 55px 8%;
margin: 0 auto;
float: left;
background: white;
width: 100%;
}
.section h2 {
font-size: 2em;
@ -810,9 +812,8 @@ a.tag:hover {
font-size: .85em;
}
.section.featured-Websites {
background:#971D31;
background: #971D31;
padding: 30px 0;
width: 100%;
position: relative;
}
.section.featured-Websites .nav {
@ -941,9 +942,6 @@ a.tag:hover {
}
}
.section.plans {
background: #fff;
width: 100%;
@media(max-device-width:480px), screen and (max-width:550px) {
padding: 55px 3%;
}
@ -952,7 +950,7 @@ a.tag:hover {
color:#4F7E89;
}
.plan-overview {
margin-top: 2.5em;
margin-top: 3.5em;
margin-bottom: 2em;
}
.plan-overview .header {
@ -1035,7 +1033,7 @@ a.tag:hover {
background-size: 70px;
}
.plan-chart {
margin: 2em 0 4em 0;
margin: 2em 0 0 0;
width: 100%;
}
.plan-overview, .plan-chart {
@ -1092,6 +1090,21 @@ a.tag:hover {
padding: 7px 10px;
}
}
.section.bottom-signup {
padding-top: 1em;
padding-bottom: 6.5em;
a {
text-decoration: underline;
font-weight:bold;
&:hover {
text-decoration: none;
}
}
h2 {
max-width: none;
}
}
.selected {
font-weight: bold;
}

7
views/index.erb
View file

@ -39,7 +39,7 @@
<script src="/js/jquery-1.11.0.min.js"></script>
</head>
<body class="hp">
<body class="hp"><a id="new"></a>
<div class="page">
@ -111,7 +111,6 @@
<h1 class="logo header-Content content">
<span class="hidden">Neocities.org</span>
<img src="/img/neocities-Logo.png" alt="Neocities.org" />
<a id="new"></a>
</h1>
</section>
@ -285,8 +284,8 @@
<%== erb :'plan/_pricing' %>
<section class="section">
<h1>What are you waiting for? <a href="#new">Start building your web site!</a></h1>
<section class="section bottom-signup">
<h2>What are you waiting for? <a href="#new">Start building your web site!</a></h2>
</section>
</main>

13
views/plan/_pricing.erb
View file

@ -4,10 +4,10 @@
<div class="plan-overview">
<div class="header">
<div class="col col-25 personal">
Personal
Free
</div>
<div class="col col-75 professional">
Supporters
Supporter
</div>
</div>
@ -15,7 +15,7 @@
<div class="col col-25 free">
<div class="plan-image free" data-original-title="Pick me!">
</div>
<h3>Free!</h3>
<h3>Free</h3>
<div class="price">$<%= Site::PLAN_FEATURES[:free][:price] %></div>
<div class="interval">per month</div>
<a href="/" class="btn-Action">Choose</a>
@ -85,8 +85,7 @@
</div>
<!-- <h2><a href="">Compare Plans <i class="fa fa-caret-down"></i></a></h2> -->
<h2>Compare Plans</h2>
<h2 style="margin-top: 2em">Compare Plans</h2>
<table class="plan-chart">
<tr>
<th class="feature-column"></th>
@ -95,7 +94,7 @@
<p>$<%= Site::PLAN_FEATURES[:free][:price] %>/mo</p>
<a href="/" class="btn-Action">Choose</a>
</th>
<th>
<th class="professional">
<h3>Supporter</h3>
<p>$<%= Site::PLAN_FEATURES[:supporter][:price] %>/mo</p>
<a href="/" class="btn-Action">Choose</a>
@ -249,7 +248,7 @@
<tr>
<td class="feature-column">
<span data-original-title="Upload your SSL certificate for your domain name, preventing snoops from seeing your user’s traffic.">Custom SSL Certificates</span>
</td>’
</td>
<td></td>
<td></td>
<td><i class="fa fa-check"></i></td>