Skip to content

Commit 26f56f5

Browse files
committed
Rename assets to asset, so it doesnt conflict with discourse
1 parent bba2b3c commit 26f56f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+7
-7
lines changed

config.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,16 @@
106106
set :site_url, is_qa ? "http://qa.komodoide.com" : "http://community.komodoide.com"
107107
end
108108

109-
set :css_dir, 'assets/stylesheets'
110-
set :js_dir, 'assets/javascripts'
111-
set :images_dir, 'assets/images'
112-
set :fonts_dir, 'assets/fonts'
109+
set :css_dir, 'asset/stylesheets'
110+
set :js_dir, 'asset/javascripts'
111+
set :images_dir, 'asset/images'
112+
set :fonts_dir, 'asset/fonts'
113113
set :layouts_dir, "templates/layouts"
114114
set :partials_dir, 'templates/partials'
115115

116116
page "*", :layout => "default"
117117
page "json/*", :layout => false
118-
page "assets/*", :layout => false
118+
page "asset/*", :layout => false
119119

120120
set :title, "Komodo IDE Community"
121121

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

source/assets/stylesheets/_modules/header.scss source/asset/stylesheets/_modules/header.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ body.framed header
1919

2020
.outer
2121
{
22-
background: url(/assets/images/layout/background-texture.png) repeat;
22+
background: url(../images/layout/background-texture.png) repeat;
2323
background-color: #BCBEC0;
2424
min-height: 75px;
2525

source/templates/layouts/layout.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<% post = defined?(post) ? post : false %>
2424

25-
<link rel="icon" href="/assets/images/favicon.ico">
25+
<link rel="icon" href="/asset/images/favicon.ico">
2626

2727
<!-- Styles -->
2828
<%= stylesheet_link_tag "style" %>

0 commit comments

Comments
 (0)