-
Notifications
You must be signed in to change notification settings - Fork 15
Fleming_Mealey_Rohwer #11
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
tingtingr
wants to merge
6
commits into
SEA-Design-Dev:master
Choose a base branch
from
tingtingr: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
6 commits
Select commit
Hold shift + click to select a range
15ab8ef
used flexbox
86ed792
Added a few improvements based on SMACCS.
nickmealey 261c8a9
Added flexbox for main content.
nickmealey 0727dbe
Kate added text icon
ec7d09f
The site is now responsive.
nickmealey 4c6c56e
Used flexbox to improve responsiveness.
nickmealey 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
|
|
||
| ##Refactor another teams assignment | ||
|
|
||
| ###We shortened the css file from 100 lines to 76 lines. | ||
|
|
||
| These are the changes: | ||
|
|
||
| ####Naming: | ||
|
|
||
| * Add "-" to compound names for easy reading | ||
| e.g. titleBar to title-bar | ||
|
|
||
| ####Short-handed: | ||
| margin, border, border-radius.For example | ||
| ```css | ||
| margin-left: auto; | ||
| margin-right: auto; | ||
| ``` | ||
| ```css | ||
| margin: 0 auto; | ||
| ``` | ||
|
|
||
| ####Deleted unessary specifications on positions. | ||
| ```css | ||
| .profile-text { | ||
| - position: absolute; | ||
| - bottom: 0px;} | ||
|
|
||
| ``` | ||
| ####Deleted unnessary tag | ||
|
|
||
| <div></div> | ||
|
|
||
|
|
||
| ####Deleted z-index. | ||
|
|
||
| The css originally had one class headerimg set to z-index 1 and titleBar at z-index 2. We deleted the z-index setting for headerimg and changed the other to z-index 1. |
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 |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
|
|
||
| body { | ||
| font-family: 'Droid Sans', sans-serif; | ||
| background-color: #dcd6c0; | ||
| flex-direction: colume; | ||
| } | ||
| header{ | ||
| order:1; | ||
| } | ||
| .page-content { | ||
| width: 960px; | ||
| margin: 0 auto; | ||
| overflow:auto; | ||
| flex-direction:row; | ||
| order:2; | ||
| } | ||
| .title-bar { | ||
| background-color: #524D70; | ||
| opacity: .75; | ||
| height: 90px; | ||
| z-index: 1; | ||
| position: absolute; | ||
| top: 330px; | ||
| width: 100%; | ||
| color: #fffdee; | ||
| text-align: center; | ||
| } | ||
| header img { | ||
| position: relative; | ||
| display: block; | ||
| margin: 0 auto; | ||
| border-radius:0 0 5px 5px; | ||
| } | ||
| .profiles { | ||
| width: 120px; | ||
| clear: none; | ||
| font-family: 'Source Sans Pro', sans-serif; | ||
| order:1; | ||
| flex-direction:colume; | ||
| } | ||
| #nicole{ | ||
| order:1; | ||
| } | ||
| #betty{ | ||
| order:2; | ||
| } | ||
| #domino{ | ||
| order:3; | ||
| } | ||
| .profile { | ||
| width: 310px; | ||
| margin-top: 10px; | ||
| position: relative; | ||
| background-color: #afb673; | ||
| border-radius: 5px; | ||
| } | ||
| .profile:hover { | ||
| background-color: #9d8d5a; | ||
| } | ||
| .profile-image { | ||
| display:block; | ||
| margin:auto; | ||
| padding: 10px; | ||
| } | ||
| .profile-text { | ||
| font-size: 13pt; | ||
| text-align: left; | ||
| padding: 5px; | ||
| align-content:flex-end; | ||
| } | ||
| .profile-text h3 { | ||
| text-align: center; | ||
| } | ||
| .profile-text p { | ||
| padding: 5px 0 3px 0; | ||
|
|
||
|
Contributor
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. Remove extra line. |
||
| } | ||
| main { | ||
| background-color: #cabb94; | ||
| height: 906px; | ||
| width: 50%; | ||
| margin-top: 10px; | ||
| border-radius: 5px; | ||
| order:2; | ||
| justify-content:centered; | ||
| flex-wrap:no-wrap; | ||
| } | ||
| .more-info { | ||
| padding:0 55px; | ||
| font-size: 14pt; | ||
| justify-content:flex-start; | ||
|
|
||
|
Contributor
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. Remove extra line on 92 and 94 |
||
| } | ||
|
|
||
| footer { | ||
| height: 230px; | ||
| width: 960px; | ||
| background-color: #524D70; | ||
| border-radius: 5px; | ||
| color: #fffdee; | ||
| padding: 2px; | ||
| margin:15px auto; | ||
| order:3; | ||
| } | ||
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 |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| body { | ||
| font-family: sans-serif; | ||
| background-color: #dcd6c0; | ||
| } | ||
| .main { | ||
| width: 960px; | ||
| height: 970px; | ||
| margin-left: auto; | ||
| margin-right: auto; | ||
| } | ||
| .titleBar { | ||
| background-color: #524D70; | ||
| opacity: .75; | ||
| height: 90px; | ||
| z-index: 2; | ||
| position: absolute; | ||
| top: 330px; | ||
| width: 100%; | ||
| color: #fffdee; | ||
| text-align: center; | ||
| } | ||
| .headerimg { | ||
| z-index: 1; | ||
| position: relative; | ||
| display: block; | ||
| margin-top: -10px; | ||
| margin-left: auto; | ||
| margin-right: auto; | ||
| border-radius: 5px; | ||
| } | ||
| .profilecontainer { | ||
| height: 360px; | ||
| width: 120px; | ||
| clear: none; | ||
| float: left; | ||
| } | ||
| .profile { | ||
| height: 310px; | ||
| width: 310px; | ||
| margin-top: 10px; | ||
| position: relative; | ||
| background-color: #afb673; | ||
| border-radius: 5px; | ||
| } | ||
| .profileimg { | ||
| position: absolute; | ||
| vertical-align: top; | ||
| top: 10px; | ||
| right: 105px; | ||
| } | ||
| .profiletext { | ||
| font-size: 13pt; | ||
| position: absolute; | ||
| bottom: 0px; | ||
| text-align: left; | ||
| margin-left: 5px; | ||
| padding-bottom: 5px; | ||
| } | ||
| .profiletext h3 { | ||
| margin: 0px; | ||
| text-align: center; | ||
| position: relative; | ||
| top: 0px; | ||
| } | ||
| .profiletext p { | ||
| margin: 0; | ||
| padding-top: 5px; | ||
| padding-bottom: 3px; | ||
| } | ||
| .profile:hover { | ||
| background-color: #9d8d5a; | ||
| } | ||
| .infocontainer { | ||
| float: right; | ||
| background-color: #cabb94; | ||
| height: 950px; | ||
| width: 640px; | ||
| margin-top: 10px; | ||
| text-align: center; | ||
| border-radius: 5px; | ||
| } | ||
| .moreinfo { | ||
| height: 400px; | ||
| padding-left: 55px; | ||
| padding-right: 55px; | ||
| text-align: center; | ||
| font-size: 14pt; | ||
| } | ||
| footer { | ||
| height: 230px; | ||
| width: 960px; | ||
| background-color: #524D70; | ||
| border-radius: 5px; | ||
| color: #fffdee; | ||
| padding: 2px; | ||
| margin-left: auto; | ||
| margin-right: auto; | ||
| position: relative; | ||
| bottom: 0px; | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| body { | ||
| font-family: sans-serif; | ||
| background-color: #dcd6c0; | ||
| } | ||
| .page-content { | ||
| width: 960px; | ||
| margin: 0 auto; | ||
| overflow:auto; | ||
| } | ||
| .title-bar { | ||
| background-color: #524D70; | ||
| opacity: .75; | ||
| height: 90px; | ||
| z-index: 1; | ||
| position: absolute; | ||
| top: 330px; | ||
| width: 100%; | ||
| color: #fffdee; | ||
| text-align: center; | ||
| } | ||
| header img { | ||
| position: relative; | ||
| display: block; | ||
| margin: 0 auto; | ||
| border-radius:0 0 5px 5px; | ||
| } | ||
| .profiles { | ||
| height: 360px; | ||
| width: 120px; | ||
| clear: none; | ||
| float: left; | ||
| } | ||
| .profile { | ||
| width: 310px; | ||
| margin-top: 10px; | ||
| position: relative; | ||
| background-color: #afb673; | ||
| border-radius: 5px; | ||
| } | ||
| .profile:hover { | ||
| background-color: #9d8d5a; | ||
| } | ||
| .profile-image { | ||
| display:block; | ||
| margin:auto; | ||
| padding: 10px; | ||
| } | ||
| .profile-text { | ||
| font-size: 13pt; | ||
| text-align: left; | ||
| padding: 5px; | ||
| } | ||
| .profile-text h3 { | ||
| margin: 0px; | ||
| text-align: center; | ||
| } | ||
| .profile-text p { | ||
| margin: 0; | ||
| padding: 5px 0 3px 0; | ||
| } | ||
| main { | ||
| float: right; | ||
| background-color: #cabb94; | ||
| height: 906px; | ||
| width: 640px; | ||
| margin-top: 10px; | ||
| text-align: center; | ||
| border-radius: 5px; | ||
| } | ||
| .more-info { | ||
| padding:0 55px; | ||
| font-size: 14pt; | ||
| } | ||
| footer { | ||
| height: 230px; | ||
| width: 960px; | ||
| background-color: #524D70; | ||
| border-radius: 5px; | ||
| color: #fffdee; | ||
| padding: 2px; | ||
| margin:15px auto; | ||
| } |
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.
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.
Remove extra line.