Rename to calendar.styl and remove legacy calendar

mdn · Dec 17, 2013 · f7e7993 · f7e7993
1 parent b022e65
commit f7e7993
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 33 deletions.
diff --git a/apps/devmo/templates/devmo/calendar.html b/apps/devmo/templates/devmo/calendar.html
@@ -4,11 +4,7 @@
 {% block bodyclass %}section-community calendar{% endblock %}
 {% block title %}{{ page_title(_('Where is Mozilla?')) }}{% endblock %}
 
-{% if waffle.flag('redesign') %}
-  {% set styles = ('redesign-mdn-calendar',) %}
-{% else %}
-  {% set styles = ('mdn-calendar',) %}
-{% endif %}
+{% set styles = ('calendar',) %}
 
 {% block content %}
 

diff --git a/media/css/mdn-calendar.css b/media/css/mdn-calendar.css
diff --git a/media/redesign/stylus/mdn-calendar.styl → media/redesign/stylus/calendar.styl b/media/redesign/stylus/mdn-calendar.styl → media/redesign/stylus/calendar.styl
diff --git a/scripts/compile-stylesheets b/scripts/compile-stylesheets
@@ -15,7 +15,7 @@ if [ ! -d "$CSSDIR" ]; then
   mkdir $CSSDIR
 fi
 
-FILENAMES=(main wiki demo-studio profile search zones home wiki-syntax users noscript err404 promote sphinx dashboards diff mdn-calendar newsletter)
+FILENAMES=(main wiki demo-studio profile search zones home wiki-syntax users noscript err404 promote sphinx dashboards diff calendar newsletter)
 STYLESHEETS=$(printf "$STYLUSDIR/%s.styl " "${FILENAMES[@]}")
 if [ $WATCH ]; then
   echo Watching and automatically compiling stylesheets

diff --git a/settings.py b/settings.py
@@ -580,9 +580,6 @@ def JINJA_CONFIG():
         'err404': (
             'css/err404.css',
         ),
-        'mdn-calendar': (
-            'css/mdn-calendar.css',
-        ),
         'search': (
             'redesign/css/search.css',
         ),
@@ -651,8 +648,8 @@ def JINJA_CONFIG():
         'redesign-home': (
             'redesign/css/home.css',
         ),
-        'redesign-mdn-calendar': (
-            'redesign/css/mdn-calendar.css',
+        'calendar': (
+            'redesign/css/calendar.css',
         ),
         'redesign-profile': (
             'redesign/css/profile.css',