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 branch 'v2' of github.com:neocities/neocities into v2

Browse source
This commit is contained in:
Kyle Drake 2014-04-21 19:28:53 -07:00
commit ae58a59b0e
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/assets/css/_project-sass/_project-Vars.scss
View file

@ -55,7 +55,7 @@ $placeholderColor:#5E7F8D;
$arial: Arial, "Helvetica Neue", Helvetica, sans-serif;
$georgia: Georgia, "Times New Roman", Times, serif;
$helvetica: "Helvetica Neue", Helvetica, Arial, sans-serif;
$brand: 'Open Sans', $helvetica;
$brand: "Lucida Grande", verdana, $helvetica;
$headings: 'Droid Serif', $georgia;
@ -75,7 +75,7 @@ $delta: $base-font-multiplier * 1.625; // 26px
$eps: $base-font-multiplier * 1.375; // 22px
$zeta: $base-font-multiplier * 1.125; // 18px
$base: $base-font-multiplier; // 16px
$base: $base-font-multiplier * .9;
$tiny: $base-font-multiplier * .875; // 14px
$mini: $base-font-multiplier * .75; // 12px

6
public/assets/css/neo.css
View file

File diff suppressed because one or more lines are too long

2
views/dashboard.erb
View file

@ -37,7 +37,7 @@
<div class="col col-50">
<h2 class="eps">My Website</h2>
<p style="font-size:19px; margin-top: -11px; margin-bottom: 8px;"><a href="http://<%= current_site.username %>.neocities.org" target="_blank">http://<%= current_site.username %>.neocities.org</a></p>
<p class="site-url" style="margin-top: -11px;"><a href="http://<%= current_site.username %>.neocities.org" target="_blank">http://<%= current_site.username %>.neocities.org</a></p>
<ul>
<% if current_site.updated_at %>
<li>Last updated <%= current_site.updated_at.ago %></li>