Skip to content

Commit

Permalink
Merge pull request #69 from oslabs-beta/dev
Browse files Browse the repository at this point in the history
Dev merged into master
  • Loading branch information
jo-cella authored Oct 6, 2021
2 parents 850f5f2 + f1bfa91 commit 608f9d4
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Installing from VS Code Extension Marketplace:

1. If needed, install Visual Studio Code for Windows (7+), macOS (Sierra+), or Linux (details).

2. Install the Sapling extension for Visual Studio Code.
2. Install the Sapling extension for Visual Studio Code. Search for 'sapling' in the VS Code extensions tab, or click [here](https://marketplace.visualstudio.com/items?itemName=team-sapling.sapling).

3. Once complete, you'll see Sapling appear in your sidebar. You can now begin using Sapling! Check out the Getting Started below for information on how to get started.

Expand Down
10 changes: 5 additions & 5 deletions sapling/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
<!-- BADGES -->
<p align="center">
<!-- FORKS -->
<a href="https://github.com/oslabs-beta/sapling/network/members"><img alt="GitHub forks" src="https://img.shields.io/github/forks/oslabs-beta/sapling"></a>
<!-- <a href="https://github.com/oslabs-beta/sapling/network/members"><img alt="GitHub forks" src="https://img.shields.io/github/forks/oslabs-beta/sapling"></a> -->
<!-- STARS -->
<a href="https://github.com/oslabs-beta/sapling/stargazers"><img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/oslabs-beta/sapling"></a>
<!-- <a href="https://github.com/oslabs-beta/sapling/stargazers"><img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/oslabs-beta/sapling"></a> -->
<!-- GITHUB RELEASE VERSION -->
<!-- <a href="https://github.com/oslabs-beta/sapling/releases"><img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/oslabs-beta/sapling?include_prereleases"></a> -->
<!-- BUILD STATUS -->
<a href="https://github.com/oslabs-beta/sapling/actions/workflows/master.yml"><img alt="master CI/CD workflow status" src="https://github.com/oslabs-beta/sapling/actions/workflows/master.yml/badge.svg"></a>
<!-- <a href="https://github.com/oslabs-beta/sapling/actions/workflows/master.yml"><img alt="master CI/CD workflow status" src="https://github.com/oslabs-beta/sapling/actions/workflows/master.yml/badge.svg"></a>
<a href="https://github.com/oslabs-beta/sapling/actions/workflows/dev.yml"><img alt="dev CI workflow status" src="https://github.com/oslabs-beta/sapling/actions/workflows/dev.yml/badge.svg"></a>
<img alt="GitHub deployments" src="https://img.shields.io/github/deployments/oslabs-beta/sapling/production?label=website%20build&logo=vercel">
<img alt="GitHub deployments" src="https://img.shields.io/github/deployments/oslabs-beta/sapling/production?label=website%20build&logo=vercel"> -->
<!-- LICENSE -->
<!-- <a href="https://github.com/oslabs-beta/sapling/blob/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/oslabs-beta/sapling"></a> -->
<!-- CONTRIBUTIONS -->
Expand Down Expand Up @@ -109,7 +109,7 @@ Installing from VS Code Extension Marketplace:

1. If needed, install Visual Studio Code for Windows (7+), macOS (Sierra+), or Linux (details).

2. Install the Sapling extension for Visual Studio Code.
2. Install the Sapling extension for Visual Studio Code. Search for 'sapling' in the VS Code extensions tab, or click [here](https://marketplace.visualstudio.com/items?itemName=team-sapling.sapling).

3. Once complete, you'll see Sapling appear in your sidebar. You can now begin using Sapling! Check out the Getting Started below for information on how to get started.

Expand Down
2 changes: 1 addition & 1 deletion website/components/Jumbotron.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const Jumbotron = () => {
<hr className="my-4"/>
<p>React is a powerful tool for building your frontend applications, but at scale navigating the hierarchy of your components can become frustrating. Sapling&apos;s intuitive interface reflects the hierarchical nature of your app, so you&apos;ll never have to think twice about navigation again.</p>
<p className="lead d-flex justify-content-center">
<a className="btn btn-sapling btn-lg d-flex align-items-center" href="#" role="button">
<a className="btn btn-sapling btn-lg d-flex align-items-center" href="https://marketplace.visualstudio.com/items?itemName=team-sapling.sapling" role="button">
<span>Get Sapling for </span><Image src={vscodeLogo} alt="VS Code Logo"/><span> VS Code </span>
</a>
</p>
Expand Down
2 changes: 1 addition & 1 deletion website/components/Links.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const Links = () => {
</div>
<div className="link mx-auto">
<p className="text-center">Read more about Sapling</p>
<a href="" target="_blank">
<a href="https://medium.com/@saplingextension/introducing-sapling-a-vs-code-extension-for-traversing-your-react-component-hierarchy-3ac94d95887e" target="_blank" rel="noreferrer">
<Image src={mediumIcon} alt="Medium M Logo"/>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion website/components/Navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const Navbar = () => {
</li> */}
</ul>
<ul className="navbar-nav mb-2 mb-lg-0">
<li><a className="btn btn-sapling" href="#">Get Sapling</a></li>
<li><a className="btn btn-sapling" href="https://marketplace.visualstudio.com/items?itemName=team-sapling.sapling" target="_blank" rel="noreferrer">Get Sapling</a></li>
</ul>
</div>
</div>
Expand Down

1 comment on commit 608f9d4

@vercel
Copy link

@vercel vercel bot commented on 608f9d4 Oct 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.