move neo.css back to assets folder for relative url links

This commit is contained in:
Kyle Drake 2014-08-20 18:23:20 -07:00
parent 0f9b9bad56
commit b2906808d1
4 changed files with 7 additions and 4 deletions

2
.gitignore vendored
View file

@ -18,7 +18,7 @@ doc/
tests/coverage tests/coverage
config.yml config.yml
.DS_Store .DS_Store
public/css/neo.css public/assets/css/neo.css
public/site_thumbnails public/site_thumbnails
public/sites public/sites
public/site_screenshots public/site_screenshots

View file

@ -105,7 +105,7 @@ require 'sass/plugin/rack'
Sinatra::Application.use Sass::Plugin::Rack Sinatra::Application.use Sass::Plugin::Rack
Sass::Plugin.options[:template_location] = './public/assets/css' Sass::Plugin.options[:template_location] = './public/assets/css'
Sass::Plugin.options[:css_location] = './public/css' Sass::Plugin.options[:css_location] = './public/assets/css'
Sass::Plugin.options[:style] = :nested Sass::Plugin.options[:style] = :nested
if ENV['RACK_ENV'] == 'production' if ENV['RACK_ENV'] == 'production'

View file

@ -73,7 +73,10 @@
</div> </div>
<div class="site-info"> <div class="site-info">
<div style="float: left"> <div style="float: left">
<a href="/site/<%= site.username %>" title="Profile"><i class="icon-user"></i> <%= site.username %></a> <a href="/site/<%= site.username %>" title="Profile">
<i class="icon-user"></i>
<%= site.username %>
</a>
</div> </div>
<div style="float: right"> <div style="float: right">
<a href="/site/<%= site.username %>"> <a href="/site/<%= site.username %>">

View file

@ -20,7 +20,7 @@
<link href="/css/bootstrap.min.css" rel="stylesheet"> <link href="/css/bootstrap.min.css" rel="stylesheet">
<link href="/css/bootstrap-responsive.min.css" rel="stylesheet"> <link href="/css/bootstrap-responsive.min.css" rel="stylesheet">
<link href="/css/neo.css" rel="stylesheet" type="text/css" media="all"/> <link href="/assets/css/neo.css" rel="stylesheet" type="text/css" media="all"/>
<link href="/css/font-awesome.min.css" rel="stylesheet" type="text/css" media="all"/> <link href="/css/font-awesome.min.css" rel="stylesheet" type="text/css" media="all"/>
<link href="/css/styles.css" rel="stylesheet" type="text/css" media="all"> <link href="/css/styles.css" rel="stylesheet" type="text/css" media="all">