Skip to content

Update search input style on project pages #16636

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
Mar 10, 2023
Merged

Update search input style on project pages #16636

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
26 changes: 16 additions & 10 deletions components/dashboard/src/admin/TeamDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { BillingMode } from "@gitpod/gitpod-protocol/lib/billing-mode";
import { CostCenterJSON, CostCenter_BillingStrategy } from "@gitpod/gitpod-protocol/lib/usage";
import Modal from "../components/Modal";
import { Heading2 } from "../components/typography/headings";
import search from "../icons/search.svg";

export default function TeamDetail(props: { team: Team }) {
const { team } = props;
Expand Down Expand Up @@ -134,17 +135,22 @@ export default function TeamDetail(props: { team: Team }) {
</Property>
)}
</div>
<div className="flex mt-4">
<div className="flex">
<div className="py-4">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="16" height="16">
<path
fill="#A8A29E"
d="M6 2a4 4 0 100 8 4 4 0 000-8zM0 6a6 6 0 1110.89 3.477l4.817 4.816a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 010 6z"
/>
</svg>
<div className="flex">
<div className="flex mt-3 pb-3">
<div className="flex relative h-10 my-auto">
<img
src={search}
title="Search"
className="filter-grayscale absolute top-3 left-3"
alt="search icon"
/>
<input
className="w-64 pl-9 border-0"
type="search"
placeholder="Search Members"
onChange={(e) => setSearchText(e.target.value)}
/>
</div>
<input type="search" placeholder="Search Members" onChange={(e) => setSearchText(e.target.value)} />
</div>
</div>

Expand Down
28 changes: 11 additions & 17 deletions components/dashboard/src/projects/Prebuilds.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { Link, Redirect } from "react-router-dom";
import { Disposable } from "vscode-jsonrpc";
import { useCurrentProject } from "./project-context";
import { getProjectTabs } from "./projects.routes";
import search from "../icons/search.svg";

export default function PrebuildsPage(props: { project?: Project; isAdminDashboard?: boolean }) {
const currentProject = useCurrentProject();
Expand Down Expand Up @@ -142,30 +143,23 @@ export default function PrebuildsPage(props: { project?: Project; isAdminDashboa
/>
)}
<div className={props.isAdminDashboard ? "" : "app-container"}>
<div className={props.isAdminDashboard ? "flex" : "flex mt-8"}>
<div className="flex">
<div className="py-4">
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 16 16"
width="16"
height="16"
>
<path
fill="#A8A29E"
d="M6 2a4 4 0 100 8 4 4 0 000-8zM0 6a6 6 0 1110.89 3.477l4.817 4.816a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 010 6z"
/>
</svg>
</div>
<div className={props.isAdminDashboard ? "flex" : "flex pt-2"}>
<div className="flex relative h-10 my-auto">
<img
src={search}
title="Search"
className="filter-grayscale absolute top-3 left-3"
alt="search icon"
/>
<input
type="search"
className="w-64 pl-9 border-0"
placeholder="Search Prebuilds"
onChange={(e) => setSearchFilter(e.target.value)}
/>
</div>
<div className="flex-1" />
<div className="py-3 pl-3">
<div className="py-2 pl-3">
<DropDown prefix="Prebuild Status: " customClasses="w-32" entries={statusFilterEntries()} />
</div>
{!props.isAdminDashboard && (
Expand Down
26 changes: 10 additions & 16 deletions components/dashboard/src/projects/Project.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { prebuildStatusIcon, prebuildStatusLabel } from "./Prebuilds";
import { useCurrentProject } from "./project-context";
import { getProjectTabs } from "./projects.routes";
import { shortCommitMessage, toRemoteURL } from "./render-utils";
import search from "../icons/search.svg";

export default function ProjectsPage() {
const history = useHistory();
Expand Down Expand Up @@ -226,24 +227,17 @@ export default function ProjectsPage() {
</div>
) : (
<>
<div className="flex mt-8">
<div className="flex">
<div className="py-4">
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 16 16"
width="16"
height="16"
>
<path
fill="#A8A29E"
d="M6 2a4 4 0 100 8 4 4 0 000-8zM0 6a6 6 0 1110.89 3.477l4.817 4.816a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 010 6z"
/>
</svg>
</div>
<div className="pt-2 flex">
<div className="flex relative h-10 my-auto">
<img
src={search}
title="Search"
className="filter-grayscale absolute top-3 left-3"
alt="search icon"
/>
<input
type="search"
className="w-64 pl-9 border-0"
placeholder="Search Active Branches"
onChange={(e) => setSearchFilter(e.target.value)}
/>
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/projects/Projects.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export default function ProjectsPage() {
/>
</div>
<div className="flex-1" />
<div className="py-3 pl-3"></div>
<div className="py-2 pl-3"></div>
{team && (
<Link to="./members" className="flex">
<button className="ml-2 secondary">Invite Members</button>
Expand Down
4 changes: 2 additions & 2 deletions components/dashboard/src/workspaces/WorkspacesSearchBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ export const WorkspacesSearchBar: FunctionComponent<WorkspacesSearchBarProps> =
/>
</div>
<div className="flex-1" />
<div className="py-3"></div>
<div className="py-3 pl-3">
<div className="py-2"></div>
<div className="py-2 pl-3">
<DropDown
prefix="Limit: "
customClasses="w-32"
Expand Down