put the admin css in admin.css (what!) (#5306)

* put the admin css in admin.css (what!) * lint
MozillaFoundation · Sep 25, 2020 · ec3ac8e · ec3ac8e
1 parent ed14ecf
commit ec3ac8e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 37 deletions.
diff --git a/network-api/networkapi/wagtailcustomization/static/css/admin.css b/network-api/networkapi/wagtailcustomization/static/css/admin.css
@@ -1,5 +1,40 @@
 /*
-  This is 16% by default, which is absolutely ridiculous.
+  We always want to show help texts. The fact that Wagtail hides
+  these until there's a mouse-over is not user-friendly enough.
+*/
+
+body.ready .help {
+  opacity: unset !important;
+}
+
+body.ready .help .icon-help-inverse {
+  display: none;
+}
+
+.object .object-help {
+  padding-top: 10px !important;
+  padding-left: 0 !important;
+}
+
+@media screen and (min-width: 50em) {
+  body.ready .help {
+    min-width: 14em;
+  }
+  .field-content {
+    width: 100% !important;
+  }
+  .object fieldset {
+    max-width: unset !important;
+  }
+  .object .object-help {
+    padding-bottom: 40px;
+    margin-left: 10px;
+    padding-left: 3em !important;
+  }
+}
+
+/*
+  And make sure the label names are full width instead of 16%...
 */
 fieldset ul li div label {
   display: block;

diff --git a/network-api/networkapi/wagtailcustomization/templates/wagtailadmin/base.html b/network-api/networkapi/wagtailcustomization/templates/wagtailadmin/base.html
@@ -30,39 +30,3 @@
     <g transform="translate(33.6,54.1)"><use href="#p-ns" class="p-ns"/></g>
   </svg>
 {% endblock %}
-
-
-Also, we ALWAYS want to show help texts. The fact that Wagtail hides these
-until there's a mouse over is just ludicrous:
-
-{% block extra_css %}
-  {{ block.super }}
-  <style>
-    body.ready .help {
-      opacity: unset!important;
-    }
-    body.ready .help .icon-help-inverse {
-      display: none;
-    }
-    .object .object-help {
-      padding-top: 10px!important;
-      padding-left: 0!important;
-    }
-    @media screen and (min-width: 50em) {
-      body.ready .help {
-        min-width: 14em;
-      }
-      .field-content {
-        width: 100%!important;
-      }
-      .object fieldset {
-        max-width: unset!important;
-      }
-      .object .object-help {
-        padding-bottom: 40px;
-        margin-left: 10px;
-        padding-left: 3em!important;
-      }
-    }
-  </style>
-{% endblock %}