mozilla · craigcook · Jan 23, 2020 · Jan 16, 2020
diff --git a/.editorconfig b/.editorconfig
@@ -10,7 +10,7 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = space
 
-[*.{py,js,css,less,scss,sh,groovy}]
+[*.{py,js,css,scss,sh,groovy}]
 indent_size = 4
 
 [*.{json,html,svg,yml}]

diff --git a/.gitignore b/.gitignore
@@ -19,7 +19,6 @@ build
 tmp/*
 *~
 .#*
-*.less.css
 db.sql
 /locale
 /results

diff --git a/.stylelintrc b/.stylelintrc
@@ -36,8 +36,5 @@
     "no-extra-semicolons": true,
     "no-missing-end-of-source-newline": true,
     "no-eol-whitespace": true
-  },
-  "ignoreFiles": [
-    "media/css/sandstone/mixins/at2x.less"
-  ]
+  }
 }
diff --git a/bedrock/base/templates/bare.html b/bedrock/base/templates/bare.html
diff --git a/bedrock/base/templates/base-pebbles.html b/bedrock/base/templates/base-pebbles.html
@@ -20,8 +20,6 @@
     {% block extra_meta %}{% endblock %}
 
     {% block shared_meta %}
-    {#- Please sync this block with the base.html and base-resp.html templates.
-        Because of blocks, we cannot use an include here. -#}
     <title>{% filter striptags|e %}{% block page_title_full %}{% block page_title_prefix %}{% endblock %}{% block page_title %}{% endblock %}{% endblock page_title_full %}{% block page_title_suffix %} — Mozilla{% endblock %}{% endfilter %}</title>
     <meta name="description" content="{% filter striptags|e %}{% block page_desc %}{% endblock %}{% endfilter %}">
     <meta property="og:type" content="website">

diff --git a/bedrock/base/templates/base-resp.html b/bedrock/base/templates/base-resp.html
diff --git a/bedrock/firefox/templates/firefox/base/base-resp.html b/bedrock/firefox/templates/firefox/base/base-resp.html
diff --git a/bedrock/mozorg/templates/mozorg/base-resp.html b/bedrock/mozorg/templates/mozorg/base-resp.html
diff --git a/bedrock/mozorg/tests/urls.py b/bedrock/mozorg/tests/urls.py
@@ -17,5 +17,5 @@ def mock_view(request):
     url(r'', include('%s.urls' % settings.PROJECT_MODULE)),
 
     # Used by test_helper
-    page('base', 'base-resp.html'),
+    page('base', 'base-protocol.html'),
 ]