Merge pull request #245 from CivicDataLab/d4d

D4d
CivicDataLab · Oct 16, 2023 · a433f11 · a433f11
2 parents b2cf318 + 895b6dc
commit a433f11
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 21 deletions.
diff --git a/examples/district/app/[locale]/[district]/[department]/[scheme]/components/Explorer.tsx b/examples/district/app/[locale]/[district]/[department]/[scheme]/components/Explorer.tsx
@@ -315,25 +315,25 @@ const Content = ({
       </Tabs>
       <div className="mt-3 flex justify-end gap-4">
         <Button
+          kind="secondary"
+          variant="interactive"
           onClick={() => {
             copyURLToClipboard();
             toast({
               title: 'Copied to clipboard!',
             });
           }}
         >
-          <Text variant="bodyMd" as="span">
-            Copy Link
-          </Text>
+          Copy Link
         </Button>
         <Button
+          kind="secondary"
+          variant="interactive"
           onClick={() => {
             exportAsImage(contentRef.current, 'explorer');
           }}
         >
-          <Text variant="bodyMd" as="span">
-            Download
-          </Text>
+          Download
         </Button>
       </div>
     </div>

diff --git a/examples/district/app/[locale]/[district]/[department]/[scheme]/components/SourceData.tsx b/examples/district/app/[locale]/[district]/[department]/[scheme]/components/SourceData.tsx
@@ -150,18 +150,20 @@ export const SourceData = ({
             />
             <div className="mt-3 flex justify-end gap-4">
               <Button
+                kind="secondary"
+                variant="interactive"
                 onClick={() => {
                   copyURLToClipboard();
                   toast({
                     title: 'Copied to clipboard',
                   });
                 }}
               >
-                <Text variant="bodyMd" as="span">
-                  Copy Link
-                </Text>
+                Copy Link
               </Button>
               <Button
+                kind="secondary"
+                variant="interactive"
                 onClick={() => {
                   downloadTable(
                     columns,
@@ -170,9 +172,7 @@ export const SourceData = ({
                   );
                 }}
               >
-                <Text variant="bodyMd" as="span">
-                  Download
-                </Text>
+                Download
               </Button>
             </div>
           </div>

diff --git a/examples/district/app/[locale]/[district]/[department]/[scheme]/components/scheme-layout.tsx b/examples/district/app/[locale]/[district]/[department]/[scheme]/components/scheme-layout.tsx
@@ -232,25 +232,25 @@ const TabLayout = ({
         {tabValue === 'overview' && (
           <div className="mb-3 flex items-center justify-end gap-4 flex-wrap">
             <Button
+              kind="secondary"
+              variant="interactive"
               onClick={() => {
                 copyURLToClipboard();
                 toast({
                   title: 'Copied to clipboard',
                 });
               }}
             >
-              <Text variant="bodyMd" as="span">
-                Copy Link
-              </Text>
+              Copy Link
             </Button>
             <Button
+              kind="secondary"
+              variant="interactive"
               onClick={() => {
                 exportAsImage(overviewRef.current, 'overview');
               }}
             >
-              <Text variant="bodyMd" as="span">
-                Download
-              </Text>
+              Download
             </Button>
           </div>
         )}

diff --git a/packages/opub-ui/.storybook/preview.tsx b/packages/opub-ui/.storybook/preview.tsx
@@ -2,6 +2,7 @@
 // import '@storybook/addon-console';
 import { themes } from '@storybook/theming';
 import '../assets/styles.css';
+import '../styles/_variables.css';
 import { Tooltip } from '../src/components/Tooltip';
 import React from 'react';
 

diff --git a/packages/opub-ui/assets/styles.css b/packages/opub-ui/assets/styles.css
@@ -1,5 +1,4 @@
 @import './reset.css';
 @import './base.css';
 @import './tokens.css';
-@import '../styles/_variables.css';
 @import './styles-bundled.css';
diff --git a/packages/opub-ui/src/components/Button/Button.module.scss b/packages/opub-ui/src/components/Button/Button.module.scss
@@ -251,8 +251,7 @@
   line-height: 0;
 
   &:last-child {
-    margin-right: var(--button-disclosure-icon-offset);
-    margin-left: var(--space-1);
+    margin-right: -2px;
   }
 
   .fullWidth.textAlignLeft &:last-child:not(:only-child) {