-
Notifications
You must be signed in to change notification settings - Fork 568
Jason.Holloway User-Interface-Project-Week #574
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
Open
jjamaltwin
wants to merge
83
commits into
bloominstituteoftechnology:master
Choose a base branch
from
jjamaltwin:master
base: master
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.
Open
Changes from all commits
Commits
Show all changes
83 commits
Select commit
Hold shift + click to select a range
714fbdd
first push, working on header for Home page
jjamaltwin de49013
working on header image, nav-bar button and header
jjamaltwin 7b34bfd
working on drop-down nav button
jjamaltwin 5499b66
working on image text positioning
jjamaltwin d9687fd
finally got text in place, moving on to main content
jjamaltwin 5072032
trying to place image and paragrah in proper postion
jjamaltwin 944de34
tweaking the aligment of text and image
jjamaltwin faa032a
finished first paragraph , button , and image, will make it pixel per…
jjamaltwin 40e559b
working on middle content alignment
jjamaltwin 928717a
fixed the top paragrah alignment
jjamaltwin 26d4f9f
added villas photo and third header
jjamaltwin 1b9724e
moving on to next image and content
jjamaltwin e334ed4
centered villasp
jjamaltwin 0c8a174
set outskirts image in place with image text
jjamaltwin 744eeeb
finished outskirts content
jjamaltwin 30397f5
finished the blocks content and image
jjamaltwin dc982c1
working on footer
jjamaltwin 9c7917a
working on footer
jjamaltwin 87ab652
finished second state info for footer
jjamaltwin 23e1bcd
finishing footer
jjamaltwin 561d477
working on footer
jjamaltwin e3bf76e
working on image sub headers using relative and absolute on divs
jjamaltwin 621a472
finished subheaders, now moving on to mobile design
jjamaltwin bbfb623
working on mobile design
jjamaltwin 54d374d
started designs from scratch, making final adjustments and working on…
jjamaltwin cd1f23c
working on mobile design
jjamaltwin 6257f37
halfway done with mobile design
jjamaltwin 6f83dcc
working on navigation button and functionality
jjamaltwin 8f02aea
got functionality working for home nav menu, now working on design
jjamaltwin c118a65
finished expanded view of nav bar, moving on to tab funtion for serv…
jjamaltwin ca18c79
working on fixed nav bar
jjamaltwin 41df8fc
trying to get services link to change color on hover
jjamaltwin b1eaa3b
got the hover affect to work on all list items including a tag
jjamaltwin aa2b134
working on services tab function
jjamaltwin 5cd4352
late push
jjamaltwin dac1c15
working on mobile design now
jjamaltwin 4625d64
made adjustments to footer on services page and added hover cursor on…
jjamaltwin 8461eb8
working on container widths and services drip down menu
jjamaltwin 1d7b389
trying to get mobile design, getting burned out and need to take break
jjamaltwin 6e99d23
working on mobile design
jjamaltwin 7dedb56
working on centering sub headers and displaying the right mobile size…
jjamaltwin 1f2c9f3
working on header and first image/paragraph
jjamaltwin 592d8ab
working on header and top content
jjamaltwin 0d6e016
still working on top page mobile design
jjamaltwin 121237b
trying to get nav buttton to be responsive when browser size changes.
jjamaltwin 3d82807
finishing container and container1, moving on to container2 and 3
jjamaltwin b8a4c77
aligning container 3
jjamaltwin 835a26b
finishing up mobile design
jjamaltwin e38ad90
working on bottom content mobile design
jjamaltwin 1fe7dd8
working on footer and villas sub header
jjamaltwin fe4bd08
placing everything in place according to mobile design
jjamaltwin 7d9e648
jplaced max-width on .villa-content
jjamaltwin 5feccf6
fixed top pic bottom margin
jjamaltwin e0cc37c
working on footer mobile design
jjamaltwin 6c16b73
added opacity to nav menu open design
jjamaltwin 3ba6acd
fixed the header's responsive design
jjamaltwin 9bc5179
tweaking the header nav button
jjamaltwin 8b07a12
working on villa subheader position
jjamaltwin 11e9f3b
finally got villas subheader on pic in position for mobile design
jjamaltwin 3301c78
finishing mobile design, spacing, margin, and working on dropdown men…
jjamaltwin c8dc317
making final adjustments
jjamaltwin 2db3131
trying to adjust size of menu close image.
jjamaltwin ab41e88
fixed nav close button
jjamaltwin fc417f0
working on nav menu background color
jjamaltwin 402c48b
working on services header and services menu header
jjamaltwin 89bf7f1
working on sevices menu close image/button
jjamaltwin 5369152
final push
jjamaltwin 561c90e
fixed villas paragraph
jjamaltwin 1e3aaeb
working on opacity for nav menu
jjamaltwin a43bbe1
set the vh to 100
jjamaltwin 402781e
working on services menu
jjamaltwin 90b2512
fixed services opacity and positioning, menu covers full screen with …
jjamaltwin b4dcdc7
cleaning up index.less and labeling design segments
jjamaltwin f6c1fcb
fixed the spacing on services page between image and paragraph, also…
jjamaltwin ab71920
fixed villasp on home page
jjamaltwin d94d1ea
fixed foooter spacing on home page
jjamaltwin b3e553b
working on header on contact page
jjamaltwin 8bad7ce
placed <p> contact us on image properly
jjamaltwin 11ba25c
working on content for contact page
jjamaltwin fbebe91
working on second form, contact page
jjamaltwin fa19d4b
working on select form , contact page
jjamaltwin b7114b1
figured out number select form, contact page
jjamaltwin 10e1f7e
final push before project form
jjamaltwin 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
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
---|---|---|
@@ -1,3 +1,5 @@ | ||
|
||
|
||
<!DOCTYPE html> | ||
<html lang="en"> | ||
<head> | ||
|
@@ -11,8 +13,84 @@ | |
</head> | ||
|
||
<body> | ||
<div class="container12"> | ||
<div class="headwrapper"> | ||
|
||
<h1>S&J </h1> | ||
<img class="nav-button" src="img\nav-hamburger.png"/> | ||
|
||
</div> | ||
<div class="container19"> | ||
|
||
|
||
|
||
<div class="menu"> | ||
<h1>S&J | ||
<img class="nav-button" src="img\nav-hamburger-close.png"/> </h1> | ||
|
||
<ul> | ||
<li class= "link" ><a href="index.html">Home</a></li> | ||
<li class= "link" ><a href="services.html">Services</a></li> | ||
<li class="link"><a href="contact.html">Contact</a></li> | ||
</ul> | ||
</div> | ||
<img src="img\contact\contact-jumbotron.png" alt="jumbo" style="width:100%"> | ||
<div class="text-content"> | ||
<p>Contact Us</p> | ||
|
||
</div> | ||
</div> | ||
|
||
<div class="container20"> | ||
<h2>Get in touch</h2> | ||
|
||
<p>Email address</p> | ||
|
||
<form> | ||
<input type="email" placeholder="Enter email"> | ||
</form> | ||
<h3>We'll never share your email with anyone else.</h3> | ||
|
||
<p>How many buildings do you need planned?</p> | ||
<select> | ||
<option value="num">1</option> | ||
<option value="num2">2</option> | ||
<option value="num3">3</option> | ||
<option value="num4">4</option> | ||
</select> | ||
|
||
|
||
<p>Provide a breif overview of your project needs</p> | ||
|
||
<textarea name="message" rows="10" cols="55"> | ||
</textarea> | ||
|
||
|
||
</div> | ||
|
||
<div class="container21"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. great job with the radio buttons! |
||
<form action=""> | ||
<input type="radio" name="customer" value="business"> I am a small business<br> | ||
<input type="radio" name="customer" value="personal"> I am a residential owner<br> | ||
<input type="radio" name="customer" value="corp"> I am a corporation | ||
</form> | ||
|
||
<button>Submit</button> | ||
|
||
|
||
</div> | ||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
<h1>Contact</h1> | ||
|
||
|
||
<!-- Contactd Us Content | ||
Contact Us | ||
|
@@ -57,5 +135,6 @@ <h1>Contact</h1> | |
--> | ||
|
||
<script src="js/index.js"></script> | ||
</div> | ||
</body> | ||
</html> |
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.
I can see how container number might initially work, but what happens when you get to container100 and you can't remember what each of them control. Container should be reserved for the main wrapper only and the other receive descriptive names eg: container19 = menu_container