forked from JumboCode/TheLegacyProject
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
151 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,12 +9,12 @@ jobs: | |
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- uses: actions/checkout@v3 | ||
- uses: actions/checkout@v4 | ||
with: | ||
ref: ${{ github.head_ref }} | ||
fetch-depth: 0 | ||
- name: Use Node.js | ||
uses: actions/setup-node@v3 | ||
uses: actions/setup-node@v4 | ||
with: | ||
node-version: "18.x" | ||
|
||
|
@@ -25,4 +25,4 @@ jobs: | |
uses: creyD/[email protected] | ||
with: | ||
prettier_options: "--write **/*.tsx **/*.ts **/*.mjs" | ||
prettier_version: '2.x.x' | ||
prettier_version: "2.x.x" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -86,9 +86,32 @@ const LandingFooter = () => { | |
className={`${buttonStyle} w-auto rounded-xl px-4 py-4 duration-150`} | ||
type="submit" | ||
> | ||
<<<<<<< HEAD | ||
<span className="align-center text-white">{buttonText}</span> | ||
</button> | ||
</form> | ||
======= | ||
<input | ||
className="text-dark \ relative h-[40px] rounded border-2 border-offer-white bg-off-white | ||
px-[10px] focus:border-light-teal focus:outline-none sm:w-3/4" | ||
name="email" | ||
placeholder="[email protected]" | ||
onFocus={resetButton} | ||
onChange={(event) => { | ||
setEmail(event.target.value); | ||
}} | ||
/> | ||
<button | ||
className={`h-[40px] w-auto ${buttonStyle} rounded duration-150`} | ||
type="submit" | ||
> | ||
<span className="align-center text-md m-[10px] w-auto tracking-easy text-white"> | ||
{buttonText} | ||
</span> | ||
</button> | ||
</form> | ||
</FlowerBox> | ||
>>>>>>> main | ||
</div> | ||
); | ||
}; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters