-
Notifications
You must be signed in to change notification settings - Fork 13
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.
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
Cara's First PR #4
Open
caramurphyy
wants to merge
12
commits into
gotechnica:main
Choose a base branch
from
caramurphyy:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,496
−1
Open
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
cc24b97
testing
caramurphyy 4e054b5
index and art pages
caramurphyy db35fc8
added contact page, updated home format, font
caramurphyy 1b9118f
more art, changed art page
caramurphyy f711fd2
added UI page
caramurphyy c652067
moved images into folders
caramurphyy 07f706b
updated ui page layout
caramurphyy fb3f761
updated home page, art info
caramurphyy 64e7d5f
added readme
caramurphyy e4c8750
organized css into unique files
caramurphyy 25af708
added favicon, updated css format
caramurphyy 8209c4d
added favicon toa ll pages
caramurphyy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
index and art pages
commit 4e054b5b22ec5a19cbb654062301d473143572af
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
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 |
---|---|---|
@@ -0,0 +1,223 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
|
||
<head> | ||
<meta charset="UTF-8"> | ||
<meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
<link rel="stylesheet" href="style.css"> | ||
<script type="text/javascript" src="js/script.js"></script> | ||
<title>art</title> | ||
</head> | ||
|
||
<body> | ||
<main> | ||
<a class="home" href="index.html">C</a> | ||
<div class="tabContainerLarge"> | ||
|
||
<a href="resume.html"> | ||
<div class="tab" id="leftTab"> | ||
resume </div> | ||
</a> | ||
<a href="graphicDesign.html"> | ||
<div class="tab" id="middleTab"> | ||
graphic design | ||
</div> | ||
</a> | ||
<a href="art.html"> | ||
<div class="tab" id="rightTab"> | ||
art</div> | ||
</a> | ||
|
||
</div> | ||
<div class="webPageLarge"> | ||
<div class="searchBarContainer" id="fixedHeader"> | ||
<button class="navButtons" type="button" placeholder="back" id="backButton" onclick="history.back()"> | ||
< <button class="navButtons" type="button" placeholder="front" onclick="history.forward()">> | ||
</button> | ||
</div> | ||
<h2 id="artPageHeader">my art</h2> | ||
<h3 class="artTypeHeader">paintings</h3> | ||
<hr class="artHeaderLine"> | ||
<h4 class="info">click each piece for more info</h4> | ||
|
||
<div class="imageGrid"> | ||
|
||
<div class="gridItem" onclick="openPage('flutist',this)"> | ||
<image class=" imageGridItem" src="artForWebsite/flute.jpg"> | ||
</image> | ||
<div class="artTitleText">flutist</div> | ||
</div> | ||
|
||
<div class="gridItem" onclick="openPage('lucidity',this)"> | ||
<image class="imageGridItem" src="artForWebsite/afterprom.jpg"></image> | ||
<div class="artTitleText">lucidity</div> | ||
</div> | ||
|
||
<div class="gridItem" onclick="openPage('utopia',this)"> | ||
<image class="imageGridItem" src="artForWebsite/utopia.jpg"></image> | ||
<div class="artTitleText">utopia</div> | ||
</div> | ||
</div> | ||
|
||
<div id="flutist"> | ||
<h2 class="singleArtHeader">flutist</h2> | ||
<hr class="artHeaderLine"> | ||
<image class="singleImage" src="artForWebsite/flute.jpg"> | ||
<div class="artDescriptionContainer"> | ||
<p class="artDescription"> | ||
<b>title:</b> flutist | ||
<br> | ||
<b>date:</b> 2022 | ||
<br> | ||
<b>medium:</b> acrylic | ||
<br> | ||
<br> | ||
This piece was inspired by my experience as a flutist. My teacher often encouraged | ||
me to | ||
project the "calm blue of the ocean" or play sharply like scraping a knife across | ||
burnt | ||
toast. | ||
</p> | ||
</div> | ||
<div class="artFooter">foot</div> | ||
</div> | ||
|
||
<div id="lucidity"> | ||
<h2 class="singleArtHeader">lucidity</h2> | ||
<hr class="artHeaderLine"> | ||
<image class="singleImage" src="artForWebsite/afterprom.jpg"> | ||
<div class="artDescriptionContainer"> | ||
<p class="artDescription"> | ||
<b>title:</b> lucidity | ||
<br> | ||
<b>date:</b> 2021 | ||
<br> | ||
<b>medium:</b> acrylic | ||
<br> | ||
<br> | ||
um | ||
</p> | ||
</div> | ||
<div class="artFooter">foot</div> | ||
</div> | ||
|
||
<div id="utopia"> | ||
<h2 class="singleArtHeader">utopia</h2> | ||
<hr class="artHeaderLine"> | ||
<image class="singleImage" src="artForWebsite/utopia.jpg"> | ||
<div class="artDescriptionContainer"> | ||
<p class="artDescription"> | ||
<b>title:</b> utopia | ||
<br> | ||
<b>date:</b> 2021 | ||
<br> | ||
<b>medium:</b> oil | ||
<br> | ||
<br> | ||
um | ||
</p> | ||
</div> | ||
<div class="artFooter">foot</div> | ||
</div> | ||
|
||
<script>function openPage(pageName, element) { | ||
// Hide all elements with class="imageGrid" by default */ | ||
var i, imageGrid, pageHeader, backButton; | ||
imageGrid = document.getElementsByClassName("imageGrid"); | ||
dynamicGrid = document.getElementsByClassName("dynamicGrid"); | ||
artTypeHeader = document.getElementsByClassName("artTypeHeader"); | ||
info = document.getElementsByClassName("info"); | ||
for (i = 0; i < imageGrid.length; i++) { | ||
imageGrid[i].style.display = "none"; | ||
} | ||
for (i = 0; i < dynamicGrid.length; i++) { | ||
dynamicGrid[i].style.display = "none"; | ||
} | ||
for (i = 0; i < artTypeHeader.length; i++) { | ||
artTypeHeader[i].style.display = "none"; | ||
} | ||
for (i = 0; i < info.length; i++) { | ||
info[i].style.display = "none"; | ||
} | ||
pageHeader = document.getElementById("artPageHeader"); | ||
backButton = document.getElementById("backButton"); | ||
pageHeader.style.display = "none"; | ||
backButton.onclick = function () { window.location = 'art.html'; } | ||
// Show the specific tab content | ||
document.getElementById(pageName).style.display = "block"; | ||
} | ||
|
||
// Get the element with id="defaultOpen" and click on it | ||
document.getElementById("defaultOpen").click();</script> | ||
|
||
<h3 class="artTypeHeader">digital</h2> | ||
<hr class="artHeaderLine"> | ||
|
||
<div class="artTypeButtonContainer"> | ||
<button class="artTypeButton" type="button" onclick="showType('portrait',this)">portraits</button> | ||
<button class=" artTypeButton" type="button" onclick="showType('nft',this)">NFT art</button> | ||
<button class="artTypeButton" type="button" onclick="showType('design',this)">designs</button> | ||
</div> | ||
<script>function showType(type, element) { | ||
var portrait, nft, design, shown; | ||
portrait = document.getElementsByClassName("portrait"); | ||
nft = document.getElementsByClassName("nft"); | ||
design = document.getElementsByClassName("design"); | ||
for (i = 0; i < portrait.length; i++) { | ||
portrait[i].style.display = "none"; | ||
} | ||
for (i = 0; i < nft.length; i++) { | ||
nft[i].style.display = "none"; | ||
} | ||
for (i = 0; i < design.length; i++) { | ||
design[i].style.display = "none"; | ||
} | ||
shown = document.getElementsByClassName(type); | ||
for (i = 0; i < shown.length; i++) { | ||
shown[i].style.display = "block"; | ||
} | ||
|
||
console.log(type + "clicked"); | ||
}</script> | ||
|
||
<div class="dynamicGrid"> | ||
<div class="dynamicGridColumn"> | ||
<image class="portrait" src="DigitalArtPortfolio/GreenBoyHead.JPG"> | ||
</image> | ||
<image class="portrait" src="DigitalArtPortfolio/HalfBodyDress.jpg"> | ||
</image> | ||
<image class="nft" src="artForWebsite/chinatown.png"></image> | ||
<image class="design" src="DigitalArtPortfolio/KoiFish.jpg"></image> | ||
<image class="portrait" src="DigitalArtPortfolio/PromDressBust.JPG"> | ||
</image> | ||
</div> | ||
<div class="dynamicGridColumn"> | ||
<image class="nft" src="artForWebsite/backBay.png"></image> | ||
<image class="portrait" src="DigitalArtPortfolio/Rumination.PNG"> | ||
</image> | ||
<image class="portrait" src="DigitalArtPortfolio/LightStudyBoy.jpg"> | ||
</image> | ||
<image class="design" src="DigitalArtPortfolio/PumpkinPieRecipe.jpg"> | ||
</image> | ||
<image class="portrait" src="DigitalArtPortfolio/YellowBoyHead.JPG"> | ||
</image> | ||
</div> | ||
|
||
<div class="dynamicGridColumn"> | ||
<image class="portrait" src="DigitalArtPortfolio/IllinoisBoy.JPG"> | ||
</image> | ||
<image class="design" src="DigitalArtPortfolio/Taiyaki.jpg"></image> | ||
<image class="portrait" src="DigitalArtPortfolio/PromDressPlants.JPG"> | ||
</image> | ||
<image class="portrait" src="DigitalArtPortfolio/GoldenGirl.jpg"> | ||
</image> | ||
<image class="nft" src="artForWebsite/somerville.png"></image> | ||
</div> | ||
</div> | ||
|
||
</div> | ||
</main> | ||
</body> | ||
|
||
</html> |
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 |
---|---|---|
@@ -0,0 +1,70 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
|
||
<head> | ||
<meta charset="UTF-8"> | ||
<meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
<link rel="stylesheet" href="style.css"> | ||
<link href='https://fonts.googleapis.com/css?family=Montserrat' rel='stylesheet'> | ||
<script type="text/javascript" src="js/script.js"></script> | ||
<title>home</title> | ||
</head> | ||
|
||
<body> | ||
<main> | ||
|
||
|
||
<a class="home" href="index.html" id="homeC">C</a> | ||
<div class="header"> | ||
<a href="resume.html"> | ||
<div class="tab" id="leftTab"> | ||
resume </div> | ||
</a> | ||
<a href="graphicDesign.html"> | ||
<div class="tab" id="middleTab"> | ||
graphic design | ||
</div> | ||
</a> | ||
<a href="art.html"> | ||
<div class="tab" id="rightTab"> | ||
art</div> | ||
</a> | ||
</div> | ||
|
||
|
||
|
||
<div class="aboutBox"> | ||
|
||
<image src="senior_photo.JPG" class="aboutPhoto"></image> | ||
<div class="name"> | ||
Cara Murphy | ||
</div> | ||
<p id="aboutMe">hi there! | ||
<br> | ||
|
||
I'm an artist and incoming freshman at the university <br>of maryland college-park majoring in | ||
computer science! | ||
|
||
</p> | ||
</div> | ||
|
||
<div class="quickButtonsContainer"> | ||
<button class="quickButton"> | ||
<image src="logos/linkedInLogo.png" class="logo"></image> | ||
</button> | ||
<button class="quickButton" onClick="parent.open('https://www.linkedin.com/in/cara-murphy-1384661a4/')"> | ||
<image src="logos/linkedInLogo.png" class="logo"> | ||
</image> | ||
</button> | ||
<button class="quickButton"> | ||
<image src="logos/mailLogo.png" class="logo"> | ||
</image> | ||
</button> | ||
</div> | ||
|
||
|
||
</main> | ||
</body> | ||
|
||
</html> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix spacing.