Skip to content

Commit

Permalink
bootstrap checkin
Browse files Browse the repository at this point in the history
  • Loading branch information
autumn-ragland committed May 25, 2019
1 parent 112b72a commit 06d84b7
Show file tree
Hide file tree
Showing 7 changed files with 264 additions and 38 deletions.
203 changes: 203 additions & 0 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"bootstrap": "^4.3.1",
"react": "^16.8.6",
"react-bootstrap": "^1.0.0-beta.8",
"react-dom": "^16.8.6",
"react-router-dom": "^5.0.0",
"react-scripts": "2.1.8"
Expand Down
52 changes: 31 additions & 21 deletions client/src/App.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
/*basic styling mostly overridden by bootstrap*/
.App {
text-align: center;
align-content: center;
justify-content: center;
}

.linkStyle {
Expand All @@ -9,17 +12,31 @@
.formStyle {
margin: 1%;
}


/*********************************************************************************************************************/
/*profile page styling*/
.profileGrid {
display: grid;
grid-template-columns: 1fr 1fr;
grid-template-columns: repeat(5,1fr);
margin-left: 10%;
margin-right: 10%;
grid-template-rows: minmax(50px, 200px);
}
.profileForm {
grid-column: 1;
grid-row: 2;
}

.profileTweets {
padding: 0;
margin: 0;
grid-column: 1/6;
grid-row: 2/5;
width: 100%;
}
/*user image styling*/
.profileImages {
position: relative;
grid-column: 1;
grid-column: 3;
text-align: center;
height: 100%;
margin: 1%;
Expand All @@ -30,23 +47,16 @@
clip-path: circle(25% at center);
}

.background {
position: absolute;
left: 40%;
bottom: 10%;
z-index: -1;
/*height:100%;*/
clip-path: polygon(0 50%, 100% 50%, 100% 100%, 0% 100%);
}

.profileForm {
grid-column: 2;
}

.profileTweets {
grid-column: 1/3;
grid-row: 2;
}
/*.background {*/
/* position: absolute;*/
/* left: 40%;*/
/* bottom: 10%;*/
/* z-index: -1;*/
/* !*height:100%;*!*/
/* clip-path: polygon(0 50%, 100% 50%, 100% 100%, 0% 100%);*/
/*}*/
/*********************************************************************************************************************/
/*tweet styling*/
.tweetGrid {
display: grid;
font-size: 25px;
Expand Down
Loading

0 comments on commit 06d84b7

Please sign in to comment.