Explorar o código

Merge pull request #6794 from weseek/fix/modals-style

fix: Modal styles and Enable Lato font
ryoji-s %!s(int64=3) %!d(string=hai) anos
pai
achega
10271fc42e

+ 2 - 1
packages/app/src/components/Page/CopyDropdown.jsx

@@ -11,6 +11,7 @@ import {
   Tooltip,
   Tooltip,
 } from 'reactstrap';
 } from 'reactstrap';
 
 
+import styles from './CopyDropdown.module.scss';
 
 
 const { encodeSpaces } = pagePathUtils;
 const { encodeSpaces } = pagePathUtils;
 
 
@@ -109,7 +110,7 @@ const CopyDropdown = (props) => {
 
 
   return (
   return (
     <>
     <>
-      <Dropdown className="grw-copy-dropdown" isOpen={dropdownOpen} toggle={toggleDropdown}>
+      <Dropdown className={`${styles['grw-copy-dropdown']} grw-copy-dropdown`} isOpen={dropdownOpen} toggle={toggleDropdown}>
         <DropdownToggle
         <DropdownToggle
           caret
           caret
           className={dropdownToggleClassName}
           className={dropdownToggleClassName}

+ 1 - 1
packages/app/src/styles/molecules/copy-dropdown.scss → packages/app/src/components/Page/CopyDropdown.module.scss

@@ -1,4 +1,4 @@
-.grw-copy-dropdown {
+.grw-copy-dropdown :global {
   .dropdown-menu {
   .dropdown-menu {
     min-width: 310px;
     min-width: 310px;
 
 

+ 22 - 0
packages/app/src/components/RevisionComparer/RevisionComparer.module.scss

@@ -11,4 +11,26 @@
   .d2h-file-header {
   .d2h-file-header {
     display: none;
     display: none;
   }
   }
+
+  .grw-copy-dropdown {
+    .dropdown-menu {
+      min-width: 310px;
+
+      .dropdown-header {
+        margin-bottom: 0.5em;
+        font-size: 1.1em;
+      }
+
+      // unset active styles
+      .dropdown-item:active {
+        color: unset;
+        background-color: unset;
+      }
+
+      .well {
+        font-size: 0.7em;
+        word-break: break-all;
+      }
+    }
+  }
 }
 }

+ 1 - 0
packages/app/src/pages/_document.page.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable @next/next/google-font-display */
 import React from 'react';
 import React from 'react';
 
 
 import Document, {
 import Document, {

+ 0 - 1
packages/app/src/styles/_layout.scss

@@ -30,7 +30,6 @@ body.not-found-page .grw-container-convertible {
 }
 }
 
 
 .grw-modal-head {
 .grw-modal-head {
-  font-size: 1em;
   border-bottom: 1px solid transparent;
   border-bottom: 1px solid transparent;
 }
 }