Merge pull request #476 from navikt/css-layer-fixes

Revert "Fiks feil layer navn & fjern important"

Author: LudvigHz

packages/internarbeidsflate-decorator-v3/src/components/HotkeyMenuElement.tsx

@@ -16,7 +16,7 @@ const HotkeyMenuElement: React.FC = () => {
   return (
     <>
       <Button
-        className="hover:dr-bg-gray-800 focus:dr-outline-none focus:dr-ring focus:dr-ring-inset focus:dr-ring-orange-500"
+        className="hover:!dr-bg-gray-800 focus:!dr-outline-none focus:!dr-ring focus:!dr-ring-inset focus:!dr-ring-orange-500"
         title="Åpne hurtigtaster"
         onClick={() => setIsOpen(true)}
         icon={<InformationIcon aria-hidden color="white" />}

packages/internarbeidsflate-decorator-v3/src/components/Links/Links.tsx

@@ -94,7 +94,7 @@ const LinkComponent: React.FC<{
         href={href}
         rel={target ? '' : 'nooppener noreferrer'}
         target={target ?? (newPage ? '_blank' : '_self')}
-        className="dr-block dr-text-white dr-no-underline focus:dr-outline-none focus:dr-ring focus:dr-ring-orange-400 focus:dr-bg-transparent hover:dr-text-orange-400 hover:before:dr-w-2 hover:before:dr-h-2 hover:before:-dr-mr-2 hover:before:dr-bg-orange-400 hover:before:dr-rounded-full hover:before:dr-inline-block hover:before:-dr-left-4 hover:before:dr-relative hover:before:dr-mb-[2px] hover:visited:dr-text-orange-400"
+        className="!dr-block !dr-text-white !dr-no-underline focus:!dr-outline-none focus:!dr-ring focus:!dr-ring-orange-400 focus:!dr-bg-transparent hover:!dr-text-orange-400 hover:before:!dr-w-2 hover:before:!dr-h-2 hover:before:!-dr-mr-2 hover:before:!dr-bg-orange-400 hover:before:!dr-rounded-full hover:before:!dr-inline-block hover:before:!-dr-left-4 hover:before:!dr-relative hover:before:!dr-mb-[2px] hover:visited:!dr-text-orange-400"
         onClick={onClick}
       >
         {linkText}

packages/internarbeidsflate-decorator-v3/src/components/MenuButton.tsx

@@ -16,7 +16,7 @@ const MenuButton: React.FC = () => {
         icon={<ChevronIcon isOpen={isOpen} />}
         iconPosition="right"
         variant="tertiary-neutral"
-        className="dr-text-white hover:dr-text-white hover:dr-bg-gray-800 focus:dr-outline-none focus:dr-ring focus:dr-ring-inset focus:dr-ring-orange-500"
+        className="!dr-text-white hover:!dr-text-white hover:!dr-bg-gray-800 focus:!dr-outline-none focus:!dr-ring focus:!dr-ring-inset focus:!dr-ring-orange-500"
       >
         Meny
       </Button>

packages/internarbeidsflate-decorator-v3/src/components/modals/HotkeyModal.tsx

@@ -13,15 +13,15 @@ const HotkeyModal: React.FC<Props> = ({ hotkeys, open, close }) => {
     <Modal
       open={open}
       onClose={close}
-      className="dr-text-gray-900"
+      className="!dr-text-gray-900"
       header={{ heading: 'Hurtigtaster', closeButton: true }}
     >
       <Modal.Body>
         {hotkeys.length === 0 ? (
           <div>Ingen hurtigtaster er registrert</div>
         ) : (
           <div>
-            <Table className="dr-min-w-[350px]">
+            <Table className="!dr-min-w-[350px]">
               <Table.Header>
                 <Table.Row>
                   <Table.HeaderCell scope="col">Tast</Table.HeaderCell>

packages/internarbeidsflate-decorator-v3/src/components/modals/NewEnhetModal.tsx

@@ -17,7 +17,7 @@ const NewEnhetModal: React.FC = () => {
           samtidig. Velger du 'endre' mister du arbeidet du ikke har lagret.
         </Alert>
         <Heading
-          className="dr-mt-4"
+          className="!dr-mt-4"
           level="2"
           size="small"
         >{`Ønsker du å endre enhet til ${enhet.wsRequestedValue}?`}</Heading>

packages/internarbeidsflate-decorator-v3/src/components/modals/NewUserModal.tsx

@@ -17,7 +17,7 @@ const NewUserModal: React.FC = () => {
           samtidig. Velger du å endre bruker mister du arbeidet du ikke har
           lagret.
         </Alert>
-        <Heading className="dr-mt-4" level="2" size="small">
+        <Heading className="!dr-mt-4" level="2" size="small">
           {`Ønsker du å endre bruker til ${
             fnr?.wsRequestedValue ?? 'ukjent fnr'
           }?`}

packages/internarbeidsflate-decorator-v3/src/index.css

@@ -1,4 +1,5 @@
 @import 'tailwindcss/base';
+@import './preflight.css';
 @import '@navikt/ds-css';
 @import 'tailwindcss/components';
 @import 'tailwindcss/utilities';
@@ -22,37 +23,3 @@
   --ac-button-tertiary-neutral-text: var(--a-gray-900);
   --a-shadow-focus-inverted: 0 0 0 3px var(--a-orange-500);
 }
-
-.dekorator {
-  @layer tw-base-dr {
-    h1,
-    h2,
-    h3,
-    h4,
-    h5,
-    h6 {
-      font-size: inherit;
-      font-weight: inherit;
-    }
-
-    ol,
-    ul {
-      list-style: none;
-      margin: 0;
-      padding: 0;
-    }
-
-    *,
-    ::before,
-    ::after {
-      border-width: 0;
-      border-style: solid;
-      border-color: theme('borderColor.DEFAULT', currentColor);
-    }
-
-    ::before,
-    ::after {
-      --tw-content: '';
-    }
-  }
-}

packages/internarbeidsflate-decorator-v3/src/preflight.css

@@ -0,0 +1,31 @@
+.dekorator {
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    font-size: inherit;
+    font-weight: inherit;
+  }
+
+  ol,
+  ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+  }
+
+  *,
+  ::before,
+  ::after {
+    border-width: 0;
+    border-style: solid;
+    border-color: theme('borderColor.DEFAULT', currentColor);
+  }
+
+  ::before,
+  ::after {
+    --tw-content: '';
+  }
+}