feat: new lock screen and challenge modal design (#957)

standardnotes · Apr 11, 2022 · c16f23a · c16f23a
1 parent 3a2ff2f
commit c16f23a
Show file tree

Hide file tree

Showing 12 changed files with 434 additions and 385 deletions.
diff --git a/app/assets/javascripts/components/ApplicationView.tsx b/app/assets/javascripts/components/ApplicationView.tsx
@@ -17,7 +17,7 @@ import { NoteGroupView } from '@/components/NoteGroupView';
 import { Footer } from '@/components/Footer';
 import { SessionsModal } from '@/components/SessionsModal';
 import { PreferencesViewWrapper } from '@/components/Preferences/PreferencesViewWrapper';
-import { ChallengeModal } from '@/components/ChallengeModal';
+import { ChallengeModal } from '@/components/ChallengeModal/ChallengeModal';
 import { NotesContextMenu } from '@/components/NotesContextMenu';
 import { PurchaseFlowWrapper } from '@/components/PurchaseFlow/PurchaseFlowWrapper';
 import { render } from 'preact';

diff --git a/app/assets/javascripts/components/Button.tsx b/app/assets/javascripts/components/Button.tsx
@@ -22,8 +22,8 @@ const getClassName = (
 
   let focusHoverStates =
     variant === 'normal'
-      ? 'focus:bg-contrast hover:bg-contrast'
-      : 'hover:brightness-130 focus:brightness-130';
+      ? 'focus:bg-contrast focus:outline-none hover:bg-contrast'
+      : 'hover:brightness-130 focus:outline-none focus:brightness-130';
 
   if (danger) {
     colors =
@@ -39,8 +39,8 @@ const getClassName = (
         : 'bg-grey-2 color-info-contrast';
     focusHoverStates =
       variant === 'normal'
-        ? 'focus:bg-default hover:bg-default'
-        : 'focus:brightness-default hover:brightness-default';
+        ? 'focus:bg-default focus:outline-none hover:bg-default'
+        : 'focus:brightness-default focus:outline-none hover:brightness-default';
   }
 
   return `${baseClass} ${colors} ${borders} ${focusHoverStates} ${cursor}`;