diff --git a/app/components/ImageSection.tsx b/app/components/ImageSection.tsx index fd6a5d9..4837042 100644 --- a/app/components/ImageSection.tsx +++ b/app/components/ImageSection.tsx @@ -4,23 +4,24 @@ interface Props { width: number height: number src: string - className?: string alt?: string + className?: string subtitle?: string } -export default function ImageSection({ width, height, className, alt, src, subtitle }: Props) { +export default function ImageSection({ src, alt, subtitle }: Props) { return ( -
+
{subtitle ? ( -
+
{subtitle}
) : null} diff --git a/app/global.css b/app/global.css index 67ece98..bdf1f79 100644 --- a/app/global.css +++ b/app/global.css @@ -16,8 +16,8 @@ --clr-light-gray: #f1f1ed; /* accent */ --clr-accent: #97eae5; - --clr-err-50: #DC606B; - --clr-warn-50: #DC9B14; + --clr-err-50: #dc606b; + --clr-warn-50: #dc9b14; --font-system: system-ui, sans-serif; } @@ -53,19 +53,8 @@ body { } } -/* Prev / Next Cards at bottom of every page */ -article div:last-of-type:is(.grid.grid-cols-2) a>p:last-of-type { - @apply !font-ppeditorial text-base; -} - -/* Headers Serif */ -h1, -h2 { - @apply !font-ppeditorial; -} - iframe[src*="youtube"] { aspect-ratio: 16 / 9; border-radius: 0.5rem; - @apply w-full h-full; + @apply h-full w-full; } diff --git a/app/layout.tsx b/app/layout.tsx index 5718f95..7cf2956 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,7 +1,6 @@ import "./global.css" import { Provider } from "./provider" -import localFont from "next/font/local" -import { Inter } from 'next/font/google' +import { Inter } from "next/font/google" import type { Metadata, Viewport } from "next" import type { ReactNode } from "react" @@ -11,29 +10,14 @@ const baseUrl = : new URL(`https://${process.env.VERCEL_URL}`) const inter = Inter({ - subsets: ['latin'], - display: 'swap', + subsets: ["latin"], + display: "swap", variable: "--font-inter" }) -const ppEditorialNew = localFont({ - src: [ - { - path: "../public/fonts/PPEditorialNew-Regular.woff2", - weight: "300" - }, - { - path: "../public/fonts/PPEditorialNew-Italic.woff2", - weight: "300", - style: "italic" - } - ], - variable: "--font-ppeditorialnew" -}) - export default function Layout({ children }: { children: ReactNode }) { return ( - + {children} diff --git a/content/docs/features/stacked-branches.mdx b/content/docs/features/stacked-branches.mdx index 11d5786..edbf4a3 100644 --- a/content/docs/features/stacked-branches.mdx +++ b/content/docs/features/stacked-branches.mdx @@ -15,11 +15,8 @@ This is useful when you have multiple changesets that depend on each other but i > All of the Pull Request stack orchestration is done locally in the client, which means that your repo content is not shared with a cloud service. ## Use cases @@ -59,11 +56,7 @@ can be put in a separate virtual branch. On the other hand a change that depends In fact GitButler implements stacked branches as Virtual Branches that are split into multiple dependent branches which makes for a flexible workflow. ## Workflow @@ -76,82 +69,63 @@ you can create a new dependent branch within a lance with the `+` button above t 1. Creating a new dependent branch forms a new stack within the virtual branch 2. New commits land in the topmost branch of the stack 3. Pushing is done for the stack as a whole 4. Pull request creation has to be done from the bottom of the stack upwards 5. The PRs will contain a footer with stack information and as you add more PRs it will keep all up to date 6. You can drag changes into commits to amend them (e.g. incorporating review feedback) as well as move and squash commits + + + 7. If a change in your stack is independent (e.g. an unrelated bugfix) it can be moved to a different virtual branch (or stack1) 8. Review/merge your PRs starting from the bottom up. After a PR/branch from your stack has been merged, it is reflected in the Stack and you should force push to reflect the changes on the remote as well + 9. When all branches of a stack have been merged, the stack is complete @@ -173,11 +147,8 @@ In order to show only the expected Files changed and Commits for PRs in a stack, This is true for all but the bottom-most branch in the stack, which targets the default branch of the repository as usual. > Every branch in the stack contains the commits from the branches below it. @@ -187,11 +158,7 @@ When the bottom-most branch is merged on GitHub, **if** the PR branch is deleted GitHub will automatically update any PRs that used to target it to target the default branch instead. If the newly merged branch from the bottom of the stack is not deleted, the next PR in line will still target it and there is a risk of accidentally merging it into the now out of data branch. diff --git a/content/docs/features/timeline.mdx b/content/docs/features/timeline.mdx index 59bd024..ffb5bac 100644 --- a/content/docs/features/timeline.mdx +++ b/content/docs/features/timeline.mdx @@ -10,9 +10,6 @@ Undo nearly any of your actions or go back in time to an earlier state. Before GitButler does any major action, it records the state of everything (your virtual branch state, your uncommitted work, conflict state, etc) and stores it in your Git object database as snapshots. You can hit the 'revert' button on any of the entries and it will restore the state of all of these things to what they looked like when they were recorded, letting you go back in time. @@ -25,9 +22,6 @@ There is a small clock-looking logo in the bottom left corner of the app, next t If you hover over any of the entries, you will see a button named "Revert" that will restore the state of things to right before you did that action. So if you revert one that says "Create Commit", it will put you where you were right before you made that commit. @@ -36,9 +30,6 @@ If you hover over any of the entries, you will see a button named "Revert" that Occasionally, GitButler will also take snapshots of files that were changed recently, even if they weren't committed. If this, or any other action, sees changes in files, you can see which ones and view the change by clicking on the file name. diff --git a/content/docs/features/virtual-branches/branch-lanes.mdx b/content/docs/features/virtual-branches/branch-lanes.mdx index 2f38a79..8f7b65e 100644 --- a/content/docs/features/virtual-branches/branch-lanes.mdx +++ b/content/docs/features/virtual-branches/branch-lanes.mdx @@ -13,9 +13,6 @@ This could be a local virtual branch that you're working on, or it could be a vi The interface looks something like this: @@ -31,9 +28,6 @@ If you want to use AI for generating your commit messages from time to time, you For both OpenAI and Anthropic, you can either use your own API key to directly send your request to their servers, or you can proxy via our server (which you need to be logged in for). @@ -41,9 +35,6 @@ For both OpenAI and Anthropic, you can either use your own API key to directly s If you use your own key for OpenAI or Anthropic, you can choose which model you would like us to use. @@ -53,9 +44,6 @@ If you don't want to send your diff to another server, you can also use Ollama, With all of these models, you can also customize the prompt if you want something more specific. In the "Custom AI prompts" section, you can add new prompts and select which one you want to use per project. This is useful for following certain formats or generating messages in other languages, etc. @@ -74,9 +62,6 @@ If you have a commit and get some feedback on it or find an issue and wish to am This will both rewrite that commit to include the new changes and also rebase every commit upstream from it automatically. @@ -90,9 +75,6 @@ You can easily undo any commit in your stack by expanding the commit and hitting @@ -102,9 +84,6 @@ You can easily undo any commit in your stack by expanding the commit and hitting Squashing two commits into a single combined commit is also very simple. Just drag one commit on top of another one. @@ -114,9 +93,6 @@ Squashing two commits into a single combined commit is also very simple. Just dr Splitting commits is slightly more complex. GitButler allows you to create an "empty" commit anywhere and then drag changes into it. Here is an example of creating an empty commit between two other commits, dragging changes from both of them into it and then absorbing new work into it as well. @@ -128,9 +104,6 @@ You can also notice that I easily edit the commit message by just hitting the "e You can also arbitrarily change the order of your commits by dragging and dropping them, which rebases everything to change the order. @@ -143,9 +116,6 @@ The screen will go into "Edit mode", indicating that you're in a special state w diff --git a/content/docs/features/virtual-branches/committer-mark.mdx b/content/docs/features/virtual-branches/committer-mark.mdx index c0d643b..fb79009 100644 --- a/content/docs/features/virtual-branches/committer-mark.mdx +++ b/content/docs/features/virtual-branches/committer-mark.mdx @@ -17,9 +17,6 @@ The other credit can optionally go to a "committer", which was historically the If you choose to turn it on as a show of support, GitButler will credit itself as the "committer" on any virtual branch commits that you make. This helps us spread the word in a fairly non-intrusive way. You don't see the committer when you run `git log` normally, you only really see it on GitHub as a little icon behind the author's icon, like this: @@ -25,9 +22,6 @@ In this case, when you perform the rebase, that branch will then contain "confli @@ -36,9 +30,6 @@ When you click that, GitButler will remove the other virtual branches and other diff --git a/content/docs/features/virtual-branches/overview.mdx b/content/docs/features/virtual-branches/overview.mdx index 2d307c2..e6fce05 100644 --- a/content/docs/features/virtual-branches/overview.mdx +++ b/content/docs/features/virtual-branches/overview.mdx @@ -14,9 +14,6 @@ https://www.youtube.com/watch?v=MRcmnUwrP8A Virtual branches are just like normal Git branches, except that you can work on several of them at the same time. + To delete a virtual branch, you simply unapply it, then left click on it and choose "delete". ## Merging Upstream Eventually you will have work merged into the branch you chose as your target branch, which will need to be reconciled with all your virtual branches to keep them up to date with where they will eventually need to merge to. - + Upstream work will automatically be shown in your sidebar in the "Target" section. When you click "Merge into common base" (or the "Update" button next to your "Workspace" section), we will attempt to integrate that work with your existing virtual branches. Each branch, applied or unapplied, will try to be updated with the new work. - + For each virtual branch you have, we will show you if the incoming upstream work has conflicts with each branch. If there are conflicts, you can choose to stash the branch or go ahead and rebase with conflicts, which you can fix later. @@ -75,9 +72,6 @@ If you do rebase work that has conflicts, the commit will be marked as being in @@ -86,9 +80,6 @@ This is different from how you might have dealt with conflicts in Git before. If diff --git a/content/docs/features/virtual-branches/pushing-and-fetching.mdx b/content/docs/features/virtual-branches/pushing-and-fetching.mdx index af8d45b..e2bd868 100644 --- a/content/docs/features/virtual-branches/pushing-and-fetching.mdx +++ b/content/docs/features/virtual-branches/pushing-and-fetching.mdx @@ -11,9 +11,6 @@ GitButler can authenticate with an upstream Git server in several different ways You can set your preference (and test if it works) in your project's "Git authentication" section: diff --git a/content/docs/features/virtual-branches/remote-branches.mdx b/content/docs/features/virtual-branches/remote-branches.mdx index a02a0e5..e7ce5ed 100644 --- a/content/docs/features/virtual-branches/remote-branches.mdx +++ b/content/docs/features/virtual-branches/remote-branches.mdx @@ -13,9 +13,6 @@ For instance, when a coworker pushes a new branch to the server and opens a pull We will show these new remote branches in this sidebar. @@ -107,9 +98,6 @@ For GitHub or GitLab to verify your signatures, you need to say that the SSH or You can click on the "Add key to GitHub" link in the settings page right about the signing toggle, or you can go here (https://github.com/settings/ssh/new) to paste that public key in. diff --git a/content/docs/troubleshooting/recovering-stuff.mdx b/content/docs/troubleshooting/recovering-stuff.mdx index d248d68..c374f22 100644 --- a/content/docs/troubleshooting/recovering-stuff.mdx +++ b/content/docs/troubleshooting/recovering-stuff.mdx @@ -32,9 +32,6 @@ If you've committed everything on a virtual branch, the reference will just poin So for example, if I have the following two virtual branches, one fully committed and one with work pending: diff --git a/public/fonts/PPEditorialNew-Italic.woff2 b/public/fonts/PPEditorialNew-Italic.woff2 deleted file mode 100644 index efb96b5..0000000 Binary files a/public/fonts/PPEditorialNew-Italic.woff2 and /dev/null differ diff --git a/public/fonts/PPEditorialNew-Regular.woff2 b/public/fonts/PPEditorialNew-Regular.woff2 deleted file mode 100644 index 82e41bd..0000000 Binary files a/public/fonts/PPEditorialNew-Regular.woff2 and /dev/null differ diff --git a/public/img/docs/0_concepts.png b/public/img/docs/0_concepts.png deleted file mode 100644 index 8845e4a..0000000 Binary files a/public/img/docs/0_concepts.png and /dev/null differ diff --git a/public/img/docs/10_branch_deletion.png b/public/img/docs/10_branch_deletion.png deleted file mode 100644 index 72ad157..0000000 Binary files a/public/img/docs/10_branch_deletion.png and /dev/null differ diff --git a/public/img/docs/11_overview.png b/public/img/docs/11_overview.png deleted file mode 100644 index bb1a54e..0000000 Binary files a/public/img/docs/11_overview.png and /dev/null differ diff --git a/public/img/docs/1_creating_stack.png b/public/img/docs/1_creating_stack.png deleted file mode 100644 index 049ade7..0000000 Binary files a/public/img/docs/1_creating_stack.png and /dev/null differ diff --git a/public/img/docs/2_new_commits.png b/public/img/docs/2_new_commits.png deleted file mode 100644 index 9a6e5a6..0000000 Binary files a/public/img/docs/2_new_commits.png and /dev/null differ diff --git a/public/img/docs/3_push_all.png b/public/img/docs/3_push_all.png deleted file mode 100644 index aee71a3..0000000 Binary files a/public/img/docs/3_push_all.png and /dev/null differ diff --git a/public/img/docs/4_create_pr.png b/public/img/docs/4_create_pr.png deleted file mode 100644 index 2f6bdb2..0000000 Binary files a/public/img/docs/4_create_pr.png and /dev/null differ diff --git a/public/img/docs/5_pr_footer.png b/public/img/docs/5_pr_footer.png deleted file mode 100644 index b770c9c..0000000 Binary files a/public/img/docs/5_pr_footer.png and /dev/null differ diff --git a/public/img/docs/6_modify_commits.png b/public/img/docs/6_modify_commits.png deleted file mode 100644 index 797924d..0000000 Binary files a/public/img/docs/6_modify_commits.png and /dev/null differ diff --git a/public/img/docs/7_move_to_vb.png b/public/img/docs/7_move_to_vb.png deleted file mode 100644 index d720f6c..0000000 Binary files a/public/img/docs/7_move_to_vb.png and /dev/null differ diff --git a/public/img/docs/8_merging.png b/public/img/docs/8_merging.png deleted file mode 100644 index d18bb78..0000000 Binary files a/public/img/docs/8_merging.png and /dev/null differ diff --git a/public/img/docs/9_pr_heads.png b/public/img/docs/9_pr_heads.png deleted file mode 100644 index 31d2f42..0000000 Binary files a/public/img/docs/9_pr_heads.png and /dev/null differ diff --git a/public/img/docs/stacked-branches/0_concepts.jpg b/public/img/docs/stacked-branches/0_concepts.jpg new file mode 100644 index 0000000..cd71cb6 Binary files /dev/null and b/public/img/docs/stacked-branches/0_concepts.jpg differ diff --git a/public/img/docs/stacked-branches/10_branch_deletion.jpg b/public/img/docs/stacked-branches/10_branch_deletion.jpg new file mode 100644 index 0000000..57b33b5 Binary files /dev/null and b/public/img/docs/stacked-branches/10_branch_deletion.jpg differ diff --git a/public/img/docs/stacked-branches/11_overview.jpg b/public/img/docs/stacked-branches/11_overview.jpg new file mode 100644 index 0000000..57ff5eb Binary files /dev/null and b/public/img/docs/stacked-branches/11_overview.jpg differ diff --git a/public/img/docs/stacked-branches/1_creating_stack.jpg b/public/img/docs/stacked-branches/1_creating_stack.jpg new file mode 100644 index 0000000..28c8059 Binary files /dev/null and b/public/img/docs/stacked-branches/1_creating_stack.jpg differ diff --git a/public/img/docs/stacked-branches/2_new_commits.jpg b/public/img/docs/stacked-branches/2_new_commits.jpg new file mode 100644 index 0000000..e230399 Binary files /dev/null and b/public/img/docs/stacked-branches/2_new_commits.jpg differ diff --git a/public/img/docs/stacked-branches/3_push_all.jpg b/public/img/docs/stacked-branches/3_push_all.jpg new file mode 100644 index 0000000..19c428c Binary files /dev/null and b/public/img/docs/stacked-branches/3_push_all.jpg differ diff --git a/public/img/docs/stacked-branches/4_create_pr.jpg b/public/img/docs/stacked-branches/4_create_pr.jpg new file mode 100644 index 0000000..80ae094 Binary files /dev/null and b/public/img/docs/stacked-branches/4_create_pr.jpg differ diff --git a/public/img/docs/stacked-branches/5_pr_footer.jpg b/public/img/docs/stacked-branches/5_pr_footer.jpg new file mode 100644 index 0000000..1bedfb4 Binary files /dev/null and b/public/img/docs/stacked-branches/5_pr_footer.jpg differ diff --git a/public/img/docs/stacked-branches/6_modify_commits-amend.jpg b/public/img/docs/stacked-branches/6_modify_commits-amend.jpg new file mode 100644 index 0000000..5069405 Binary files /dev/null and b/public/img/docs/stacked-branches/6_modify_commits-amend.jpg differ diff --git a/public/img/docs/stacked-branches/6_modify_commits-move.jpg b/public/img/docs/stacked-branches/6_modify_commits-move.jpg new file mode 100644 index 0000000..1de3945 Binary files /dev/null and b/public/img/docs/stacked-branches/6_modify_commits-move.jpg differ diff --git a/public/img/docs/stacked-branches/6_modify_commits-squash.jpg b/public/img/docs/stacked-branches/6_modify_commits-squash.jpg new file mode 100644 index 0000000..b23ee2a Binary files /dev/null and b/public/img/docs/stacked-branches/6_modify_commits-squash.jpg differ diff --git a/public/img/docs/stacked-branches/7_move_to_vb.jpg b/public/img/docs/stacked-branches/7_move_to_vb.jpg new file mode 100644 index 0000000..45d0ed6 Binary files /dev/null and b/public/img/docs/stacked-branches/7_move_to_vb.jpg differ diff --git a/public/img/docs/stacked-branches/8_merging-1.jpg b/public/img/docs/stacked-branches/8_merging-1.jpg new file mode 100644 index 0000000..77aa309 Binary files /dev/null and b/public/img/docs/stacked-branches/8_merging-1.jpg differ diff --git a/public/img/docs/stacked-branches/8_merging-2.jpg b/public/img/docs/stacked-branches/8_merging-2.jpg new file mode 100644 index 0000000..66a84d0 Binary files /dev/null and b/public/img/docs/stacked-branches/8_merging-2.jpg differ diff --git a/public/img/docs/stacked-branches/9_pr_heads.jpg b/public/img/docs/stacked-branches/9_pr_heads.jpg new file mode 100644 index 0000000..862347e Binary files /dev/null and b/public/img/docs/stacked-branches/9_pr_heads.jpg differ diff --git a/tailwind.config.js b/tailwind.config.js index f810369..00b2127 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -10,13 +10,5 @@ export default { "./node_modules/fumadocs-ui/dist/**/*.js", "./node_modules/fumadocs-openapi/dist/**/*.js" ], - theme: { - extend: { - fontFamily: { - sans: ["var(--font-inter)", "var(--font-system)"], - ppeditorial: ["var(--font-ppeditorialnew)"] - } - } - }, presets: [createPreset()] }