-
Notifications
You must be signed in to change notification settings - Fork 5
Introhsn #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
base: master
Are you sure you want to change the base?
Introhsn #11
Changes from all commits
f3b8e58
53110ce
de0d628
4f5c002
02f9da3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
|
|
||
| .overall { | ||
| width:854px; | ||
| color:#9b9b9b; | ||
| margin:auto; | ||
| } | ||
|
|
||
| .photo { | ||
|
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. 还是和对大蓉儿一样的建议,尽量用独特的类名 “.hsn-photo” 或一个父类".hsn .photo" 去限制你的css生效的范围,我去看了一下大蓉儿的css,里面也有一个class叫photo,当大家的html整合在同一个文件之后,你们各自的.photo css会互相影响,导致混乱。
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. Good review ! So nice Tang |
||
| width: 500px; | ||
| height: 356.1px; | ||
| margin: auto; | ||
| margin-bottom: 124.9px; | ||
| object-fit: contain; | ||
|
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. 学姐我们这里还是严格要求代码规范。这行 |
||
| } | ||
| .first { | ||
| width:854px; | ||
|
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. 还有这里 |
||
| border-width:0px 0px 0px 5px; | ||
| border-style:solid; | ||
| border-color:black; | ||
| } | ||
| .second{ | ||
|
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. 这里也是, |
||
| clear:both; | ||
| } | ||
| .content_sty{ | ||
| font-family: PingFangSC; | ||
|
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. 还有这里我们书写 css 属性时,每条属性应该一行,同时应该有两个空格的缩进。 eg: .content_sty {
font-family: PingFangSC;
font-size: 18px;
} |
||
| font-size: 18px; | ||
| font-weight: 600; | ||
| font-style: normal; | ||
| font-stretch: normal; | ||
| line-height: normal; | ||
| letter-spacing: normal; | ||
| text-align: left; | ||
| color: #9b9b9b; | ||
| } | ||
| .experience{ | ||
| width: 50px; | ||
| height: 50px; | ||
| vertical-align: middle; | ||
| } | ||
|
|
||
| .photo_one { | ||
| width: 554px; | ||
| height: 237px; | ||
| float: left; | ||
| border-radius: 15px; | ||
| } | ||
|
|
||
| .photo_two { | ||
| width: 262px; | ||
| height: 237px; | ||
| float:right; | ||
| border-radius: 15px; | ||
| } | ||
| .picture{ | ||
| display: table-cell; | ||
| width: 216px; | ||
| height: 139px; | ||
| padding: 0px 33px 89px 133px; | ||
| } | ||
| .content{ | ||
| display: table-cell; | ||
| width:698px; | ||
| height:139px; | ||
| } | ||
| #tableContainer{ | ||
| display: table; | ||
| margin:60px; | ||
| } | ||
| .tablerow{ | ||
| display: table-row; | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8" /> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
| <title>Page Title</title> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
| <link rel="stylesheet" type="text/css" media="screen" href="main.css" /> | ||
| <link rel="stylesheet" type="text/css" media="screen" href="demo.css" /> | ||
| <script src="main.js"></script> | ||
| </head> | ||
|
|
||
| <body> | ||
| <div class="overall"> | ||
|
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. 其实我们并不需要 |
||
| <div class="photo"> | ||
| <img src=" img/photo_1.png" alt="" > | ||
| </div> | ||
| <div class="first"> | ||
| <h2>与大虎共影</h2> | ||
| </div> | ||
| <div > | ||
| <img class="photo_one" src=" img/photo_one.jpg"> | ||
| <img class="photo_two" src=" img/photo_two.jpg" alt=""> | ||
| </div> | ||
| <div class="second"> </div> | ||
| <div style="margin-top: 107px;"> | ||
| <h2 class="first">在大虎的经历</h2> | ||
| </div> | ||
| <div id="tableContainer"> | ||
| <div class="tablerow"> | ||
| <div class="picture"> | ||
| <img class="experience" src="img/icon_start.png"> | ||
| </div> | ||
| <div class="content" > | ||
| <p class="content_sty">不管发生了什么,我都不慌不忙。<br>我不爱运动,也不喜欢走路。<br> | ||
| 但我爱学习。</p> | ||
| </div> | ||
| </div> | ||
| <div class="tablerow"> | ||
| <div class="picture"> | ||
| <img class="experience" src="img/icon_next.png"> | ||
| </div> | ||
| <div class="content" > | ||
| <p class="content_sty">我奋力拼搏,勇往直前。<br>我征战沙场,浴血奋战。</p> | ||
| </div> | ||
| </div> | ||
| <div class="tablerow"> | ||
| <div class="picture"> | ||
| <img class="experience" src="img/icon_grow_up.png"> | ||
| </div> | ||
| <div class="content" > | ||
| <p class="content_sty">时间,它走得缓而急。一切来得太突然,我一直都在路上。</p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
| </body> | ||
| </html> | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| ## 开始协作 | ||
|
|
||
|
|
||
| ```javascript | ||
| console.log('Hello mRc'); | ||
| ``` | ||
|
|
||
| ### Hello, World | ||
|
|
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.
这边其实直接选择
body设置样式规则就可以了