Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: clean up some unexpected behavior and designs #21551

Merged
merged 25 commits into from Jun 21, 2022
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1879066
refactor: try removing the safelist
elevatebart May 18, 2022
74ee30d
fix open browser bugs
elevatebart May 18, 2022
c23cf6f
add ts in windi observed files
elevatebart May 19, 2022
7f7b337
resolve typescript issue
elevatebart May 19, 2022
c593ac3
remove markdown code class
elevatebart May 19, 2022
afa1dfd
fix automation disconnected button color
elevatebart May 19, 2022
14ec189
fix disabled card
elevatebart May 19, 2022
d06aaee
Merge branch '10.0-release' into elevatebart/remove-safelist
elevatebart May 19, 2022
e79c226
fix retry button
elevatebart May 19, 2022
deb832c
Merge branch '10.0-release' into elevatebart/remove-safelist
elevatebart May 20, 2022
e5f3435
fix config warning test
elevatebart May 20, 2022
6f70a4d
Merge branch '10.0-release' into elevatebart/remove-safelist
elevatebart May 24, 2022
82a88f9
fix color of topnav
elevatebart May 24, 2022
3365a01
fix browser dropdown header text
elevatebart May 24, 2022
82e54e0
remove the removing
elevatebart May 24, 2022
6d52e7b
revert unwanted change to card
elevatebart May 25, 2022
5f87bb1
Merge branch 'develop' into elevatebart/remove-safelist
elevatebart May 25, 2022
dbb061d
Merge branch 'develop' into elevatebart/remove-safelist
elevatebart Jun 6, 2022
92475bc
Merge branch 'develop' into elevatebart/remove-safelist
marktnoonan Jun 7, 2022
ba522d0
Merge branch 'develop' into elevatebart/remove-safelist
elevatebart Jun 7, 2022
b87442f
Merge branch 'develop' into elevatebart/remove-safelist
marktnoonan Jun 15, 2022
a8a72fb
Merge branch 'develop' into elevatebart/remove-safelist
elevatebart Jun 15, 2022
00fe0d0
Merge branch 'develop' into elevatebart/remove-safelist
elevatebart Jun 15, 2022
92c32db
Merge branch 'develop' into elevatebart/remove-safelist
ZachJW34 Jun 16, 2022
38c10ae
Merge branch 'develop' into elevatebart/remove-safelist
elevatebart Jun 21, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/app/src/runner/SpecRunnerDropdown.vue
Expand Up @@ -13,10 +13,11 @@
:disabled="props.disabled"
>
<div
class="flex text-gray-600 gap-8px items-center"
class="flex gap-8px items-center"
:class="{
'group-hocus:text-indigo-600': !props.disabled,
'text-indigo-600': open,
'text-gray-600': !open,
}"
>
<slot
Expand Down
2 changes: 0 additions & 2 deletions packages/app/src/runner/automation/AutomationDisconnected.vue
Expand Up @@ -12,9 +12,7 @@
{{ t('runner.automation.disconnected.description') }}
</p>
<Button
class="bg-indigo-500 text-white"
size="md"
variant="outline"
:prefix-icon="RefreshIcon"
prefix-icon-class="icon-dark-white"
@click="relaunch"
Expand Down
5 changes: 3 additions & 2 deletions packages/frontend-shared/src/components/Card.vue
Expand Up @@ -40,9 +40,10 @@
<!-- this button can be focused via tab key and allows card hocus styles to appear
as well as allows a keyboard user to "activate" the card with spacebar or enter keys -->
<button
class="font-medium mx-8px mb-8px text-indigo-500 text-18px leading-24px focus:outline-transparent"
class="font-medium mx-8px mb-8px text-18px leading-24px focus:outline-transparent"
:class="{
'text-gray-700 cursor-default': disabled
'text-gray-700': disabled,
elevatebart marked this conversation as resolved.
Show resolved Hide resolved
'text-indigo-500': !disabled
}"
:disabled="disabled"
>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend-shared/src/composables/useMarkdown.ts
Expand Up @@ -41,7 +41,7 @@ const defaultClasses = {
h6: ['font-medium', 'text-xs', 'mb-3'],
p: ['my-3 first:mt-0 text-sm mb-4'],
pre: ['rounded p-3 bg-white mb-2'],
code: [`font-medium rounded text-sm px-4px py-2px bg-red-100`],
code: ['font-medium rounded text-sm px-4px py-2px'],
a: ['text-blue-500', 'hover:underline text-sm'],
ul: ['list-disc pl-6 my-3 text-sm'],
ol: ['list-decimal pl-6 my-3 text-sm'],
Expand Down
Expand Up @@ -106,11 +106,12 @@
>
<template #heading="{ open }">
<img
v-if="props.gql?.currentProject?.activeBrowser?.displayName"
class="w-16px filter group-hocus:grayscale-0"
data-cy="top-nav-active-browser-icon"
:alt="props.gql?.currentProject?.activeBrowser?.displayName"
:class="open ? 'grayscale-0' : 'grayscale'"
:src="allBrowsersIcons[props.gql?.currentProject?.activeBrowser?.displayName] || allBrowsersIcons.generic"
:src="allBrowsersIcons[props.gql.currentProject.activeBrowser.displayName] || allBrowsersIcons.generic"
>
<span
data-cy="top-nav-active-browser"
Expand Down
Expand Up @@ -8,8 +8,8 @@
@click="emit('clearForceOpen')"
>
<div
class="flex text-gray-600 gap-8px items-center group-hocus:text-indigo-600"
:class="(open || props.forceOpenState) ? 'text-indigo-600' : ''"
class="flex gap-8px items-center group-hocus:text-indigo-600"
:class="(open || props.forceOpenState) ? 'text-indigo-600' : 'text-gray-600'"
>
<slot
name="heading"
Expand Down
7 changes: 4 additions & 3 deletions packages/frontend-shared/src/warning/Warning.vue
Expand Up @@ -14,14 +14,12 @@
/>
<Button
v-if="retryable"
class="bg-indigo-500 text-white"
size="md"
variant="outline"
:prefix-icon="RefreshIcon"
prefix-icon-class="icon-dark-white"
@click="emits('retry')"
>
Retry
{{ t('warnings.retry') }}
</Button>
</Alert>
</template>
Expand All @@ -34,6 +32,9 @@ import Button from '@cy/components/Button.vue'
import RefreshIcon from '~icons/cy/refresh_x16'
import { computed, ref } from 'vue'
import { useVModels } from '@vueuse/core'
import { useI18n } from '@cy/i18n'

const { t } = useI18n()

const emits = defineEmits<{
(eventName: 'update:modelValue', value: boolean): void
Expand Down
2 changes: 1 addition & 1 deletion packages/launchpad/cypress/e2e/config-warning.cy.ts
Expand Up @@ -11,7 +11,7 @@ describe('baseUrl', () => {
ctx._apis.projectApi.isListening = sinon.stub().resolves(null)
})

cy.contains('button', 'Retry').click()
cy.contains('button', 'Try again').click()
cy.get('[data-cy="alert"]').should('not.exist')
})
})
Expand Down
4 changes: 2 additions & 2 deletions packages/launchpad/src/setup/OpenBrowserList.vue
Expand Up @@ -53,8 +53,8 @@
>
</div>
<div
class="font-medium pt-2 text-indigo-600 text-18px leading-28px"
:class="{ 'text-jade-600': checked, 'text-gray-500': browser.disabled || !browser.isVersionSupported }"
class="font-medium pt-2 text-18px leading-28px"
:class="checked ? 'text-jade-600' : ( browser.disabled || !browser.isVersionSupported ) ? 'text-gray-500' : 'text-indigo-600'"
>
{{ browser.displayName }}
</div>
Expand Down