Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions Fleming_Mealey_Rohwer/README.md
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.
104 changes: 104 additions & 0 deletions Fleming_Mealey_Rohwer/advanced_stylesheet.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@

Copy link
Contributor

Choose a reason for hiding this comment

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

Remove extra line.

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;

Copy link
Contributor

Choose a reason for hiding this comment

The 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;

Copy link
Contributor

Choose a reason for hiding this comment

The 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;
}
100 changes: 100 additions & 0 deletions Fleming_Mealey_Rohwer/alpaca-original.css
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;
}
82 changes: 82 additions & 0 deletions Fleming_Mealey_Rohwer/alpaca.css
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;
}
Binary file added Fleming_Mealey_Rohwer/alpaca_images/IMG_1892.JPG
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.
Binary file added Fleming_Mealey_Rohwer/alpaca_images/Nicola.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Fleming_Mealey_Rohwer/alpaca_images/betty1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Fleming_Mealey_Rohwer/alpaca_images/domino.jpg
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