Skip to content

[dashboard] Simplify <code> snippets by using CSS instead of a whole component #12306

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 1, 2022
Merged

[dashboard] Simplify <code> snippets by using CSS instead of a whole component #12306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions components/dashboard/src/components/CodeText.tsx
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions components/dashboard/src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@
@apply text-blue-500 hover:text-blue-600 dark:text-blue-400 dark:hover:text-blue-500;
}

code {
@apply bg-gray-100 dark:bg-gray-700 px-1.5 py-0.5 rounded-md text-sm font-mono font-medium;
}

textarea,
input[type="text"],
input[type="tel"],
Expand Down
5 changes: 2 additions & 3 deletions components/dashboard/src/settings/EnvironmentVariables.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import ConfirmationModal from "../components/ConfirmationModal";
import { Item, ItemField, ItemFieldContextMenu, ItemsList } from "../components/ItemsList";
import Modal from "../components/Modal";
import { getGitpodService } from "../service/service";
import CodeText from "../components/CodeText";
import { PageWithSettingsSubMenu } from "./PageWithSettingsSubMenu";

interface EnvVarModalProps {
Expand Down Expand Up @@ -95,8 +94,8 @@ function AddEnvVarModal(p: EnvVarModalProps) {
</div>
<div className="mt-1">
<p className="text-gray-500">
You can pass a variable for a specific project or use wildcard character (
<CodeText>*/*</CodeText>) to make it available in more projects.
You can pass a variable for a specific project or use wildcard character (<code>*/*</code>) to
make it available in more projects.
</p>
</div>
</div>
Expand Down
6 changes: 2 additions & 4 deletions components/dashboard/src/settings/ProfileInformation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { User } from "@gitpod/gitpod-protocol";
import { hoursBefore, isDateSmaller } from "@gitpod/gitpod-protocol/lib/util/timeutil";
import React, { useContext, useState } from "react";
import Alert from "../components/Alert";
import CodeText from "../components/CodeText";
import Modal from "../components/Modal";
import { getGitpodService } from "../service/service";
import { UserContext } from "../user-context";
Expand Down Expand Up @@ -118,9 +117,8 @@ export default function ProfileInformation(props: {
<div>
<p className="text-base text-gray-500 pb-4 max-w-xl">
The following information will be used to set up Git configuration. You can override Git author name and
email per project by using the default environment variables <CodeText>GIT_AUTHOR_NAME</CodeText>,{" "}
<CodeText>GIT_COMMITTER_NAME</CodeText>, <CodeText>GIT_AUTHOR_EMAIL</CodeText> and{" "}
<CodeText>GIT_COMMITTER_EMAIL</CodeText>.
email per project by using the default environment variables <code>GIT_AUTHOR_NAME</code>,{" "}
<code>GIT_COMMITTER_NAME</code>, <code>GIT_AUTHOR_EMAIL</code> and <code>GIT_COMMITTER_EMAIL</code>.
</p>
{props.errorMessage.length > 0 && (
<Alert type="error" closable={true} className="mb-2 max-w-xl rounded-md">
Expand Down
7 changes: 3 additions & 4 deletions components/dashboard/src/start/CreateWorkspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import { openAuthorizeWindow } from "../provider-utils";
import { SelectAccountPayload } from "@gitpod/gitpod-protocol/lib/auth";
import { SelectAccountModal } from "../settings/SelectAccountModal";
import PrebuildLogs from "../components/PrebuildLogs";
import CodeText from "../components/CodeText";
import FeedbackComponent from "../feedback-form/FeedbackComponent";
import { isGitpodIo } from "../utils";
import { BillingAccountSelector } from "../components/BillingAccountSelector";
Expand Down Expand Up @@ -480,7 +479,7 @@ function RepositoryNotFoundView(p: { error: StartWorkspaceError }) {
<div className="mt-2 flex flex-col space-y-8">
<p className="text-base text-gray-400 w-96">
Permission to access private repositories has been granted. If you are a member of{" "}
<CodeText>{owner}</CodeText>, please try to request access for Gitpod.
<code>{owner}</code>, please try to request access for Gitpod.
</p>
<a className="mx-auto" href={authorizeURL}>
<button>Request Access for Gitpod</button>
Expand All @@ -494,7 +493,7 @@ function RepositoryNotFoundView(p: { error: StartWorkspaceError }) {
<div className="mt-2 flex flex-col space-y-8">
<p className="text-base text-gray-400 w-96">
Your access token was updated recently. Please try again if the repository exists and Gitpod was
approved for <CodeText>{owner}</CodeText>.
approved for <code>{owner}</code>.
</p>
<a className="mx-auto" href={authorizeURL}>
<button>Try Again</button>
Expand All @@ -507,7 +506,7 @@ function RepositoryNotFoundView(p: { error: StartWorkspaceError }) {
return (
<StartPage phase={StartPhase.Checking} error={p.error}>
<p className="text-base text-gray-400 mt-2">
<CodeText>{repoFullName}</CodeText>
<code>{repoFullName}</code>
</p>
{statusMessage}
{p.error && isGitpodIo() && (
Expand Down
3 changes: 1 addition & 2 deletions components/dashboard/src/teams/TeamSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { Team } from "@gitpod/gitpod-protocol";
import { BillingMode } from "@gitpod/gitpod-protocol/lib/billing-mode";
import { useContext, useEffect, useState } from "react";
import { Redirect, useLocation } from "react-router";
import CodeText from "../components/CodeText";
import ConfirmationModal from "../components/ConfirmationModal";
import { PageWithSubMenu } from "../components/PageWithSubMenu";
import { getGitpodService, gitpodHostUrl } from "../service/service";
Expand Down Expand Up @@ -110,7 +109,7 @@ export default function TeamSettings() {
</li>
</ol>
<p className="pt-4 pb-2 text-gray-600 dark:text-gray-400 text-base font-semibold">
Type <CodeText>{team?.slug}</CodeText> to confirm
Type <code>{team?.slug}</code> to confirm
</p>
<input autoFocus className="w-full" type="text" onChange={(e) => setTeamSlug(e.target.value)}></input>
</ConfirmationModal>
Expand Down
5 changes: 2 additions & 3 deletions components/dashboard/src/whatsnew/WhatsNew-2021-06.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import { User } from "@gitpod/gitpod-protocol";
import { WhatsNewEntry } from "./WhatsNew";
import { switchToVSCodeAction } from "./WhatsNew-2021-04";
import CodeText from "../components/CodeText";
import PillLabel from "../components/PillLabel";

export const WhatsNewEntry202106: WhatsNewEntry = {
Expand All @@ -24,8 +23,8 @@ export const WhatsNewEntry202106: WhatsNewEntry = {
</p>
<p className="pb-2 text-gray-500 dark:text-gray-400 text-sm">
Exposing ports are now private by default. You can still change port visibility through the
editor or even configure this with the <CodeText>visibility</CodeText> property in{" "}
<CodeText>.gitpod.yml</CodeText>.
editor or even configure this with the <code>visibility</code> property in{" "}
<code>.gitpod.yml</code>.
</p>
</div>
{user.additionalData?.ideSettings?.defaultIde !== "code" && (
Expand Down