Skip to content

Commit

Permalink
added import statements so other css files work
Browse files Browse the repository at this point in the history
  • Loading branch information
aldeka committed May 16, 2012
1 parent c1209e2 commit 588b5d2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
5 changes: 4 additions & 1 deletion mysite/base/templates/base/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<style type='text/css'> /*<![CDATA[*/
{% block css %}

{% assets output="packed/openhatch2.css", "css/jquery.autocomplete.css", "css/jquery-ui-lightness/jquery-ui-1.7.2.custom.css", "openid/css/openid.css", "css/base/jquery.jgrowl.css", "css/senseknocker/thing.css", "css/search/search.css", "css/base/landing.css", "css/base/landing_page_for_logged_in_users.css", "css/profile/person_small.css", "css/project/project.css", "css/base/one_column.css", "css/base/two_columns.css", "css/base/three_columns.css", "css/account/auth.css", "css/account/settings.css", "css/account/widget.css", "css/qunit.css", "css/profile/base.css", "css/profile/portfolio.css", "css/profile/search_people.css", "css/tipsy.css", "css/facebox.css", "css/missions/base.css" %}
{% assets output="packed/openhatch2.css", "css/jquery.autocomplete.css", "css/jquery-ui-lightness/jquery-ui-1.7.2.custom.css", "openid/css/openid.css", "css/base/jquery.jgrowl.css", "css/senseknocker/thing.css", "css/search/search.css", "css/base/landing.css", "css/base/landing_page_for_logged_in_users.css", "css/profile/person_small.css", "css/project/project.css", "css/account/auth.css", "css/account/settings.css", "css/account/widget.css", "css/qunit.css", "css/profile/base.css", "css/profile/portfolio.css", "css/profile/search_people.css", "css/tipsy.css", "css/facebox.css", "css/missions/base.css" %}
@import url({{ ASSET_URL }});
{% endassets %}

Expand Down Expand Up @@ -104,6 +104,9 @@
<![endif]-->
{% block less %}
<link rel="stylesheet/less" type="text/css" href="{% version '/static/less/base/base.less' %}">
<link rel="stylesheet/less" type="text/css" href="{% version '/static/less/base/one_column.less' %}">
<link rel="stylesheet/less" type="text/css" href="{% version '/static/less/base/two_column.less' %}">
<link rel="stylesheet/less" type="text/css" href="{% version '/static/less/base/three_column.less' %}">
{% endblock less %}
<script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js'></script>
<script src="{% version '/static/js/less-1.3.0.min.js' %}" type="text/javascript"></script>
Expand Down
2 changes: 2 additions & 0 deletions mysite/static/less/base/three_column.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "base";

.three-column {
width: @column-width;
margin-right: @padding-between-columns;
Expand Down
2 changes: 2 additions & 0 deletions mysite/static/less/base/two_column.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "base";

.column {
clear: none;
}
Expand Down

0 comments on commit 588b5d2

Please sign in to comment.