-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
236 additions
and
0 deletions.
There are no files selected for viewing
This file contains 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 | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -0,0 +1,158 @@ | |||
| .slide { | |||
| background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#CEEAF9)); | |||
| font-family:"Avenir LT Std", Times, sans-serif; | |||
| color: #014d65; | |||
| font-size: 1.3em; | |||
| } | |||
|
|
|||
| .stagingdata { | |||
| line-height: 19px; | |||
| } | |||
|
|
|||
| .stagingdata pre code { | |||
| font-size: 25px; | |||
| color: #000; | |||
| } | |||
|
|
|||
| .example pre { | |||
| position: absolute; | |||
| top: 100px; | |||
| font-size: 27px; | |||
| color: #000; | |||
| } | |||
|
|
|||
| .example pre strong { color: #ff7f00; } | |||
|
|
|||
| .green { color: #3a4; } | |||
| .red { color: #a34; } | |||
|
|
|||
| .bigcode pre code { font-size: 1.3em; } | |||
|
|
|||
| .blockimg img { | |||
| border: 20px solid #014d65; | |||
| } | |||
|
|
|||
| h1 { | |||
| font-weight: bold; | |||
| } | |||
|
|
|||
| .listcode ul li { | |||
| text-align: left; | |||
| margin-left: 50px; | |||
| font-family: monospace; | |||
| font-size: 40px; | |||
| } | |||
|
|
|||
| .list ul li { | |||
| text-align: left; | |||
| margin-left: 50px; | |||
| } | |||
|
|
|||
| .list ul li strong { | |||
| color: #be260d; | |||
| font-weight: bolder; | |||
| font-size: 1.3em; | |||
| } | |||
|
|
|||
| .title h1 { | |||
| text-align: center; | |||
| font-weight: bolder; | |||
| font-size: 160px; | |||
| color: #014d65; | |||
| margin-top: 40px; | |||
| margin-bottom: 30px; | |||
| letter-spacing:-6px; | |||
| line-height: 100px; | |||
| } | |||
|
|
|||
| .title h2 { | |||
| font-weight: bold; | |||
| font-size: 95px; | |||
| color: #0b98b4; | |||
| margin-bottom: 30px; | |||
| } | |||
| .title h3 { | |||
| font-weight: lighter; | |||
| font-size: 50px; | |||
| color: #0b98b4; | |||
| border-bottom: 40px; | |||
| } | |||
|
|
|||
| .bold h1 { | |||
| color: #BE260D !important; | |||
| } | |||
|
|
|||
| .subsec h1 { | |||
| font-weight: bolder; | |||
| font-size: 160px; | |||
| color: #014d65; | |||
| margin-bottom: 5px; | |||
| line-height: 130px; | |||
| } | |||
|
|
|||
| .subsec h2 { | |||
| font-weight: bold; | |||
| font-size: 95px; | |||
| margin-top: 10px; | |||
| color: #0b98b4; | |||
| } | |||
| .subsec h3 { | |||
| font-weight: lighter; | |||
| font-size: 50px; | |||
| color: #0b98b4; | |||
| } | |||
|
|
|||
| table.rdata { | |||
| margin-left: 50px; | |||
| width: 90%; | |||
| background: #fff; | |||
| padding: 8px; | |||
| border: 1px solid #333; | |||
| font-size: 1.5em; | |||
| } | |||
|
|
|||
| table.rdata tr.level { | |||
| color: #0b98b4; | |||
| background: #def; | |||
| } | |||
|
|
|||
| table.rdata tr.even { | |||
| background: #eee; | |||
| } | |||
|
|
|||
| table.rdata tr th.cmd { | |||
| font-family: monospace; | |||
| text-align: left; | |||
| } | |||
| table.rdata tr { | |||
| } | |||
|
|
|||
| table.rdata tr th { | |||
| padding: 8px; | |||
| } | |||
| table.rdata tr td { | |||
| padding: 15px 8px; | |||
| border-left: 1px solid #def; | |||
| } | |||
| table.rdata tr td.no { | |||
| background: #fdd; | |||
| } | |||
| table.rdata tr td.yes { | |||
| background: #dfd; | |||
| } | |||
| table.rdata tr td.yes-wd { | |||
| background: #aea; | |||
| } | |||
| table.rdata tr td.no-wd { | |||
| background: #eaa; | |||
| } | |||
|
|
|||
| .backup h1 { | |||
| margin-bottom: 80px; | |||
| } | |||
| .backup { | |||
| line-height: 19px; | |||
| } | |||
| .backup pre code { | |||
| font-size: 25px; | |||
| } | |||
This file contains 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 | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -0,0 +1,78 @@ | |||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" | |||
| "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |||
|
|
|||
| <html> | |||
| <head> | |||
| <meta http-equiv="Content-type" content="text/html; charset=utf-8"> | |||
| <title>Reset V. Checkout</title> | |||
| <link rel="stylesheet" href="custom.css" type="text/css" media="screen" charset="utf-8"/> | |||
| </head> | |||
| <body> | |||
|
|
|||
| <div class="slide title"> | |||
| <h1> Reset v. Checkout </h1> | |||
|
|
|||
| <table class="rdata"> | |||
| <tr> | |||
| <th></th> | |||
| <th>HEAD</th> | |||
| <th>Index</th> | |||
| <th>Work Dir</th> | |||
| <th>WD Safe</th> | |||
| </tr> | |||
| <tr class="level"> | |||
| <th>Commit Level</th> | |||
| <td colspan="4"> </th> | |||
| </tr> | |||
| <tr class="even"> | |||
| <th class="cmd">reset --soft [commit]</th> | |||
| <td class="yes">REF</td> | |||
| <td class="no">NO</td> | |||
| <td class="no">NO</td> | |||
| <td class="yes-wd">YES</td> | |||
| </tr> | |||
| <tr class="odd"> | |||
| <th class="cmd">reset [commit]</th> | |||
| <td class="yes">REF</td> | |||
| <td class="yes">YES</td> | |||
| <td class="no">NO</td> | |||
| <td class="yes-wd">YES</td> | |||
| </tr> | |||
| <tr class="even"> | |||
| <th class="cmd">reset --hard [commit]</th> | |||
| <td class="yes">REF</td> | |||
| <td class="yes">YES</td> | |||
| <td class="yes">YES</td> | |||
| <td class="no-wd">NO</td> | |||
| </tr> | |||
| <tr class="odd"> | |||
| <th class="cmd">checkout [commit]</th> | |||
| <td class="yes">HEAD</td> | |||
| <td class="yes">YES</td> | |||
| <td class="yes">YES</td> | |||
| <td class="yes-wd">YES</td> | |||
| </tr> | |||
| <tr class="level"> | |||
| <th>File Level</th> | |||
| <td colspan="4"> </th> | |||
| </tr> | |||
| <tr class="even"> | |||
| <th class="cmd">reset (commit) [file]</th> | |||
| <td class="no">NO</td> | |||
| <td class="yes">YES</td> | |||
| <td class="no">NO</td> | |||
| <td class="yes-wd">YES</td> | |||
| </tr> | |||
| <tr class="odd"> | |||
| <th class="cmd">checkout (commit) [file]</th> | |||
| <td class="no">NO</td> | |||
| <td class="yes">YES</td> | |||
| <td class="yes">YES</td> | |||
| <td class="no-wd">NO</td> | |||
| </tr> | |||
| </table> | |||
| </div> | |||
|
|
|||
| </body> | |||
| </html> | |||
|
|
|||