Merge branch 'master' into master

Author: fsbraun

djangocms_frontend/component_pool.py

@@ -133,8 +133,6 @@ def __getitem__(self, item):
 
 
 def setup():
-    global components
-
     if not components._discovered:
         from .cms_plugins import update_plugin_pool
 

djangocms_frontend/plugin_tag.py

@@ -66,8 +66,6 @@ def patch_template(template):
 
 
 def setup():
-    global plugin_tag_pool
-
     for plugin in plugin_pool.get_all_plugins():
         if not issubclass(plugin, allowed_plugin_types):
             continue

djangocms_frontend/static/djangocms_frontend/css/base.css

@@ -17,12 +17,16 @@
     @include visually-hidden;
 }
 
-ul.nav {
+#content-main ul.nav {
     margin-bottom: 1em;
 
     & > li.nav-item {
         list-style-type: none;
         padding: inherit;
+
+        a.nav-link {
+            text-decoration: none;
+        }
     }
 }