Merge pull request #4568 from mozilla/1414107-remove-waffle

Bug 1414107: Remove line_length waffle
mdn · Dec 4, 2017 · 0dd9a80 · 0dd9a80
2 parents 870c41a + 9d5a3ea
commit 0dd9a80
Show file tree

Hide file tree

Showing 138 changed files with 9 additions and 7,999 deletions.
diff --git a/docs/feature-toggles.rst b/docs/feature-toggles.rst
@@ -42,7 +42,6 @@ other advanced criteria.
 * ``compat_data`` - View the new JSON backed compat tables.
 * ``kumabanned`` - (deprecated) added to users to mark them as banned.
 * ``kumaediting`` - Enable/disable wiki editing.
-* ``line_length`` - Enable/disable readable line length.
 * ``page_move`` - (deprecated) enable/disable page move feature.
 * ``section_edit`` - Show section edit buttons.
 * ``sg_task_completion`` - Enable the Survey Gizmo pop-up.

diff --git a/etc/sample_db.json b/etc/sample_db.json
@@ -359,10 +359,6 @@
         "name": "redesign_beta",
         "note": "Display a beta notice to beta users.",
         "created": "2017-06-22"
-      }, {
-        "name": "line_length",
-        "note": "Full width code, restricted line length.",
-        "created": "2017-08-28"
       }
     ],
     "waffle.switch": [

diff --git a/jinja2/base.html b/jinja2/base.html
@@ -18,11 +18,7 @@
 
   {% block site_css %}
 
-    {% if waffle.flag('line_length') %}
-          {% stylesheet 'mdn' %}
-      {% else %}
-          {% stylesheet 'mdn-skinny' %}
-      {% endif %}
+    {% stylesheet 'mdn' %}
 
     {% for style in styles %}
       {% stylesheet style %}

diff --git a/jinja2/includes/config.html b/jinja2/includes/config.html
@@ -22,13 +22,8 @@
         win.mdn.assets = {
             css: {
                 'editor-content': [
-                    {%- if waffle.flag('line_length') %}
-                        {%- stylesheet 'editor-content' %}
-                        {%- stylesheet 'editor-locale-%s' % LANG %}
-                    {%- else %}
-                        {%- stylesheet 'editor-content-skinny' %}
-                        {%- stylesheet 'editor-locale-%s' % LANG %}
-                    {%- endif %}
+                    {%- stylesheet 'editor-content' %}
+                    {%- stylesheet 'editor-locale-%s' % LANG %}
                 ],
 
                 'wiki-compat-tables': [{% stylesheet 'wiki-compat-tables' %}]

diff --git a/kuma/settings/common.py b/kuma/settings/common.py
@@ -680,14 +680,6 @@ def pipeline_one_scss(slug, **kwargs):
         'output_filename': 'build/styles/mdn.css',
         'variant': 'datauri',
     },
-    'mdn-skinny': {
-        'source_filenames': (
-            'styles/font-awesome.scss',
-            'styles/main-skinny.scss',
-        ),
-        'output_filename': 'build/styles/mdn-skinny.css',
-        'variant': 'datauri',
-    },
     'jquery-ui': {
         'source_filenames': (
             'js/libs/jquery-ui-1.10.3.custom/css/ui-lightness/jquery-ui-1.10.3.custom.min.css',
@@ -730,21 +722,6 @@ def pipeline_one_scss(slug, **kwargs):
         ),
         'output_filename': 'build/styles/wiki.css',
     },
-    'wiki-skinny': {
-        'source_filenames': (
-            'styles/wiki-skinny.scss',
-            'styles/diff.scss',
-
-            # Custom build of our Prism theme
-            'styles/libs/prism/prism.css',
-            'styles/libs/prism/prism-line-highlight.css',
-            'styles/libs/prism/prism-line-numbers.css',
-
-            'js/prism-mdn/components/prism-json.css',
-            'styles/wiki-syntax.scss',
-        ),
-        'output_filename': 'build/styles/wiki-skinny.css',
-    },
     'wiki-revisions': {
         'source_filenames': (
             'styles/wiki-revisions.scss',
@@ -903,17 +880,6 @@ def pipeline_one_scss(slug, **kwargs):
         'output_filename': 'build/styles/editor-content.css',
         'template_name': 'pipeline/javascript-array.jinja',
     },
-    'editor-content-skinny': {
-        'source_filenames': (
-            'styles/main-skinny.scss',
-            'styles/wiki-skinny.scss',
-            'styles/wiki-wysiwyg.scss',
-            'styles/wiki-syntax.scss',
-            'styles/libs/font-awesome/css/font-awesome.min.css',
-        ),
-        'output_filename': 'build/styles/editor-content-skinny.css',
-        'template_name': 'pipeline/javascript-array.jinja',
-    },
     # for maintenance mode page
     'maintenance-mode': {
         'source_filenames': (
@@ -1088,17 +1054,6 @@ def pipeline_one_scss(slug, **kwargs):
             'async': True,
         },
     },
-    'wiki-skinny': {
-        'source_filenames': (
-            'js/wiki-skinny.js',
-            'js/interactive.js',
-            'js/wiki-samples.js',
-        ),
-        'output_filename': 'build/js/wiki-skinny.js',
-        'extra_context': {
-            'async': True,
-        },
-    },
     'wiki-edit': {
         'source_filenames': (
             'js/wiki-edit.js',

diff --git a/kuma/static/js/highlight.js b/kuma/static/js/highlight.js
@@ -10,12 +10,7 @@
     }
 
     var $articleSubHeads;
-    // call on aritcle body with targets
-    if(!win.waffle || !win.waffle.flag_is_active('line_length')) {
-        $articleSubHeads = $('#wikiArticle h2');
-    } else {
-        $articleSubHeads = $('#wikiArticle h3, #wikiArticle h5');
-    }
+    $articleSubHeads = $('#wikiArticle h3, #wikiArticle h5');
     highlight($articleSubHeads);
 
 })(jQuery, window);
diff --git a/kuma/static/styles/components-skinny/activity.scss b/kuma/static/styles/components-skinny/activity.scss
diff --git a/kuma/static/styles/components-skinny/banned.scss b/kuma/static/styles/components-skinny/banned.scss
diff --git a/kuma/static/styles/components-skinny/compact.scss b/kuma/static/styles/components-skinny/compact.scss