Skip to content

Revert "small bugfixes for theming+sass+templates" #2162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbau merged 1 commit into from
Jan 13, 2014
Merged

Revert "small bugfixes for theming+sass+templates" #2162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lms/startup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from django_startup import autostartup
from xmodule.modulestore.django import modulestore
import edxmako


def run():
"""
Expand Down Expand Up @@ -50,7 +50,6 @@ def enable_theme():
# Include the theme's templates in the template search paths
settings.TEMPLATE_DIRS.append(theme_root / 'templates')
settings.MAKO_TEMPLATES['main'].append(theme_root / 'templates')
edxmako.startup.run()

# Namespace the theme's static files to 'themes/<theme_name>' to
# avoid collisions with default edX static files
Expand Down
2 changes: 1 addition & 1 deletion rakelib/assets.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Theming constants
USE_CUSTOM_THEME = ENV_TOKENS.has_key?('FEATURES') and ENV_TOKENS['FEATURES']['USE_CUSTOM_THEME']
USE_CUSTOM_THEME = ENV_TOKENS['USE_CUSTOM_THEME']
if USE_CUSTOM_THEME
THEME_NAME = ENV_TOKENS['THEME_NAME']
THEME_ROOT = File.join(ENV_ROOT, "themes", THEME_NAME)
Expand Down