mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-08-17 16:21:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into zh-tw-2

Browse source
This commit is contained in:
mht 2014-04-22 08:48:24 +08:00
commit 0eaa98c895
3 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -103,6 +103,7 @@ And the following heroes for assisting in translating:
* Joël Thieffry * Joël Thieffry
* Jens Bremmekamp ("nem75") * Jens Bremmekamp ("nem75")
* "hilojack" * "hilojack"
* Ming-Hsuan-Tu ("twmht")
Also huge shoutout for everyone who has put up a pull request that was pulled: Also huge shoutout for everyone who has put up a pull request that was pulled:

4
src/style/main.css
View file

@ -69,6 +69,7 @@ body,
display: box; display: box;
display: -moz-box; display: -moz-box;
display: -webkit-box; display: -webkit-box;
display: -ms-box;
} }
body, body,
@ -1063,6 +1064,7 @@ div.gitDemonstrationView {
.leftRightView div.exit { .leftRightView div.exit {
-webkit-transform: matrix(-1, 0, 0, 1, 0, 0); -webkit-transform: matrix(-1, 0, 0, 1, 0, 0);
-moz-transform: matrix(-1, 0, 0, 1, 0, 0); -moz-transform: matrix(-1, 0, 0, 1, 0, 0);
-ms-transform: matrix(-1, 0, 0, 1, 0, 0);
} }
.leftRightView div.exit, .leftRightView div.exit,
@ -1098,10 +1100,12 @@ div.gitDemonstrationView {
-webkit-border-radius: 8px; -webkit-border-radius: 8px;
-moz-border-radius: 8px; -moz-border-radius: 8px;
-ms-border-radius: 8px;
border-radius: 8px; border-radius: 8px;
-webkit-box-shadow: rgba(0,0,0,1) 0 1px 0; -webkit-box-shadow: rgba(0,0,0,1) 0 1px 0;
-moz-box-shadow: rgba(0,0,0,1) 0 1px 0; -moz-box-shadow: rgba(0,0,0,1) 0 1px 0;
-ms-box-shadow: rgba(0,0,0,1) 0 1px 0;
box-shadow: rgba(0,0,0,1) 0 1px 0; box-shadow: rgba(0,0,0,1) 0 1px 0;
text-shadow: rgba(0,0,0,.4) 0 1px 0; text-shadow: rgba(0,0,0,.4) 0 1px 0;
color: white; color: white;

24
src/template.index.html
View file

@ -471,7 +471,29 @@
<!-- The advantage of github pages: super-easy, simple, slick static hostic. <!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include The downside? No raw logs to parse for analytics, so I have to include
Google analytics :-/ --> Google analytics :-/ Also FB custom audiences-->
<script>
(function() {
var _fbq = window._fbq || (window._fbq = []);
if (!_fbq.loaded) {
var fbds = document.createElement('script');
fbds.async = true;
fbds.src = '//connect.facebook.net/en_US/fbds.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(fbds, s);
_fbq.loaded = true;
}
_fbq.push(['addPixelId', '1376649522580546']);
})();
window._fbq = window._fbq || [];
window._fbq.push(['track', 'PixelInitialized', {}]);
</script>
<noscript>
<img height="1" width="1" border="0" alt="" style="display:none"
src="https://www.facebook.com/tr?id=1376649522580546&amp;ev=NoScript"
/>
</noscript>
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-37500646-1']); _gaq.push(['_setAccount', 'UA-37500646-1']);