diff --git a/bower_components/reveal.js/css/reveal.css b/bower_components/reveal.js/css/reveal.css index 35bba16238f7a40978f2b823ad2a1c8e9ed7aab4..40f869df2317f14b0f9f2941110571f789fa8efa 100644 --- a/bower_components/reveal.js/css/reveal.css +++ b/bower_components/reveal.js/css/reveal.css @@ -307,7 +307,7 @@ body { word-wrap: break-word; - box-shadow: 0px 0px 6px rgba(0,0,0,0.3); + /*box-shadow: 0px 0px 6px rgba(0,0,0,0.3);*/ } .reveal code { font-family: monospace; @@ -322,6 +322,7 @@ body { height: 100%; max-height: 100%; + -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -506,10 +507,10 @@ body { -o-transition: -o-perspective .4s ease; transition: perspective .4s ease; - -webkit-perspective: 1000px; - -moz-perspective: 1000px; - -ms-perspective: 1000px; - perspective: 1000px; + -webkit-perspective: 2400px; + -moz-perspective: 2400px; + -ms-perspective: 2400px; + perspective: 2400px; -webkit-perspective-origin: 0px -400px; -moz-perspective-origin: 0px -400px; @@ -518,7 +519,7 @@ body { } .reveal .slides>section { - -ms-perspective: 1000px; + -ms-perspective: 2400px; } .reveal .slides>section, diff --git a/bower_components/reveal.js/css/theme/beige.css b/bower_components/reveal.js/css/theme/beige.css index 08d8dfbe6dc6254031f535685e64bdbf1b508c03..e6cd1cc646526f020c2d8062eb717d9764e07555 100644 --- a/bower_components/reveal.js/css/theme/beige.css +++ b/bower_components/reveal.js/css/theme/beige.css @@ -44,7 +44,7 @@ body { .reveal h4, .reveal h5, .reveal h6 { - margin: -120px 0 20px 20px; + margin: -80px 0 20px 20px; color: #333; font-family: "Verdana", Impact, sans-serif; line-height: 1.3em; diff --git a/bower_components/reveal.js/css/theme/beige.css.map b/bower_components/reveal.js/css/theme/beige.css.map index 5717c27e7b546ed665a0300efe38e55dd4a30200..546512a8640ee46799eb91242808838251dfb428 100644 --- a/bower_components/reveal.js/css/theme/beige.css.map +++ b/bower_components/reveal.js/css/theme/beige.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAAA;;;;GAIG;AAuBK,qFAA6E;AAZrF,UAUC;EATA,WAAW,EAAE,eAAe;EAC5B,GAAG,EAAE,+CAA+C;EACpD,GAAG,EAAE,0SAG8E;EAEnF,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM;ACtBnB;;+CAE+C;AAE/C,IAAK;ECeJ,UAAU,EAAE,OAAM;EAClB,UAAU,EAAE,kEAAoE;EAChF,UAAU,EAAE,mHAAmH;EAC/H,UAAU,EAAE,qEAAuE;EACnF,UAAU,EAAE,gEAAkE;EAC9E,UAAU,EAAE,iEAAmE;EAC/E,UAAU,EAAE,6DAA+D;EDnB3E,gBAAgB,ED0BC,OAAO;;ACvBzB,OAAQ;EACP,WAAW,EELD,kBAAkB;EFM5B,SAAS,EELK,IAAI;EFMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EDeM,IAAI;;ACZhB,WAAY;EACX,KAAK,EEOW,IAAI;EFNpB,UAAU,EDgBgB,sBAAsB;ECfhD,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,EEvBS,kBAAkB;EFwBjC,KAAK,EDJS,IAAI;ECMlB,WAAW,EEzBE,6BAA6B;EF0B1C,WAAW,EExBQ,KAAK;EFyBxB,cAAc,EExBQ,GAAK;EF0B3B,cAAc,EEzBQ,SAAS;EF0B/B,WAAW,EDVQ,IAAI;;ACaxB,UAAW;EACV,WAAW,EDTS,iQAAyO;;ACa9P;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,EDrBM,OAAO;ECsBlB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,ED9BU,OAA0B;ECgCzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,cAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,ED/DF,OAAO;ECiEjB,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,ED3EP,OAAO;;AC8EnB;4CAC6C;EAC5C,iBAAiB,EDhFN,OAAO;;ACmFnB;yCAC0C;EACzC,mBAAmB,EDrFR,OAAO;;ACwFnB;2CAC4C;EAC3C,gBAAgB,ED1FL,OAAO;;AC6FnB,iDAAkD;EACjD,kBAAkB,ED7FF,OAA0B;;ACgG3C,kDAAmD;EAClD,iBAAiB,EDjGD,OAA0B;;ACoG3C,+CAAgD;EAC/C,mBAAmB,EDrGH,OAA0B;;ACwG3C,iDAAkD;EACjD,gBAAgB,EDzGA,OAA0B;;AC6G3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,EDtHA,OAAO;ECwHjB,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", +"mappings": "AAAA;;;;GAIG;AAuBK,qFAA6E;AAZrF,UAUC;EATA,WAAW,EAAE,eAAe;EAC5B,GAAG,EAAE,+CAA+C;EACpD,GAAG,EAAE,0SAG8E;EAEnF,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM;ACtBnB;;+CAE+C;AAE/C,IAAK;ECeJ,UAAU,EAAE,OAAM;EAClB,UAAU,EAAE,kEAAoE;EAChF,UAAU,EAAE,mHAAmH;EAC/H,UAAU,EAAE,qEAAuE;EACnF,UAAU,EAAE,gEAAkE;EAC9E,UAAU,EAAE,iEAAmE;EAC/E,UAAU,EAAE,6DAA+D;EDnB3E,gBAAgB,ED0BC,OAAO;;ACvBzB,OAAQ;EACP,WAAW,EELD,kBAAkB;EFM5B,SAAS,EELK,IAAI;EFMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EDeM,IAAI;;ACZhB,WAAY;EACX,KAAK,EEOW,IAAI;EFNpB,UAAU,EDgBgB,sBAAsB;ECfhD,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,EEvBS,iBAAiB;EFwBhC,KAAK,EDJS,IAAI;ECMlB,WAAW,EEzBE,6BAA6B;EF0B1C,WAAW,EExBQ,KAAK;EFyBxB,cAAc,EExBQ,GAAK;EF0B3B,cAAc,EEzBQ,SAAS;EF0B/B,WAAW,EDVQ,IAAI;;ACaxB,UAAW;EACV,WAAW,EDTS,iQAAyO;;ACa9P;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,EDrBM,OAAO;ECsBlB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,ED9BU,OAA0B;ECgCzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,cAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,ED/DF,OAAO;ECiEjB,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,ED3EP,OAAO;;AC8EnB;4CAC6C;EAC5C,iBAAiB,EDhFN,OAAO;;ACmFnB;yCAC0C;EACzC,mBAAmB,EDrFR,OAAO;;ACwFnB;2CAC4C;EAC3C,gBAAgB,ED1FL,OAAO;;AC6FnB,iDAAkD;EACjD,kBAAkB,ED7FF,OAA0B;;ACgG3C,kDAAmD;EAClD,iBAAiB,EDjGD,OAA0B;;ACoG3C,+CAAgD;EAC/C,mBAAmB,EDrGH,OAA0B;;ACwG3C,iDAAkD;EACjD,gBAAgB,EDzGA,OAA0B;;AC6G3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,EDtHA,OAAO;ECwHjB,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", "sources": ["source/beige.scss","template/theme.scss","template/mixins.scss","template/settings.scss"], "names": [], "file": "beige.css" diff --git a/bower_components/reveal.js/css/theme/default.css b/bower_components/reveal.js/css/theme/default.css index 72189fc0e36473fcaf74dbc157aad000b60d71de..af58b0759971767add1c4398680ab019d33ecf8f 100644 --- a/bower_components/reveal.js/css/theme/default.css +++ b/bower_components/reveal.js/css/theme/default.css @@ -44,7 +44,7 @@ body { .reveal h4, .reveal h5, .reveal h6 { - margin: -120px 0 20px 20px; + margin: -80px 0 20px 20px; color: #eee; font-family: "Verdana", Impact, sans-serif; line-height: 1.3em; diff --git a/bower_components/reveal.js/css/theme/default.css.map b/bower_components/reveal.js/css/theme/default.css.map index f1fc7c1278fb24ffad743bae457c089844928ee0..280d6a7f60c62ccb4a50aabda9ec863e892cfccc 100644 --- a/bower_components/reveal.js/css/theme/default.css.map +++ b/bower_components/reveal.js/css/theme/default.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAAA;;;;GAIG;AAuBK,qFAA6E;AAZrF,UAUC;EATA,WAAW,EAAE,eAAe;EAC5B,GAAG,EAAE,+CAA+C;EACpD,GAAG,EAAE,0SAG8E;EAEnF,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM;ACtBnB;;+CAE+C;AAE/C,IAAK;ECeJ,UAAU,EAAE,OAAM;EAClB,UAAU,EAAE,oEAAoE;EAChF,UAAU,EAAE,qHAAmH;EAC/H,UAAU,EAAE,uEAAuE;EACnF,UAAU,EAAE,kEAAkE;EAC9E,UAAU,EAAE,mEAAmE;EAC/E,UAAU,EAAE,+DAA+D;EDnB3E,gBAAgB,EEJC,OAAO;;AFOzB,OAAQ;EACP,WAAW,EELD,kBAAkB;EFM5B,SAAS,EELK,IAAI;EFMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EEPM,IAAI;;AFUhB,WAAY;EACX,KAAK,EEOW,IAAI;EFNpB,UAAU,EEKgB,OAAO;EFJjC,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,EEvBS,kBAAkB;EFwBjC,KAAK,EEtBS,IAAI;EFwBlB,WAAW,EEzBE,6BAA6B;EF0B1C,WAAW,EExBQ,KAAK;EFyBxB,cAAc,EExBQ,GAAK;EF0B3B,cAAc,EEzBQ,SAAS;EF0B/B,WAAW,EExBS,8BAAkB;;AF2BvC,UAAW;EACV,WAAW,EDjBS,iQAAyO;;ACqB9P;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,EElCM,OAAO;EFmClB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,EE3CU,OAA0B;EF6CzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,cAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,EE5EF,OAAO;EF8EjB,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EExFP,OAAO;;AF2FnB;4CAC6C;EAC5C,iBAAiB,EE7FN,OAAO;;AFgGnB;yCAC0C;EACzC,mBAAmB,EElGR,OAAO;;AFqGnB;2CAC4C;EAC3C,gBAAgB,EEvGL,OAAO;;AF0GnB,iDAAkD;EACjD,kBAAkB,EE1GF,OAA0B;;AF6G3C,kDAAmD;EAClD,iBAAiB,EE9GD,OAA0B;;AFiH3C,+CAAgD;EAC/C,mBAAmB,EElHH,OAA0B;;AFqH3C,iDAAkD;EACjD,gBAAgB,EEtHA,OAA0B;;AF0H3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,EEnIA,OAAO;EFqIjB,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", +"mappings": "AAAA;;;;GAIG;AAuBK,qFAA6E;AAZrF,UAUC;EATA,WAAW,EAAE,eAAe;EAC5B,GAAG,EAAE,+CAA+C;EACpD,GAAG,EAAE,0SAG8E;EAEnF,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM;ACtBnB;;+CAE+C;AAE/C,IAAK;ECeJ,UAAU,EAAE,OAAM;EAClB,UAAU,EAAE,oEAAoE;EAChF,UAAU,EAAE,qHAAmH;EAC/H,UAAU,EAAE,uEAAuE;EACnF,UAAU,EAAE,kEAAkE;EAC9E,UAAU,EAAE,mEAAmE;EAC/E,UAAU,EAAE,+DAA+D;EDnB3E,gBAAgB,EEJC,OAAO;;AFOzB,OAAQ;EACP,WAAW,EELD,kBAAkB;EFM5B,SAAS,EELK,IAAI;EFMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EEPM,IAAI;;AFUhB,WAAY;EACX,KAAK,EEOW,IAAI;EFNpB,UAAU,EEKgB,OAAO;EFJjC,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,EEvBS,iBAAiB;EFwBhC,KAAK,EEtBS,IAAI;EFwBlB,WAAW,EEzBE,6BAA6B;EF0B1C,WAAW,EExBQ,KAAK;EFyBxB,cAAc,EExBQ,GAAK;EF0B3B,cAAc,EEzBQ,SAAS;EF0B/B,WAAW,EExBS,8BAAkB;;AF2BvC,UAAW;EACV,WAAW,EDjBS,iQAAyO;;ACqB9P;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,EElCM,OAAO;EFmClB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,EE3CU,OAA0B;EF6CzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,cAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,EE5EF,OAAO;EF8EjB,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EExFP,OAAO;;AF2FnB;4CAC6C;EAC5C,iBAAiB,EE7FN,OAAO;;AFgGnB;yCAC0C;EACzC,mBAAmB,EElGR,OAAO;;AFqGnB;2CAC4C;EAC3C,gBAAgB,EEvGL,OAAO;;AF0GnB,iDAAkD;EACjD,kBAAkB,EE1GF,OAA0B;;AF6G3C,kDAAmD;EAClD,iBAAiB,EE9GD,OAA0B;;AFiH3C,+CAAgD;EAC/C,mBAAmB,EElHH,OAA0B;;AFqH3C,iDAAkD;EACjD,gBAAgB,EEtHA,OAA0B;;AF0H3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,EEnIA,OAAO;EFqIjB,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", "sources": ["source/default.scss","template/theme.scss","template/mixins.scss","template/settings.scss"], "names": [], "file": "default.css" diff --git a/bower_components/reveal.js/css/theme/lcsb.css b/bower_components/reveal.js/css/theme/lcsb.css index 2e19728df2c7e45e3d22348a9f31e5562afed61b..a8a07eb1360c3f4b46400a05bb260ed16630eef8 100644 --- a/bower_components/reveal.js/css/theme/lcsb.css +++ b/bower_components/reveal.js/css/theme/lcsb.css @@ -36,7 +36,7 @@ body { .reveal h4, .reveal h5, .reveal h6 { - margin: -120px 0 20px 20px; + margin: -80px 0 20px 20px; color: #00a3df; font-family: "Verdana", sans-serif; line-height: 1.3em; diff --git a/bower_components/reveal.js/css/theme/lcsb.css.map b/bower_components/reveal.js/css/theme/lcsb.css.map index 8877c97588511342743515699810367284cb4a34..69d367093f0e12021013101e2c9d61db158093eb 100644 --- a/bower_components/reveal.js/css/theme/lcsb.css.map +++ b/bower_components/reveal.js/css/theme/lcsb.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAAA;;;;;;GAMG;AAqBH,qBAAsB;EACrB,WAAW,EAAE,KAAK;;AC1BnB;;+CAE+C;AAE/C,IAAK;EC0BJ,UAAU,EFXO,IAAI;ECbrB,gBAAgB,EDaC,IAAI;;ACVtB,OAAQ;EACP,WAAW,EDGD,qBAAqB;ECF/B,SAAS,ECLK,IAAI;EDMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EDAM,IAAI;;ACGhB,WAAY;EACX,KAAK,ECOW,IAAI;EDNpB,UAAU,EDGgB,mBAAmB;ECF7C,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,ECvBS,kBAAkB;EDwBjC,KAAK,EDlBS,OAAO;ECoBrB,WAAW,EDrBE,qBAAqB;ECsBlC,WAAW,ECxBQ,KAAK;EDyBxB,cAAc,ECxBQ,GAAK;ED0B3B,cAAc,EDtBQ,IAAI;ECuB1B,WAAW,EDxBQ,IAAI;;AC2BxB,UAAW;EACV,WAAW,EC5BS,8BAAkB;;ADgCvC;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,EDlCM,OAAO;ECmClB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,ED3CU,OAA0B;EC6CzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,KAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,cAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,ED5EF,OAAO;EC8EjB,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EDxFP,OAAO;;AC2FnB;4CAC6C;EAC5C,iBAAiB,ED7FN,OAAO;;ACgGnB;yCAC0C;EACzC,mBAAmB,EDlGR,OAAO;;ACqGnB;2CAC4C;EAC3C,gBAAgB,EDvGL,OAAO;;AC0GnB,iDAAkD;EACjD,kBAAkB,ED1GF,OAA0B;;AC6G3C,kDAAmD;EAClD,iBAAiB,ED9GD,OAA0B;;ACiH3C,+CAAgD;EAC/C,mBAAmB,EDlHH,OAA0B;;ACqH3C,iDAAkD;EACjD,gBAAgB,EDtHA,OAA0B;;AC0H3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,EDnIA,OAAO;ECqIjB,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", +"mappings": "AAAA;;;;;;GAMG;AAqBH,qBAAsB;EACrB,WAAW,EAAE,KAAK;;AC1BnB;;+CAE+C;AAE/C,IAAK;EC0BJ,UAAU,EFXO,IAAI;ECbrB,gBAAgB,EDaC,IAAI;;ACVtB,OAAQ;EACP,WAAW,EDGD,qBAAqB;ECF/B,SAAS,ECLK,IAAI;EDMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EDAM,IAAI;;ACGhB,WAAY;EACX,KAAK,ECOW,IAAI;EDNpB,UAAU,EDGgB,mBAAmB;ECF7C,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,ECvBS,iBAAiB;EDwBhC,KAAK,EDlBS,OAAO;ECoBrB,WAAW,EDrBE,qBAAqB;ECsBlC,WAAW,ECxBQ,KAAK;EDyBxB,cAAc,ECxBQ,GAAK;ED0B3B,cAAc,EDtBQ,IAAI;ECuB1B,WAAW,EDxBQ,IAAI;;AC2BxB,UAAW;EACV,WAAW,EC5BS,8BAAkB;;ADgCvC;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,EDlCM,OAAO;ECmClB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,ED3CU,OAA0B;EC6CzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,KAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,cAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,ED5EF,OAAO;EC8EjB,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EDxFP,OAAO;;AC2FnB;4CAC6C;EAC5C,iBAAiB,ED7FN,OAAO;;ACgGnB;yCAC0C;EACzC,mBAAmB,EDlGR,OAAO;;ACqGnB;2CAC4C;EAC3C,gBAAgB,EDvGL,OAAO;;AC0GnB,iDAAkD;EACjD,kBAAkB,ED1GF,OAA0B;;AC6G3C,kDAAmD;EAClD,iBAAiB,ED9GD,OAA0B;;ACiH3C,+CAAgD;EAC/C,mBAAmB,EDlHH,OAA0B;;ACqH3C,iDAAkD;EACjD,gBAAgB,EDtHA,OAA0B;;AC0H3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,EDnIA,OAAO;ECqIjB,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", "sources": ["source/lcsb.scss","template/theme.scss","template/settings.scss"], "names": [], "file": "lcsb.css" diff --git a/bower_components/reveal.js/css/theme/moon.css b/bower_components/reveal.js/css/theme/moon.css index 3c71a14c51f825319c5b1e2c53acbf618f90e1bc..0ed606e7060c65e996f7f5a046c626fb9ca76a81 100644 --- a/bower_components/reveal.js/css/theme/moon.css +++ b/bower_components/reveal.js/css/theme/moon.css @@ -44,7 +44,7 @@ body { .reveal h4, .reveal h5, .reveal h6 { - margin: -120px 0 20px 20px; + margin: -80px 0 20px 20px; color: #eee8d5; font-family: "Verdana", Impact, sans-serif; line-height: 1.3em; diff --git a/bower_components/reveal.js/css/theme/moon.css.map b/bower_components/reveal.js/css/theme/moon.css.map index c37454b34acc7c680d35bfc43acd8638255a2dcb..87c442ae6646440c6a1bb485dfcfc680f2cb58d0 100644 --- a/bower_components/reveal.js/css/theme/moon.css.map +++ b/bower_components/reveal.js/css/theme/moon.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAAA;;;GAGG;AAuBK,qFAA6E;AAZrF,UAUC;EATA,WAAW,EAAE,eAAe;EAC5B,GAAG,EAAE,+CAA+C;EACpD,GAAG,EAAE,0SAG8E;EAEnF,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM;AAKnB;;GAEG;AACH,MAAO;EACN,aAAa,EAAE,IAAI;EACnB,gBAAgB,EAAE,IAAI;;AC/BvB;;+CAE+C;AAE/C,IAAK;EC0BJ,UAAU,EF0BO,OAAO;EClDxB,gBAAgB,EDkDC,OAAO;;AC/CzB,OAAQ;EACP,WAAW,ECLD,kBAAkB;EDM5B,SAAS,ECLK,IAAI;EDMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EDuCM,OAAM;;ACpClB,WAAY;EACX,KAAK,ECOW,IAAI;EDNpB,UAAU,EDwCgB,OAAQ;ECvClC,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,ECvBS,kBAAkB;EDwBjC,KAAK,EDoBS,OAAM;EClBpB,WAAW,ECzBE,6BAA6B;ED0B1C,WAAW,ECxBQ,KAAK;EDyBxB,cAAc,ECxBQ,GAAK;ED0B3B,cAAc,ECzBQ,SAAS;ED0B/B,WAAW,EDcQ,IAAI;;ACXxB,UAAW;EACV,WAAW,EC5BS,8BAAkB;;ADgCvC;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,EDGM,OAAK;ECFhB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,EDNU,OAA0B;ECQzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,iBAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,EDvCF,OAAK;ECyCf,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EDnDP,OAAK;;ACsDjB;4CAC6C;EAC5C,iBAAiB,EDxDN,OAAK;;AC2DjB;yCAC0C;EACzC,mBAAmB,ED7DR,OAAK;;ACgEjB;2CAC4C;EAC3C,gBAAgB,EDlEL,OAAK;;ACqEjB,iDAAkD;EACjD,kBAAkB,EDrEF,OAA0B;;ACwE3C,kDAAmD;EAClD,iBAAiB,EDzED,OAA0B;;AC4E3C,+CAAgD;EAC/C,mBAAmB,ED7EH,OAA0B;;ACgF3C,iDAAkD;EACjD,gBAAgB,EDjFA,OAA0B;;ACqF3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,ED9FA,OAAK;ECgGf,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", +"mappings": "AAAA;;;GAGG;AAuBK,qFAA6E;AAZrF,UAUC;EATA,WAAW,EAAE,eAAe;EAC5B,GAAG,EAAE,+CAA+C;EACpD,GAAG,EAAE,0SAG8E;EAEnF,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM;AAKnB;;GAEG;AACH,MAAO;EACN,aAAa,EAAE,IAAI;EACnB,gBAAgB,EAAE,IAAI;;AC/BvB;;+CAE+C;AAE/C,IAAK;EC0BJ,UAAU,EF0BO,OAAO;EClDxB,gBAAgB,EDkDC,OAAO;;AC/CzB,OAAQ;EACP,WAAW,ECLD,kBAAkB;EDM5B,SAAS,ECLK,IAAI;EDMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EDuCM,OAAM;;ACpClB,WAAY;EACX,KAAK,ECOW,IAAI;EDNpB,UAAU,EDwCgB,OAAQ;ECvClC,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,ECvBS,iBAAiB;EDwBhC,KAAK,EDoBS,OAAM;EClBpB,WAAW,ECzBE,6BAA6B;ED0B1C,WAAW,ECxBQ,KAAK;EDyBxB,cAAc,ECxBQ,GAAK;ED0B3B,cAAc,ECzBQ,SAAS;ED0B/B,WAAW,EDcQ,IAAI;;ACXxB,UAAW;EACV,WAAW,EC5BS,8BAAkB;;ADgCvC;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,EDGM,OAAK;ECFhB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,EDNU,OAA0B;ECQzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,iBAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,EDvCF,OAAK;ECyCf,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EDnDP,OAAK;;ACsDjB;4CAC6C;EAC5C,iBAAiB,EDxDN,OAAK;;AC2DjB;yCAC0C;EACzC,mBAAmB,ED7DR,OAAK;;ACgEjB;2CAC4C;EAC3C,gBAAgB,EDlEL,OAAK;;ACqEjB,iDAAkD;EACjD,kBAAkB,EDrEF,OAA0B;;ACwE3C,kDAAmD;EAClD,iBAAiB,EDzED,OAA0B;;AC4E3C,+CAAgD;EAC/C,mBAAmB,ED7EH,OAA0B;;ACgF3C,iDAAkD;EACjD,gBAAgB,EDjFA,OAA0B;;ACqF3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,ED9FA,OAAK;ECgGf,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", "sources": ["source/moon.scss","template/theme.scss","template/settings.scss"], "names": [], "file": "moon.css" diff --git a/bower_components/reveal.js/css/theme/night.css b/bower_components/reveal.js/css/theme/night.css index 1550f704245baefcc3c3780306adfc6923f33e5e..92196e811635e48b7f8e76a7990ebfebf62ded1e 100644 --- a/bower_components/reveal.js/css/theme/night.css +++ b/bower_components/reveal.js/css/theme/night.css @@ -33,7 +33,7 @@ body { .reveal h4, .reveal h5, .reveal h6 { - margin: -120px 0 20px 20px; + margin: -80px 0 20px 20px; color: #eee; font-family: "Montserrat", Impact, sans-serif; line-height: 1.3em; diff --git a/bower_components/reveal.js/css/theme/night.css.map b/bower_components/reveal.js/css/theme/night.css.map index 50fd826243f23463a99fb9117a43875c0f5853f0..6262a1be5d010ce8a8e8aadacc3695977f726c3d 100644 --- a/bower_components/reveal.js/css/theme/night.css.map +++ b/bower_components/reveal.js/css/theme/night.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAAA;;;;GAIG;AAUK,mEAA2D;AAC3D,0FAAkF;ACb1F;;+CAE+C;AAE/C,IAAK;EC0BJ,UAAU,EFbO,IAAI;ECXrB,gBAAgB,EDWC,IAAI;;ACRtB,OAAQ;EACP,WAAW,EDSD,uBAAuB;ECRjC,SAAS,EDgBK,IAAI;ECflB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,ECPM,IAAI;;ADUhB,WAAY;EACX,KAAK,ECOW,IAAI;EDNpB,UAAU,EDOgB,OAAO;ECNjC,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,ECvBS,kBAAkB;EDwBjC,KAAK,ECtBS,IAAI;EDwBlB,WAAW,EDdE,gCAAgC;ECe7C,WAAW,ECxBQ,KAAK;EDyBxB,cAAc,EDdQ,OAAO;ECgB7B,cAAc,EDfQ,IAAI;ECgB1B,WAAW,EDlBQ,IAAI;;ACqBxB,UAAW;EACV,WAAW,EC5BS,8BAAkB;;ADgCvC;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,EDlCM,OAAO;ECmClB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,ED3CU,OAA0B;EC6CzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,cAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,ED5EF,OAAO;EC8EjB,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EDxFP,OAAO;;AC2FnB;4CAC6C;EAC5C,iBAAiB,ED7FN,OAAO;;ACgGnB;yCAC0C;EACzC,mBAAmB,EDlGR,OAAO;;ACqGnB;2CAC4C;EAC3C,gBAAgB,EDvGL,OAAO;;AC0GnB,iDAAkD;EACjD,kBAAkB,ED1GF,OAA0B;;AC6G3C,kDAAmD;EAClD,iBAAiB,ED9GD,OAA0B;;ACiH3C,+CAAgD;EAC/C,mBAAmB,EDlHH,OAA0B;;ACqH3C,iDAAkD;EACjD,gBAAgB,EDtHA,OAA0B;;AC0H3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,EDnIA,OAAO;ECqIjB,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", +"mappings": "AAAA;;;;GAIG;AAUK,mEAA2D;AAC3D,0FAAkF;ACb1F;;+CAE+C;AAE/C,IAAK;EC0BJ,UAAU,EFbO,IAAI;ECXrB,gBAAgB,EDWC,IAAI;;ACRtB,OAAQ;EACP,WAAW,EDSD,uBAAuB;ECRjC,SAAS,EDgBK,IAAI;ECflB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,ECPM,IAAI;;ADUhB,WAAY;EACX,KAAK,ECOW,IAAI;EDNpB,UAAU,EDOgB,OAAO;ECNjC,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,ECvBS,iBAAiB;EDwBhC,KAAK,ECtBS,IAAI;EDwBlB,WAAW,EDdE,gCAAgC;ECe7C,WAAW,ECxBQ,KAAK;EDyBxB,cAAc,EDdQ,OAAO;ECgB7B,cAAc,EDfQ,IAAI;ECgB1B,WAAW,EDlBQ,IAAI;;ACqBxB,UAAW;EACV,WAAW,EC5BS,8BAAkB;;ADgCvC;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,EDlCM,OAAO;ECmClB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,ED3CU,OAA0B;EC6CzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,cAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,ED5EF,OAAO;EC8EjB,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EDxFP,OAAO;;AC2FnB;4CAC6C;EAC5C,iBAAiB,ED7FN,OAAO;;ACgGnB;yCAC0C;EACzC,mBAAmB,EDlGR,OAAO;;ACqGnB;2CAC4C;EAC3C,gBAAgB,EDvGL,OAAO;;AC0GnB,iDAAkD;EACjD,kBAAkB,ED1GF,OAA0B;;AC6G3C,kDAAmD;EAClD,iBAAiB,ED9GD,OAA0B;;ACiH3C,+CAAgD;EAC/C,mBAAmB,EDlHH,OAA0B;;ACqH3C,iDAAkD;EACjD,gBAAgB,EDtHA,OAA0B;;AC0H3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,EDnIA,OAAO;ECqIjB,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", "sources": ["source/night.scss","template/theme.scss","template/settings.scss"], "names": [], "file": "night.css" diff --git a/bower_components/reveal.js/css/theme/serif.css b/bower_components/reveal.js/css/theme/serif.css index da6909a3dec9ee25472f7c17793e9034ea08c1cf..51717c0b395e144f0373a4166748ab4f988ae2a6 100644 --- a/bower_components/reveal.js/css/theme/serif.css +++ b/bower_components/reveal.js/css/theme/serif.css @@ -35,7 +35,7 @@ body { .reveal h4, .reveal h5, .reveal h6 { - margin: -120px 0 20px 20px; + margin: -80px 0 20px 20px; color: #383D3D; font-family: "Palatino Linotype", "Book Antiqua", Palatino, FreeSerif, serif; line-height: 1.3em; diff --git a/bower_components/reveal.js/css/theme/serif.css.map b/bower_components/reveal.js/css/theme/serif.css.map index 1eb5e9960fa3f0a3fffd58e4818c0ef0eb250bf4..51fb933bd8bb1ec7c63f5a3fa35b8f1429b0719a 100644 --- a/bower_components/reveal.js/css/theme/serif.css.map +++ b/bower_components/reveal.js/css/theme/serif.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAAA;;;;;GAKG;AAsBH,qBAAsB;EACpB,WAAW,EAAE,KAAK;;AC1BpB;;+CAE+C;AAE/C,IAAK;EC0BJ,UAAU,EFVO,OAAO;ECdxB,gBAAgB,EDcC,OAAO;;ACXzB,OAAQ;EACP,WAAW,EDID,+DAA+D;ECHzE,SAAS,ECLK,IAAI;EDMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EDCM,IAAI;;ACEhB,WAAY;EACX,KAAK,ECOW,IAAI;EDNpB,UAAU,EDIgB,OAAO;ECHjC,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,ECvBS,kBAAkB;EDwBjC,KAAK,EDjBS,OAAO;ECmBrB,WAAW,EDpBE,+DAA+D;ECqB5E,WAAW,ECxBQ,KAAK;EDyBxB,cAAc,ECxBQ,GAAK;ED0B3B,cAAc,EDrBQ,IAAI;ECsB1B,WAAW,EDvBQ,IAAI;;AC0BxB,UAAW;EACV,WAAW,EC5BS,8BAAkB;;ADgCvC;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,EDjCM,OAAO;ECkClB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,ED1CU,OAA0B;EC4CzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,cAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,ED3EF,OAAO;EC6EjB,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EDvFP,OAAO;;AC0FnB;4CAC6C;EAC5C,iBAAiB,ED5FN,OAAO;;AC+FnB;yCAC0C;EACzC,mBAAmB,EDjGR,OAAO;;ACoGnB;2CAC4C;EAC3C,gBAAgB,EDtGL,OAAO;;ACyGnB,iDAAkD;EACjD,kBAAkB,EDzGF,OAA0B;;AC4G3C,kDAAmD;EAClD,iBAAiB,ED7GD,OAA0B;;ACgH3C,+CAAgD;EAC/C,mBAAmB,EDjHH,OAA0B;;ACoH3C,iDAAkD;EACjD,gBAAgB,EDrHA,OAA0B;;ACyH3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,EDlIA,OAAO;ECoIjB,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", +"mappings": "AAAA;;;;;GAKG;AAsBH,qBAAsB;EACpB,WAAW,EAAE,KAAK;;AC1BpB;;+CAE+C;AAE/C,IAAK;EC0BJ,UAAU,EFVO,OAAO;ECdxB,gBAAgB,EDcC,OAAO;;ACXzB,OAAQ;EACP,WAAW,EDID,+DAA+D;ECHzE,SAAS,ECLK,IAAI;EDMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EDCM,IAAI;;ACEhB,WAAY;EACX,KAAK,ECOW,IAAI;EDNpB,UAAU,EDIgB,OAAO;ECHjC,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,ECvBS,iBAAiB;EDwBhC,KAAK,EDjBS,OAAO;ECmBrB,WAAW,EDpBE,+DAA+D;ECqB5E,WAAW,ECxBQ,KAAK;EDyBxB,cAAc,ECxBQ,GAAK;ED0B3B,cAAc,EDrBQ,IAAI;ECsB1B,WAAW,EDvBQ,IAAI;;AC0BxB,UAAW;EACV,WAAW,EC5BS,8BAAkB;;ADgCvC;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,EDjCM,OAAO;ECkClB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,ED1CU,OAA0B;EC4CzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,cAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,ED3EF,OAAO;EC6EjB,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EDvFP,OAAO;;AC0FnB;4CAC6C;EAC5C,iBAAiB,ED5FN,OAAO;;AC+FnB;yCAC0C;EACzC,mBAAmB,EDjGR,OAAO;;ACoGnB;2CAC4C;EAC3C,gBAAgB,EDtGL,OAAO;;ACyGnB,iDAAkD;EACjD,kBAAkB,EDzGF,OAA0B;;AC4G3C,kDAAmD;EAClD,iBAAiB,ED7GD,OAA0B;;ACgH3C,+CAAgD;EAC/C,mBAAmB,EDjHH,OAA0B;;ACoH3C,iDAAkD;EACjD,gBAAgB,EDrHA,OAA0B;;ACyH3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,EDlIA,OAAO;ECoIjB,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", "sources": ["source/serif.scss","template/theme.scss","template/settings.scss"], "names": [], "file": "serif.css" diff --git a/bower_components/reveal.js/css/theme/simple.css b/bower_components/reveal.js/css/theme/simple.css index ae048b9fd513d9396b43b83fe3175f132180eaf9..c02842817d3a3734c5e2228a90aca3a7e63066ed 100644 --- a/bower_components/reveal.js/css/theme/simple.css +++ b/bower_components/reveal.js/css/theme/simple.css @@ -35,7 +35,7 @@ body { .reveal h4, .reveal h5, .reveal h6 { - margin: -120px 0 20px 20px; + margin: -80px 0 20px 20px; color: #000; font-family: "News Cycle", Impact, sans-serif; line-height: 1.3em; diff --git a/bower_components/reveal.js/css/theme/simple.css.map b/bower_components/reveal.js/css/theme/simple.css.map index 9c81e4553a7408617cb9b4cbe9f5d88fa438b931..c6b07b98e0930ed980c7b27f178a245e017f6ce5 100644 --- a/bower_components/reveal.js/css/theme/simple.css.map +++ b/bower_components/reveal.js/css/theme/simple.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAAA;;;;;;GAMG;AAWK,uEAA+D;AAC/D,qFAA6E;AChBrF;;+CAE+C;AAE/C,IAAK;EC0BJ,UAAU,EFJO,IAAI;ECpBrB,gBAAgB,EDoBC,IAAI;;ACjBtB,OAAQ;EACP,WAAW,EDUD,kBAAkB;ECT5B,SAAS,ECLK,IAAI;EDMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EDOM,IAAI;;ACJhB,WAAY;EACX,KAAK,ECOW,IAAI;EDNpB,UAAU,EDUgB,mBAAmB;ECT7C,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,ECvBS,kBAAkB;EDwBjC,KAAK,EDXS,IAAI;ECalB,WAAW,EDdE,gCAAgC;ECe7C,WAAW,ECxBQ,KAAK;EDyBxB,cAAc,ECxBQ,GAAK;ED0B3B,cAAc,EDfQ,IAAI;ECgB1B,WAAW,EDjBQ,IAAI;;ACoBxB,UAAW;EACV,WAAW,EC5BS,8BAAkB;;ADgCvC;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,ED3BM,OAAO;EC4BlB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,EDpCU,OAA0B;ECsCzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,cAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,EDrEF,OAAO;ECuEjB,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EDjFP,OAAO;;ACoFnB;4CAC6C;EAC5C,iBAAiB,EDtFN,OAAO;;ACyFnB;yCAC0C;EACzC,mBAAmB,ED3FR,OAAO;;AC8FnB;2CAC4C;EAC3C,gBAAgB,EDhGL,OAAO;;ACmGnB,iDAAkD;EACjD,kBAAkB,EDnGF,OAA0B;;ACsG3C,kDAAmD;EAClD,iBAAiB,EDvGD,OAA0B;;AC0G3C,+CAAgD;EAC/C,mBAAmB,ED3GH,OAA0B;;AC8G3C,iDAAkD;EACjD,gBAAgB,ED/GA,OAA0B;;ACmH3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,ED5HA,OAAO;EC8HjB,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", +"mappings": "AAAA;;;;;;GAMG;AAWK,uEAA+D;AAC/D,qFAA6E;AChBrF;;+CAE+C;AAE/C,IAAK;EC0BJ,UAAU,EFJO,IAAI;ECpBrB,gBAAgB,EDoBC,IAAI;;ACjBtB,OAAQ;EACP,WAAW,EDUD,kBAAkB;ECT5B,SAAS,ECLK,IAAI;EDMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EDOM,IAAI;;ACJhB,WAAY;EACX,KAAK,ECOW,IAAI;EDNpB,UAAU,EDUgB,mBAAmB;ECT7C,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,ECvBS,iBAAiB;EDwBhC,KAAK,EDXS,IAAI;ECalB,WAAW,EDdE,gCAAgC;ECe7C,WAAW,ECxBQ,KAAK;EDyBxB,cAAc,ECxBQ,GAAK;ED0B3B,cAAc,EDfQ,IAAI;ECgB1B,WAAW,EDjBQ,IAAI;;ACoBxB,UAAW;EACV,WAAW,EC5BS,8BAAkB;;ADgCvC;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,ED3BM,OAAO;EC4BlB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,EDpCU,OAA0B;ECsCzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,cAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,EDrEF,OAAO;ECuEjB,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EDjFP,OAAO;;ACoFnB;4CAC6C;EAC5C,iBAAiB,EDtFN,OAAO;;ACyFnB;yCAC0C;EACzC,mBAAmB,ED3FR,OAAO;;AC8FnB;2CAC4C;EAC3C,gBAAgB,EDhGL,OAAO;;ACmGnB,iDAAkD;EACjD,kBAAkB,EDnGF,OAA0B;;ACsG3C,kDAAmD;EAClD,iBAAiB,EDvGD,OAA0B;;AC0G3C,+CAAgD;EAC/C,mBAAmB,ED3GH,OAA0B;;AC8G3C,iDAAkD;EACjD,gBAAgB,ED/GA,OAA0B;;ACmH3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,ED5HA,OAAO;EC8HjB,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", "sources": ["source/simple.scss","template/theme.scss","template/settings.scss"], "names": [], "file": "simple.css" diff --git a/bower_components/reveal.js/css/theme/sky.css b/bower_components/reveal.js/css/theme/sky.css index f393b60ce958a0550641c8795240b35d8acfc9c0..c359371f8e0141de8d4233c61bc4d461cedae418 100644 --- a/bower_components/reveal.js/css/theme/sky.css +++ b/bower_components/reveal.js/css/theme/sky.css @@ -42,7 +42,7 @@ body { .reveal h4, .reveal h5, .reveal h6 { - margin: -120px 0 20px 20px; + margin: -80px 0 20px 20px; color: #333; font-family: "Quicksand", sans-serif; line-height: 1.3em; diff --git a/bower_components/reveal.js/css/theme/sky.css.map b/bower_components/reveal.js/css/theme/sky.css.map index 444b95a71069fffcf040d014c6ebdf1b0fab2b3c..dbe4b60e2eed21f660eb5eb5e4b0304af956b044 100644 --- a/bower_components/reveal.js/css/theme/sky.css.map +++ b/bower_components/reveal.js/css/theme/sky.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAAA;;;;GAIG;AAWK,0FAAkF;AAClF,0FAAkF;AAgB1F,qBAAsB;EACrB,WAAW,EAAE,KAAK;;AC/BnB;;+CAE+C;AAE/C,IAAK;ECeJ,UAAU,EFiBgB,OAAO;EEhBjC,UAAU,EAAE,oEAAoE;EAChF,UAAU,EAAE,qHAAmH;EAC/H,UAAU,EAAE,uEAAuE;EACnF,UAAU,EAAE,kEAAkE;EAC9E,UAAU,EAAE,mEAAmE;EAC/E,UAAU,EAAE,+DAA+D;EDnB3E,gBAAgB,EDkBC,OAAO;;ACfzB,OAAQ;EACP,WAAW,EDQD,uBAAuB;ECPjC,SAAS,EELK,IAAI;EFMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EDKM,IAAI;;ACFhB,WAAY;EACX,KAAK,EEOW,IAAI;EFNpB,UAAU,EDQgB,OAAO;ECPjC,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,EEvBS,kBAAkB;EFwBjC,KAAK,EDbS,IAAI;ECelB,WAAW,EDhBE,uBAAuB;ECiBpC,WAAW,EExBQ,KAAK;EFyBxB,cAAc,EDhBQ,OAAO;ECkB7B,cAAc,EEzBQ,SAAS;EF0B/B,WAAW,EDlBQ,IAAI;;ACqBxB,UAAW;EACV,WAAW,EE5BS,8BAAkB;;AFgCvC;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,ED7BM,OAAO;EC8BlB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,EDtCU,OAA0B;ECwCzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,cAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,EDvEF,OAAO;ECyEjB,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EDnFP,OAAO;;ACsFnB;4CAC6C;EAC5C,iBAAiB,EDxFN,OAAO;;AC2FnB;yCAC0C;EACzC,mBAAmB,ED7FR,OAAO;;ACgGnB;2CAC4C;EAC3C,gBAAgB,EDlGL,OAAO;;ACqGnB,iDAAkD;EACjD,kBAAkB,EDrGF,OAA0B;;ACwG3C,kDAAmD;EAClD,iBAAiB,EDzGD,OAA0B;;AC4G3C,+CAAgD;EAC/C,mBAAmB,ED7GH,OAA0B;;ACgH3C,iDAAkD;EACjD,gBAAgB,EDjHA,OAA0B;;ACqH3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,ED9HA,OAAO;ECgIjB,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", +"mappings": "AAAA;;;;GAIG;AAWK,0FAAkF;AAClF,0FAAkF;AAgB1F,qBAAsB;EACrB,WAAW,EAAE,KAAK;;AC/BnB;;+CAE+C;AAE/C,IAAK;ECeJ,UAAU,EFiBgB,OAAO;EEhBjC,UAAU,EAAE,oEAAoE;EAChF,UAAU,EAAE,qHAAmH;EAC/H,UAAU,EAAE,uEAAuE;EACnF,UAAU,EAAE,kEAAkE;EAC9E,UAAU,EAAE,mEAAmE;EAC/E,UAAU,EAAE,+DAA+D;EDnB3E,gBAAgB,EDkBC,OAAO;;ACfzB,OAAQ;EACP,WAAW,EDQD,uBAAuB;ECPjC,SAAS,EELK,IAAI;EFMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EDKM,IAAI;;ACFhB,WAAY;EACX,KAAK,EEOW,IAAI;EFNpB,UAAU,EDQgB,OAAO;ECPjC,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,EEvBS,iBAAiB;EFwBhC,KAAK,EDbS,IAAI;ECelB,WAAW,EDhBE,uBAAuB;ECiBpC,WAAW,EExBQ,KAAK;EFyBxB,cAAc,EDhBQ,OAAO;ECkB7B,cAAc,EEzBQ,SAAS;EF0B/B,WAAW,EDlBQ,IAAI;;ACqBxB,UAAW;EACV,WAAW,EE5BS,8BAAkB;;AFgCvC;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,ED7BM,OAAO;EC8BlB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,EDtCU,OAA0B;ECwCzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,cAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,EDvEF,OAAO;ECyEjB,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EDnFP,OAAO;;ACsFnB;4CAC6C;EAC5C,iBAAiB,EDxFN,OAAO;;AC2FnB;yCAC0C;EACzC,mBAAmB,ED7FR,OAAO;;ACgGnB;2CAC4C;EAC3C,gBAAgB,EDlGL,OAAO;;ACqGnB,iDAAkD;EACjD,kBAAkB,EDrGF,OAA0B;;ACwG3C,kDAAmD;EAClD,iBAAiB,EDzGD,OAA0B;;AC4G3C,+CAAgD;EAC/C,mBAAmB,ED7GH,OAA0B;;ACgH3C,iDAAkD;EACjD,gBAAgB,EDjHA,OAA0B;;ACqH3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,ED9HA,OAAO;ECgIjB,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", "sources": ["source/sky.scss","template/theme.scss","template/mixins.scss","template/settings.scss"], "names": [], "file": "sky.css" diff --git a/bower_components/reveal.js/css/theme/solarized.css b/bower_components/reveal.js/css/theme/solarized.css index c2f76a16fbed808d42c4244234eb1f5ef348ef20..ff70116addca290ad89305acc122dbcd7cc464a3 100644 --- a/bower_components/reveal.js/css/theme/solarized.css +++ b/bower_components/reveal.js/css/theme/solarized.css @@ -44,7 +44,7 @@ body { .reveal h4, .reveal h5, .reveal h6 { - margin: -120px 0 20px 20px; + margin: -80px 0 20px 20px; color: #586e75; font-family: "Verdana", Impact, sans-serif; line-height: 1.3em; diff --git a/bower_components/reveal.js/css/theme/solarized.css.map b/bower_components/reveal.js/css/theme/solarized.css.map index 786e2a6f811213080afd2f5ab18aca20884f62c1..8a2bf1fc907af1bedacb45bbed4785486974285c 100644 --- a/bower_components/reveal.js/css/theme/solarized.css.map +++ b/bower_components/reveal.js/css/theme/solarized.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAAA;;;GAGG;AAuBK,qFAA6E;AAZrF,UAUC;EATA,WAAW,EAAE,eAAe;EAC5B,GAAG,EAAE,+CAA+C;EACpD,GAAG,EAAE,0SAG8E;EAEnF,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM;AAMnB;;GAEG;AACH,MAAO;EACN,aAAa,EAAE,IAAI;EACnB,gBAAgB,EAAE,IAAI;;AChCvB;;+CAE+C;AAE/C,IAAK;EC0BJ,UAAU,EF2BO,OAAM;ECnDvB,gBAAgB,EDmDC,OAAM;;AChDxB,OAAQ;EACP,WAAW,ECLD,kBAAkB;EDM5B,SAAS,ECLK,IAAI;EDMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EDwCM,OAAO;;ACrCnB,WAAY;EACX,KAAK,ECOW,IAAI;EDNpB,UAAU,EDyCgB,OAAQ;ECxClC,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,ECvBS,kBAAkB;EDwBjC,KAAK,EDqBS,OAAO;ECnBrB,WAAW,ECzBE,6BAA6B;ED0B1C,WAAW,ECxBQ,KAAK;EDyBxB,cAAc,ECxBQ,GAAK;ED0B3B,cAAc,ECzBQ,SAAS;ED0B/B,WAAW,EDeQ,IAAI;;ACZxB,UAAW;EACV,WAAW,EC5BS,8BAAkB;;ADgCvC;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,EDIM,OAAK;ECHhB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,EDLU,OAA0B;ECOzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,iBAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,EDtCF,OAAK;ECwCf,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EDlDP,OAAK;;ACqDjB;4CAC6C;EAC5C,iBAAiB,EDvDN,OAAK;;AC0DjB;yCAC0C;EACzC,mBAAmB,ED5DR,OAAK;;AC+DjB;2CAC4C;EAC3C,gBAAgB,EDjEL,OAAK;;ACoEjB,iDAAkD;EACjD,kBAAkB,EDpEF,OAA0B;;ACuE3C,kDAAmD;EAClD,iBAAiB,EDxED,OAA0B;;AC2E3C,+CAAgD;EAC/C,mBAAmB,ED5EH,OAA0B;;AC+E3C,iDAAkD;EACjD,gBAAgB,EDhFA,OAA0B;;ACoF3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,ED7FA,OAAK;EC+Ff,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", +"mappings": "AAAA;;;GAGG;AAuBK,qFAA6E;AAZrF,UAUC;EATA,WAAW,EAAE,eAAe;EAC5B,GAAG,EAAE,+CAA+C;EACpD,GAAG,EAAE,0SAG8E;EAEnF,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM;AAMnB;;GAEG;AACH,MAAO;EACN,aAAa,EAAE,IAAI;EACnB,gBAAgB,EAAE,IAAI;;AChCvB;;+CAE+C;AAE/C,IAAK;EC0BJ,UAAU,EF2BO,OAAM;ECnDvB,gBAAgB,EDmDC,OAAM;;AChDxB,OAAQ;EACP,WAAW,ECLD,kBAAkB;EDM5B,SAAS,ECLK,IAAI;EDMlB,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,OAAO;EACvB,KAAK,EDwCM,OAAO;;ACrCnB,WAAY;EACX,KAAK,ECOW,IAAI;EDNpB,UAAU,EDyCgB,OAAQ;ECxClC,WAAW,EAAE,IAAI;;AAGlB;;+CAE+C;AAE/C;;;;;UAKW;EACV,MAAM,ECvBS,iBAAiB;EDwBhC,KAAK,EDqBS,OAAO;ECnBrB,WAAW,ECzBE,6BAA6B;ED0B1C,WAAW,ECxBQ,KAAK;EDyBxB,cAAc,ECxBQ,GAAK;ED0B3B,cAAc,ECzBQ,SAAS;ED0B/B,WAAW,EDeQ,IAAI;;ACZxB,UAAW;EACV,WAAW,EC5BS,8BAAkB;;ADgCvC;;+CAE+C;AAE/C,qBAAsB;EACrB,KAAK,EDIM,OAAK;ECHhB,eAAe,EAAE,IAAI;EAErB,kBAAkB,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAC/B,cAAc,EAAE,eAAe;EAC9B,aAAa,EAAE,eAAe;EAC3B,UAAU,EAAE,eAAe;;AAEnC,2BAA4B;EAC3B,KAAK,EDLU,OAA0B;ECOzC,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,wBAAyB;EACxB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,OAAyB;;AAItC;;+CAE+C;AAE/C,mBAAoB;EACnB,MAAM,EAAE,QAAQ;EAChB,UAAU,EAAE,yBAAsB;EAClC,MAAM,EAAE,iBAAoB;EAE5B,UAAU,EAAE,4BAA4B;EAExC,kBAAkB,EAAE,cAAc;EAC/B,eAAe,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC7B,aAAa,EAAE,cAAc;EAC1B,UAAU,EAAE,cAAc;;AAGlC,mBAAoB;EACnB,UAAU,EAAE,wBAAqB;EACjC,YAAY,EDtCF,OAAK;ECwCf,UAAU,EAAE,4BAA4B;;AAI1C;;+CAE+C;AAE/C;2CAC4C;EAC3C,kBAAkB,EDlDP,OAAK;;ACqDjB;4CAC6C;EAC5C,iBAAiB,EDvDN,OAAK;;AC0DjB;yCAC0C;EACzC,mBAAmB,ED5DR,OAAK;;AC+DjB;2CAC4C;EAC3C,gBAAgB,EDjEL,OAAK;;ACoEjB,iDAAkD;EACjD,kBAAkB,EDpEF,OAA0B;;ACuE3C,kDAAmD;EAClD,iBAAiB,EDxED,OAA0B;;AC2E3C,+CAAgD;EAC/C,mBAAmB,ED5EH,OAA0B;;AC+E3C,iDAAkD;EACjD,gBAAgB,EDhFA,OAA0B;;ACoF3C;;+CAE+C;AAE/C,iBAAkB;EACjB,UAAU,EAAE,kBAAe;;AAE3B,sBAAuB;EACtB,UAAU,ED7FA,OAAK;EC+Ff,kBAAkB,EAAE,iDAAoD;EACrE,eAAe,EAAE,iDAAoD;EACpE,cAAc,EAAE,iDAAoD;EACnE,aAAa,EAAE,iDAAoD;EAChE,UAAU,EAAE,iDAAoD", "sources": ["source/solarized.scss","template/theme.scss","template/settings.scss"], "names": [], "file": "solarized.css" diff --git a/bower_components/reveal.js/css/theme/template/settings.scss b/bower_components/reveal.js/css/theme/template/settings.scss index c5766c43dcadca0e2e4b20a3fb7fc54560897644..d7e11d5b0d21cb8c1ad05b87088a11cfa041efda 100644 --- a/bower_components/reveal.js/css/theme/template/settings.scss +++ b/bower_components/reveal.js/css/theme/template/settings.scss @@ -10,7 +10,7 @@ $mainFontSize: 32px; $mainColor: #eee; // Headings -$headingMargin: -120px 0 20px 20px; +$headingMargin: -80px 0 20px 20px; $headingFont: 'Verdana', Impact, sans-serif; $headingColor: #eee; $headingLineHeight: 1.3em; diff --git a/bower_components/reveal.js/css/theme/template/theme.scss b/bower_components/reveal.js/css/theme/template/theme.scss index 735b7659d5c0d91e9de06d819d5db739d38c75c5..7e1c6b2a615d7f4db5288c7ab534d1cf0f71a700 100644 --- a/bower_components/reveal.js/css/theme/template/theme.scss +++ b/bower_components/reveal.js/css/theme/template/theme.scss @@ -159,5 +159,3 @@ body { -o-transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985); transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985); } - - diff --git a/bower_components/reveal.js/js/reveal.js b/bower_components/reveal.js/js/reveal.js index 794911c5f5bfddf99e2fa757c132af20bf98708d..8ebbd98210a2e62b280f792bd8ae18c5bcbcf5e2 100644 --- a/bower_components/reveal.js/js/reveal.js +++ b/bower_components/reveal.js/js/reveal.js @@ -1825,12 +1825,12 @@ var Reveal = (function(){ } /** - * Updates the background elements to reflect the current + * Updates the background elements to reflect the current * slide. */ function updateBackground() { - // Update the classes of all backgrounds to match the + // Update the classes of all backgrounds to match the // states of their slides (past/present/future) toArray( dom.background.childNodes ).forEach( function( backgroundh, h ) { diff --git a/css/style.css b/css/style.css index 93f560137a8156d518db2c49cc8baa8b68d10364..778eee3af854c6cc2d2efbdb2aaed12020d584b3 100644 --- a/css/style.css +++ b/css/style.css @@ -1,8 +1,9 @@ -/*@import url('icomoon79565/style.css');*/ - .reveal pre { - font-size: 0.9em; /* Make the commands bigger */ + font-size: 0.8em; /* Make the commands bigger */ box-shadow: 3px 4px 10px rgba(0,0,0,0.8); + width: 120%; + position: relative; + left: -10%; } .reveal pre code { background-color: #333333; @@ -16,3 +17,13 @@ border: none; box-shadow: none } +.reveal section img { + margin: 10px 0px; + background: rgba(255, 255, 255, 0.12); + border: 0px solid #000; + box-shadow: 0 0 0px rgba(0, 0, 0, 0.15); + -webkit-transition: all .2s linear; + -moz-transition: all .2s linear; + -ms-transition: all .2s linear; + -o-transition: all .2s linear; + transition: all .2s linear; } diff --git a/img/branch-0-master.png b/img/branch-0-master.png deleted file mode 100644 index 8a9b18ae05bec4f4b2357480b283533432b974a5..0000000000000000000000000000000000000000 Binary files a/img/branch-0-master.png and /dev/null differ diff --git a/img/branch-1-checkout-b.png b/img/branch-1-checkout-b.png deleted file mode 100644 index f8d2fe25b34a732bf4a5e7208d676b1fb07d5897..0000000000000000000000000000000000000000 Binary files a/img/branch-1-checkout-b.png and /dev/null differ diff --git a/img/branch-2-commit.png b/img/branch-2-commit.png deleted file mode 100644 index 7a476ed29e562b6efe81ad971418c493d78f118a..0000000000000000000000000000000000000000 Binary files a/img/branch-2-commit.png and /dev/null differ diff --git a/img/branch-3-merge.png b/img/branch-3-merge.png deleted file mode 100644 index 74737e3e7b7c866a4030b226dcd0eca7b47c3eb1..0000000000000000000000000000000000000000 Binary files a/img/branch-3-merge.png and /dev/null differ diff --git a/img/branch-4-br-d.png b/img/branch-4-br-d.png deleted file mode 100644 index f8cbe0d018c8f04cdbe2861fd930dc060890fb04..0000000000000000000000000000000000000000 Binary files a/img/branch-4-br-d.png and /dev/null differ diff --git a/img/branch-commit.png b/img/branch-commit.png new file mode 100644 index 0000000000000000000000000000000000000000..4d31b951c7e0c05027f40566650ce1dfab36a6a1 Binary files /dev/null and b/img/branch-commit.png differ diff --git a/img/branch-create.png b/img/branch-create.png new file mode 100644 index 0000000000000000000000000000000000000000..bc5e5476089018f4b94363b5e376a7b17c54785c Binary files /dev/null and b/img/branch-create.png differ diff --git a/img/branch-i-state.graffle b/img/branch-i-state.graffle index 870a13fded89c8f2de0825efd7d8433a47eb650b..a346482195201ee5e59f918ac54c6336744fe6cb 100644 Binary files a/img/branch-i-state.graffle and b/img/branch-i-state.graffle differ diff --git a/img/branch-master.png b/img/branch-master.png new file mode 100644 index 0000000000000000000000000000000000000000..a30f3d76d63b0cd1353806b83e2635de5df0283e Binary files /dev/null and b/img/branch-master.png differ diff --git a/img/branch-merge.png b/img/branch-merge.png new file mode 100644 index 0000000000000000000000000000000000000000..8499c5dcf20033c032aed70f7925fc2e6acee6ac Binary files /dev/null and b/img/branch-merge.png differ diff --git a/img/dark.jpg b/img/dark.jpg deleted file mode 100644 index ede4c5a4d88cc73f74166cfc5593fcd03c7f52f9..0000000000000000000000000000000000000000 Binary files a/img/dark.jpg and /dev/null differ diff --git a/img/git-0-start.png b/img/git-0-start.png deleted file mode 100644 index b53af29b45aeb13b3dcbd180c95b40294a0fc851..0000000000000000000000000000000000000000 Binary files a/img/git-0-start.png and /dev/null differ diff --git a/img/git-1-dirty.png b/img/git-1-dirty.png deleted file mode 100644 index 3eb3e797df3b67add4fd7de3925ebbfcea971a88..0000000000000000000000000000000000000000 Binary files a/img/git-1-dirty.png and /dev/null differ diff --git a/img/git-2-add.png b/img/git-2-add.png deleted file mode 100644 index 3e8799dfd42e5d7085277ddf74026a708da4e8a9..0000000000000000000000000000000000000000 Binary files a/img/git-2-add.png and /dev/null differ diff --git a/img/git-3-commit.png b/img/git-3-commit.png deleted file mode 100644 index d46bef52ed21662274a427d02622622ef5f42d68..0000000000000000000000000000000000000000 Binary files a/img/git-3-commit.png and /dev/null differ diff --git a/img/git-4-checkout.png b/img/git-4-checkout.png deleted file mode 100644 index 039d784d4592a3a133d5848ed2de6eb344dd454b..0000000000000000000000000000000000000000 Binary files a/img/git-4-checkout.png and /dev/null differ diff --git a/img/git-5-reset.png b/img/git-5-reset.png deleted file mode 100644 index ffd02e40d969b27c428a5f42edc7396d6f01a5d1..0000000000000000000000000000000000000000 Binary files a/img/git-5-reset.png and /dev/null differ diff --git a/img/git-i-state.graffle b/img/git-i-state.graffle deleted file mode 100644 index e0facebe5d37481525d5777d9cdb9a017e2bcba9..0000000000000000000000000000000000000000 Binary files a/img/git-i-state.graffle and /dev/null differ diff --git a/img/git_definition.png b/img/git_definition.png deleted file mode 100644 index 0676fc7a299fae5c7c3389eed91e21fcb050c629..0000000000000000000000000000000000000000 Binary files a/img/git_definition.png and /dev/null differ diff --git a/img/git_logo.png b/img/git_logo.png deleted file mode 100644 index 79f68d008ea9c8c7c8a6fbd8284aefc8d249c477..0000000000000000000000000000000000000000 Binary files a/img/git_logo.png and /dev/null differ diff --git a/img/history_tracking.png b/img/history_tracking.png deleted file mode 100644 index ca8ab46a46f07e3c91bbd7510fee20696aaabc7f..0000000000000000000000000000000000000000 Binary files a/img/history_tracking.png and /dev/null differ diff --git a/img/history_tracking.pxm b/img/history_tracking.pxm deleted file mode 100644 index c7d55b2e5247c548ef7d3021902bfab4e34877f6..0000000000000000000000000000000000000000 Binary files a/img/history_tracking.pxm and /dev/null differ diff --git a/img/history_tracking_collaboration.png b/img/history_tracking_collaboration.png deleted file mode 100644 index 2dda29b1822762dab311df121289ea1b7614005c..0000000000000000000000000000000000000000 Binary files a/img/history_tracking_collaboration.png and /dev/null differ diff --git a/img/lewagon.png b/img/lewagon.png deleted file mode 100644 index 8c46ef0cf9f40e262a7aef290f72cabf15cd6dbd..0000000000000000000000000000000000000000 Binary files a/img/lewagon.png and /dev/null differ diff --git a/img/logoLCSB.png b/img/logoLCSB.png new file mode 100644 index 0000000000000000000000000000000000000000..9ca3f0adea7781ff00043b3f5465b28a89026287 Binary files /dev/null and b/img/logoLCSB.png differ diff --git a/img/logos.png b/img/logos.png deleted file mode 100644 index 7325b4ce7fb4eea2f2446407a7a24969bb313ffd..0000000000000000000000000000000000000000 Binary files a/img/logos.png and /dev/null differ diff --git a/img/manual_version_control.png b/img/manual_version_control.png deleted file mode 100644 index 0d794b1c86fe049cdf3ca6359f8da9c8af6efb1d..0000000000000000000000000000000000000000 Binary files a/img/manual_version_control.png and /dev/null differ diff --git a/img/whiteBG.jpg b/img/whiteBG.jpg new file mode 100644 index 0000000000000000000000000000000000000000..85212b4fa12b9a27711119a2eb984a10dbf8223f Binary files /dev/null and b/img/whiteBG.jpg differ diff --git a/index.html b/index.html index 98ff3263b7f2b47a2afd25ae2f09953c877808f7..2cd81e42baa2163b2cbb5d320b57febd2ab057ec 100644 --- a/index.html +++ b/index.html @@ -53,7 +53,7 @@ <section data-separator="^\n\n\n" data-vertical="^\n\n" - data-markdown="slides/part-2-git-intro.md"></section> + data-background="../img/whiteBG.jpg" data-markdown="slides/overview.md"></section> @@ -63,7 +63,7 @@ <section data-separator="^\n\n\n" data-vertical="^\n\n" - data-markdown="slides/part-3-installation.md"></section> + data-background="../img/whiteBG.jpg" data-markdown="slides/the_terminal.md"></section> @@ -73,7 +73,7 @@ <section data-separator="^\n\n\n" data-vertical="^\n\n" - data-markdown="slides/part-4-first-repo.md"></section> + data-background="../img/whiteBG.jpg" data-markdown="slides/what_is_git.md"></section> @@ -83,7 +83,7 @@ <section data-separator="^\n\n\n" data-vertical="^\n\n" - data-markdown="slides/part-5-branches.md"></section> + data-background="../img/whiteBG.jpg" data-markdown="slides/installation.md"></section> @@ -93,7 +93,7 @@ <section data-separator="^\n\n\n" data-vertical="^\n\n" - data-markdown="slides/part-6-remote.md"></section> + data-background="../img/whiteBG.jpg" data-markdown="slides/essential_commands.md"></section> @@ -103,7 +103,7 @@ <section data-separator="^\n\n\n" data-vertical="^\n\n" - data-markdown="slides/part-7-github-pages.md"></section> + data-background="../img/whiteBG.jpg" data-markdown="slides/github_gitlab.md"></section> @@ -113,7 +113,57 @@ <section data-separator="^\n\n\n" data-vertical="^\n\n" - data-markdown="slides/part-8-thanks.md"></section> + data-background="../img/whiteBG.jpg" data-markdown="slides/branches.md"></section> + + + + + + + + <section data-separator="^\n\n\n" + data-vertical="^\n\n" + data-background="../img/whiteBG.jpg" data-markdown="slides/forks.md"></section> + + + + + + + + <section data-separator="^\n\n\n" + data-vertical="^\n\n" + data-background="../img/whiteBG.jpg" data-markdown="slides/best_practices.md"></section> + + + + + + + + <section data-separator="^\n\n\n" + data-vertical="^\n\n" + data-background="../img/whiteBG.jpg" data-markdown="slides/thanks.md"></section> + + + + + + + + <section data-separator="^\n\n\n" + data-vertical="^\n\n" + data-background="../img/whiteBG.jpg" data-markdown="slides/ready.md"></section> + + + + + + + + <section data-separator="^\n\n\n" + data-vertical="^\n\n" + data-background="../img/whiteBG.jpg" data-markdown="slides/homework.md"></section> diff --git a/slides/best_practices.md b/slides/best_practices.md new file mode 100644 index 0000000000000000000000000000000000000000..91ca870bd5f3e722ad31083ca18c0647ade7272a --- /dev/null +++ b/slides/best_practices.md @@ -0,0 +1,39 @@ +## Best practices + +* `pull` before `push` + +* Work on your <font color="red">own</font> branch (in your own fork), and **not** on `master` and **not** on `develop` + +* Do **not push** to `master` or `develop`, but **submit a PR** + +* Get your code **reviewed** by your peers (submit a PR!) + +* Submit a PR **often**! + +* `clone` a repository, do not download the `.zip` file. + +* Do **not** combine `git` commands + ```bash + $ git commit -am "myMessage" # do not do this + ``` + +* Stage only 1 file at once using + ```bash + $ git add myFile.txt + ``` + + +* Commit **only a few files** at once (after multiple separate `git add` commands) + +* Always **sync your fork** before starting to work on a new branch + ```bash + $ git remote -v # verify to have the right remote set + $ git fetch upstream + $ git merge upstream/master + $ git push origin master # do not do git push (!) + ``` + +* `Push` often - avoid conflicts + +<br><br> +Remember: **A `push` a day keeps conflicts away!** diff --git a/slides/branches.md b/slides/branches.md new file mode 100644 index 0000000000000000000000000000000000000000..6a5eaf044bf1ff09a5d205418c3f68111c45e53f --- /dev/null +++ b/slides/branches.md @@ -0,0 +1,144 @@ +## Branches + +Branch-off within the same repository in order to stay safe! + +<br><br>The master branch +<img src="img/branch-master.png" class="branch-master" /> + + +## One branch per feature + +Assume that you want to work on a function for a matrix-vector operation. +```bash +$ git checkout -b matrix_vect_mult_myName +# creates the branch locally +``` +The `-b` flag creates the branch. + +<img src="img/branch-create.png" class="branch-create" /> + +Push the branch to the remote repository +```bash +$ git push +``` + + +If you do that, `git` might complain +```bash +fatal: The current branch matrix_vect_mult_myName has no upstream branch. +To push the current branch and set the remote as upstream, use + + git push --set-upstream origin matrix_vect_mult_myName +``` + +<br> +Follow the advice and do +```bash +$ git push --set-upstream origin matrix_vect_mult_myName +``` + + +## Switch between branches + +In your terminal, you may see the name of the branch you are on. + +List available branches of the repository +```bash +$ git branch --list +``` + +<div class="fragment"> +<br> +Checkout another branch +```bash +$ git checkout <branch_name> +``` + +<div class="fragment"> +<br> +You can switch back to the `master` branch with +```bash +$ git checkout master +``` + + +<br> +You can use the 5 essential commands as before. + +Only difference: you are on your own branch. + +<img src="img/branch-commit.png" class="branch-commit" /> + + +## Merge a branch + +If you want your feature on the `develop` or `master` branches, +**submit a MR or a PR** via the Github/Gitlab interface. + +<br> +Use the **interface** to make use of your peers to review your code! + +<img src="img/branch-merge.png" class="branch-merge" /> + +<br> +Once merged, you can delete the branch via the interface. + + +## Gitlab interface +<img src="https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo.png" alt="GitLab" style="width: 100px;"/> + +Detailed information is on [docs.gitlab.com/ce/gitlab-basics/add-merge-request.html](https://docs.gitlab.com/ce/gitlab-basics/add-merge-request.html). + +1. Click on **New merge request** + + +<br><br> +2. Compare the branches + + + + +<ol start="3"> + <li>Assign your peer + <br> + +  + </li> +</ol> + + +<ol start="4"> + <li>Submit the MR + + </li> +</ol> + + +## Github interface +<img src="https://assets-cdn.github.com/images/modules/logos_page/GitHub-Mark.png" alt="GitHub" style="width: 100px;"/> + +Detailed information is on [help.github.com/articles/creating-a-pull-request/](https://help.github.com/articles/creating-a-pull-request/). + +1. Click on **New pull request** + + +<br><br> +2. Compare the branches + + + + +<ol start="3"> + <li>Assign your peer + <br> + +  + </li> +</ol> + + +<ol start="4"> + <li>Submit the PR + + </li> +</ol> diff --git a/slides/essential_commands.md b/slides/essential_commands.md new file mode 100644 index 0000000000000000000000000000000000000000..96a4ab9ca888c5f70823a1ba7de289fb4d7c38d9 --- /dev/null +++ b/slides/essential_commands.md @@ -0,0 +1,137 @@ +## The 5 essential commands + +<br> +**Yes**, you only need 5 commands! + +<br> +`pull, status, add, commit, push` + +<br> +or in other words (remember these!): +```bash +$ git pull +$ git status +$ git add myFile.txt # example +$ git commit -m "myMessage" # example +$ git push +``` + + +## Pull the latest version of an existing repository + +First, browse to the cloned directory (`git clone [...]`): +```bash +$ cd practice +``` + +Then, pull the latest revision: +```bash +$ git pull +# Already up to date +``` + +Verify its `status` with: +```bash +$ git status +``` + + +## Modify a file + +Modify and rename `addTwoNumbers.m` in the folder `firstCommit` + +<br> +Open the file `addTwoNumbers.m` in the folder `firstCommit` using the `Atom` editor (or any other editor). + +<br> +Then, rename the function by adding your name (`addTwoNumbers_myName`) + +<br> +Uncomment the line +```Matlab +% c = a + b +``` + +<br> +Save and rename the file by <font color="red">adding your name</font> +```bash +$ mv firstCommit/addTwoNumbers.m firstCommit/addTwoNumbers_myName.m +``` + + +## Add your file to the stage + +First, check the repository status +```bash +$ git status +# uncommitted changes (displayed in red) +``` + +<div class="fragment"> +<br> +Now, add the file (bring it on stage) +```bash +$ git add firstCommit/addTwoNumbers_myName.m +# returns the same as before, generally in green (means staged) +``` + +<div class="fragment"> +<br> +**ADVANCED**: see your changes in the terminal +```bash +$ git diff +``` +exit with `:q` + + +## Add a commit message + +```bash +$ git commit -m "Uncommented line for adding 2 numbers" +$ git status +``` + +<br> +You can pull, even at this stage, new possible changes +```bash +$ git pull +``` + + +## Push your file to the repository + +```bash +$ git push +``` + +<div class="fragment"> +<br> +**ADVANCED**: see the log of all the commits (and your last one) in the terminal +```bash +$ git log +``` +exit by typing `q` + +<div class="fragment"> +<br><br> +You just pushed to `master`. This is **not a good** practice (more later!). + + +## Do it yourself + +* Modify and rename `secondCommit/multiplyTwoNumbers.m` +* Push the file `secondCommit/multiplyTwoNumbers_myName.m` +* Don't forget to add <font color="red">`_myName`</font> + +<div class="fragment"> +<br> +Commands: +```bash +$ git pull +$ git diff # optional +$ git add secondCommit/multiplyTwoNumbers_myName.m +$ git commit -m "Uncommented line for multiplying 2 numbers" +$ git status +$ git push +$ git log # optional +``` diff --git a/slides/forks.md b/slides/forks.md new file mode 100644 index 0000000000000000000000000000000000000000..9109050ed31bada378834b3e1fe4028b21234965 --- /dev/null +++ b/slides/forks.md @@ -0,0 +1,87 @@ +## Forks + +You **fork** when you want to work on a public repository or a protected repository. + +<br><br> +Remember: + +- A **fork** is your own **copy** of a repository. +- A **fork** can have multiple **branches**. +- A **fork** is not a **branch**, but can have multiple **branches**. + +<br><br> +A **fork** is only useful when you want to contribute, e.g., to The COBRAToolbox. + + +## Fork via interface + +Browse to the original repository and click on the button `Fork` + + + + +## Clone your fork + +Clone first +```bash +$ git clone https://git-r3lab.uni.lu/myGroup/myRepo.git forkMyRepo +``` + +<br> +then, you can change to the directory +```bash +$ cd forkMyRepo +``` + + +## Add the address of the original repository + +Add the `upstream` address (original/protected repository) +```bash +$ git remote add upstream https://git-r3lab.uni.lu/origGroup/origRepo.git +``` + +<br> +You can then check whether the remote address is set correctly +```bash +$ git remote -v +``` +<!-- <img src="img/remote-0-master.png" class="as-is" /> //--> +<!-- <img src="img/remote-1-remote.png" class="as-is" /> //--> +<!--- <img src="img/remote-2-push.png" class="as-is" /> //--> + + +## Synchronize your fork + +```bash +$ git checkout master +$ git status +``` + +<div class="fragment"> +<br> +Fetch the changes from upstream (similar to pull) +```bash +$ git fetch upstream +``` + +<div class="fragment"> +<br> +Merge the retrieved changes +```bash +$ git merge upstream/master +``` + +<div class="fragment"> +<br> +Push the changes to your own fork +```bash +$ git push origin master +``` + + +## Pull/Merge Requests + +**Good news!** + +Same procedure as with merging a branch... diff --git a/slides/github_gitlab.md b/slides/github_gitlab.md new file mode 100644 index 0000000000000000000000000000000000000000..ea5e300d8dee6246fb4012881022f15abd4b9b2e --- /dev/null +++ b/slides/github_gitlab.md @@ -0,0 +1,25 @@ +## GitHub and GitLab + +<img src="https://assets-cdn.github.com/images/modules/logos_page/GitHub-Mark.png" alt="GitHub" style="width: 200px;"/> +<img src="https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-extra-whitespace.png" alt="GitLab" style="width: 200px;"/> + +GitHub and GitLab are VCS systems. + +GitHub is **public**, whereas GitLab is **restricted/private**. + +Positive point: GitHub and GitLab are (almost) the same. + + +## GitHub (Live Demo) + +[www.github.com](www.github.com) +<br><img src="https://assets-cdn.github.com/images/modules/logos_page/GitHub-Mark.png" alt="GitHub" style="width: 200px;"/> + + +## GitLab (Live Demo) + +[https://git-r3lab.uni.lu](https://git-r3lab.uni.lu) +<br><img src="https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-extra-whitespace.png" alt="GitLab" style="width: 200px;"/> + + +## Open an issue (Live Demo) diff --git a/slides/homework.md b/slides/homework.md new file mode 100644 index 0000000000000000000000000000000000000000..e812373753aecf1e0a77ac9fdc628873c497504f --- /dev/null +++ b/slides/homework.md @@ -0,0 +1,38 @@ +## Homework on GitLab + +*This exercise has to be done on your lab computer on which `Matlab` **is** installed. Don't forget to properly configure `git` with your username and email, as we explained in the training slides.* + +<br> +During the training, you committed to the +<br> +[https://git-r3lab.uni.lu/git-training/practice](https://git-r3lab.uni.lu/git-training/practice) +repository. + +<br> +Your task is to create a fork of this repository, commit some code and create a merge request on `GitLab`. + + +## Homework: instructions + +- First, fork the [https://git-r3lab.uni.lu/git-training/practice](https://git-r3lab.uni.lu/git-training/practice) repository. + +- Create the new branch `homework_myName`. + +- Implement a new function (create a new file `sqrt_myName.m`) called `sqrt_myName(x)` that computes the square root of `x`. + +- Copy the `test.m` file to `test_myName.m` and change the names of the functions accordingly. + + +- Before submitting the merge request, verify locally that your code is running properly. + Simply execute it + ```sh + $ matlab -nodesktop -nosplash < test_myName.m + ``` + and verify that no error is reported. + +- Create a merge-request. + +- Assign either Laurent (@laurent.heirendt) or Sylvain (@sylvain.arreckx) depending on your group and your merge-request will be reviewed by one of us. + +<br> +That's it! diff --git a/slides/index.md b/slides/index.md index 00b2f0273013a87530a3e18b9fc28cfbd5ad454e..8f0015edeae3d30d6aa9995a5c0d76de32d6ba29 100644 --- a/slides/index.md +++ b/slides/index.md @@ -1,8 +1,8 @@ <img src="img/Git-Logo-Black.png" class="as-is" height="100px">training <br><br> -**SBG and MSP groups** +**SBG & MSP groups** -LCSB +<img src="img/logoLCSB.png" class="as-is" height="100px"> <br><br><br><br> <br><br><br><br> @@ -11,8 +11,6 @@ January 19th, 2017 Sylvain Arreckx & Laurent Heirendt -<img src="img/logos.png" class="as-is" height="70px"> - <br><br><br><br> note: @@ -32,7 +30,7 @@ clone, add, commit, (diff, log), push and status branch, checkout (add commit push on a branch) -Demo that if pushed to a branch, we will have a conflict -> submit a PR tto DEVELOP from own branch to avoid that +Demo that if pushed to a branch, we will have a conflict -> submit a PR to DEVELOP from own branch to avoid that 2. Github @@ -48,3 +46,7 @@ PR, issues (on a dummy test repo) - Task 2: Push to forked repo and create a PR - Bonus Task: Fork the cobratoolbox and update - Friday: 1h debriefing + + Put your speaker notes here. + You can see them pressing 's'. + Fullscreen can be activated by typing 'f'. diff --git a/slides/installation.md b/slides/installation.md new file mode 100644 index 0000000000000000000000000000000000000000..e614a8a7d2b0e136b9cf116d27603b23e3865380 --- /dev/null +++ b/slides/installation.md @@ -0,0 +1,98 @@ +## Installation + +<img src="img/github_app.png" class="as-is" height="200" /> + +**Linux (Ubuntu)** + +```bash +$ sudo apt-get install git-all +``` +<br> +**macOS** + +Install *Xcode Command Line Tools* + +<br> +**Windows** + +Follow instructions on *[git-for-windows.github.io](https://git-for-windows.github.io)*. + +**or:** `MobaXTerm` with `git` plugin: *[mobaxterm.mobatek.net](https://mobaxterm.mobatek.net)*. + +<small>More on *[git-scm.com/book/en/v2/Getting-Started-Installing-Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)*</small> + + +## How to start? + +**Linux (Ubuntu)** and **macOS** + +Start the terminal (or any other shell) + +<br> +**Windows** + +Start `GUI Bash` or `MobaXTerm`. + + +## How to configure `git`? + +```bash +$ git config --global user.name "Firstname Lastname" +$ git config --global user.email "first.last@uni.lu" +``` + + +## Does it work? + +```bash +$ git --version +# git version 2.10.0 +``` + + +## Test the configuration + +Test whether your username and email have been registered + +```bash +$ git config --list +``` + +<br> +This should list the configuration with `user.name` and `user.email`. + + +## How do I `clone` a repository? + +You can clone a repository with +```bash +$ git clone https://github.com/userName/myRepo.git myRepo +``` + +<div class="fragment"> +<br> +Clone the training repository with +```bash +$ git clone https://git-r3lab.uni.lu/git-training/practice.git practice +``` +<br> +You may be prompted to enter your credentials. + +<div class="fragment"> +<br> +Any other rudimentary method such as + +*'I simply download the `.zip` un unzip it - works like a charm!'* + +shall **be avoided**! + + +## I need `The COBRAToolbox`? + +Simply `clone` the repository (i.e., retrieve a copy) +```bash +$ git clone https://github.com/opencobra/cobratoolbox.git cobratoolbox +``` + +<br><br> +**Do not** do it right now! Thank you. diff --git a/slides/list.json b/slides/list.json index a1eef01ab3ba641d42b0e0ff0a35725e42aa5a4c..c4a5b483b652ec759b3f56e43ae11fa3338ba75d 100644 --- a/slides/list.json +++ b/slides/list.json @@ -6,38 +6,75 @@ } }, { - "filename": "part-2-git-intro.md", + "filename": "overview.md", "attr": { + "data-background": "../img/whiteBG.jpg" } }, { - "filename": "part-3-installation.md", + "filename": "the_terminal.md", "attr": { + "data-background": "../img/whiteBG.jpg" } }, { - "filename": "part-4-first-repo.md", + "filename": "what_is_git.md", "attr": { + "data-background": "../img/whiteBG.jpg" } }, { - "filename": "part-5-branches.md", + "filename": "installation.md", "attr": { + "data-background": "../img/whiteBG.jpg" } }, { - "filename": "part-6-remote.md", + "filename": "essential_commands.md", "attr": { + "data-background": "../img/whiteBG.jpg" } }, { - "filename": "part-7-github-pages.md", + "filename": "github_gitlab.md", "attr": { + "data-background": "../img/whiteBG.jpg" } }, { - "filename": "part-8-thanks.md", + "filename": "branches.md", "attr": { + "data-background": "../img/whiteBG.jpg" + } + }, + { + "filename": "forks.md", + "attr": { + "data-background": "../img/whiteBG.jpg" + } + }, + { + "filename": "best_practices.md", + "attr": { + "data-background": "../img/whiteBG.jpg" + } + }, + { + "filename": "thanks.md", + "attr": { + "data-background": "../img/whiteBG.jpg" + } + }, + { + "filename": "ready.md", + "attr": { + "data-background": "../img/whiteBG.jpg" + } + }, + { + "filename": "homework.md", + "attr": { + "data-background": "../img/whiteBG.jpg" } } ] diff --git a/slides/overview.md b/slides/overview.md new file mode 100644 index 0000000000000000000000000000000000000000..e91ed2f0313c6c7d148f6f67b24c7c92fd81f4b8 --- /dev/null +++ b/slides/overview.md @@ -0,0 +1,13 @@ +## Overview + +0. The Terminal +1. What is `git`? What is the use of `git`? <!--(5 min)//--> +2. GitHub and GitLab <!--(5min)//--> +3. Installation of `git` +4. The 5 essential commands <!--(10 min)//--> + * `pull` / `status` / `add` / `commit` / `push` +5. Branches <!--(10 min)//--> +6. Forks <!--(10 min)//--> +7. Best practices +8. Practical session <!--(40 min)//--> +9. Evaluation <!--(10 min)//--> diff --git a/slides/part-2-git-intro.md b/slides/part-2-git-intro.md deleted file mode 100644 index 5d2c08dd8c2e8727f1500f6a2d03c94af0e16bbd..0000000000000000000000000000000000000000 --- a/slides/part-2-git-intro.md +++ /dev/null @@ -1,79 +0,0 @@ -## Overview - -0. The Linux Terminal -1. What is `git`? Why do I need it? (5 min) -2. GitHub and GitLab (5min) - * Practical session (5 min) - - GitLab interface - - GitHub interface -3. The 5 essential commands (10 min) - * Practical session (15 min) - - init - - clone - - add - - -4. Branches (10 min) - * Practical session (10 min) -5. Forks (10 min) - * Practical session (10 min) -6. Evaluation (10 min) - - -## The Linux Terminal - -Starting the terminal presents itself with a line where you can enter a command: -```sh -michael@myComputer> -``` -Often written, for covenience, as: -```sh -$ -``` -When you open your terminal (git shell) and unless otherwise configured, you are located -in your home directory, denoted as `~/`. - - -## Essential Linux commands - -List the contents of a directory -```sh -$ ls -``` - -Change the directory to a specific folder -```sh -$ cd myDirectory -``` - -Change the directory 1 level and 2 levels up -```sh -$ cd .. -$ cd ../.. -``` -Create a directory -```sh -$ mkdir myNewDirectory -``` - - -## What is `git`? Why do I need it? - - - - - -Designed and implemented in 2005 by **Linus Torvalds** - -`git` is a version tracking system, essentially for code. -Collaborative platform for code development - - - -## The 5 essential commands - -`pull, status, add, commit, push` (P-SAC-P) - -note: - Put your speaker notes here. - You can see them pressing 's'. - Fullscreen can be activated by typing 'f'. diff --git a/slides/part-3-installation.md b/slides/part-3-installation.md deleted file mode 100644 index c5d17b124c27e2f099e5f4f300a70e3cb3286548..0000000000000000000000000000000000000000 --- a/slides/part-3-installation.md +++ /dev/null @@ -1,25 +0,0 @@ -## Installation - -<img src="img/github_app.png" class="as-is" height="300" /> - -[mac.github.com](http://mac.github.com) ou [windows.github.com](http://windows.github.com) - -note: - Les participants téléchargent le logiciel Github + installation. - - -## Configuration - -```shell -$ git config --global user.name "Sebastien Saunier" -$ git config --global user.email "seb@saunier.me" -$ git config -l -``` - - -## Prêt ? - -```shell -$ git --version -# git version 1.8.5 -``` diff --git a/slides/part-4-first-repo.md b/slides/part-4-first-repo.md deleted file mode 100644 index 6b26b7e396d292dfee116aab94a1df4dd27ece02..0000000000000000000000000000000000000000 --- a/slides/part-4-first-repo.md +++ /dev/null @@ -1,143 +0,0 @@ -## The 5 commands - -```shell -$ git init -$ git status -$ git add -$ git diff -$ git commit -$ git log -``` -note: - Voici les commandes que nous allons apprendre - - -## Nouveau projet : Listes - -<div class="fragment"> -Créer l'espace de travail - -```shell -$ cd -$ mkdir workspace -$ cd workspace -``` - -<div class="fragment"> -Puis le dossier du nouveau projet - -```shell -$ mkdir listes -$ cd listes -$ git init -``` - - -## Nouveau fichier - -Créer le fichier `courses.txt` - -<div class="fragment"> -```shell -$ git status -``` - -<div class="fragment"> -```shell -$ git add courses.txt -$ git status -``` - -<div class="fragment"> -```shell -$ git commit -m "Creation de la liste de courses" -$ git status -``` - -note: - Pas besoin de serveur, pas besoin de connexion Internet - - -## Modification de fichier - -Modifier le fichier `courses.txt` - -<div class="fragment"> -```shell -$ git status -``` - -<div class="fragment"> -```shell -$ git diff courses.txt -``` - -<div class="fragment"> -```shell -$ git add courses.txt -$ git status -``` - -<div class="fragment"> -```shell -$ git commit -m "Ajout du beurre" -$ git status -``` - -<div class="fragment"> -```shell -$ git log -``` - - -## Que s'est-il passé ? - - -## Espace de travail - -_working directory_ - -```shell -$ git status - # Changes not staged for commit: -``` - - -## Zone de transit - -_index_ ou _staging area_ - -```shell -$ git status - # Changes to be commited: -``` - - -<img src="img/git-0-start.png" class="as-is" /> - - -<img src="img/git-1-dirty.png" class="as-is" /> - - -<img src="img/git-2-add.png" class="as-is" /> - - -<img src="img/git-3-commit.png" class="as-is" /> - - -## Et dans l'autre sens ? - - -<img src="img/git-1-dirty.png" class="as-is" /> - - -<img src="img/git-4-checkout.png" class="as-is" /> - - -<img src="img/git-2-add.png" class="as-is" /> - - -<img src="img/git-5-reset.png" class="as-is" /> - - -## Rinse and Repeat diff --git a/slides/part-5-branches.md b/slides/part-5-branches.md deleted file mode 100644 index ab002d29218931f63734f9807307c79fd29ffcab..0000000000000000000000000000000000000000 --- a/slides/part-5-branches.md +++ /dev/null @@ -1,55 +0,0 @@ -## Branches - -Expérimentez en toute sécurité - - -<img src="img/branch-0-master.png" class="as-is" /> - - -## Une branche = Une fonctionnalité - - -```shell -$ git checkout -b noel -``` -<img src="img/branch-1-checkout-b.png" class="as-is" /> - - -## Navigation - -Lister les branches -```shell -$ git branch -``` - -Se positionner dans une branche -```shell -$ git checkout <branch_name> -``` - - -```shell -$ git commit -``` -<img src="img/branch-2-commit.png" class="as-is" /> - - -## Fusion -### En anglais, _merge_ - - -```shell -$ git checkout master -$ git diff master..noel -$ git merge noel -``` -<img src="img/branch-3-merge.png" class="as-is" /> - - -## Nettoyage - - -```shell -$ git branch -d noel -``` -<img src="img/branch-4-br-d.png" class="as-is" /> diff --git a/slides/part-6-remote.md b/slides/part-6-remote.md deleted file mode 100644 index 0f6d346946f4c53858c0c3bc21af5c8d985d9822..0000000000000000000000000000000000000000 --- a/slides/part-6-remote.md +++ /dev/null @@ -1,52 +0,0 @@ -## Remote - -Parlons de dépôt *distant* - - -<img src="img/remote-0-master.png" class="as-is" /> - - -<img src="img/remote-1-remote.png" class="as-is" /> - - -## Héberger un dépôt distant ? -Github (Ou [BitBucket](https://bitbucket.org/)) - - -## Ajouter une _remote_ - -```shell -$ git remote add origin git@github.com:<user>/<proj>.git -$ git remote -v -``` - - -```shell -$ git push origin master -``` -<img src="img/remote-2-push.png" class="as-is" /> - - -## Récupérer les changements - -```shell -$ git checkout master # Aller sur la branche master -$ git status # Est-ce propre? (Bien sûr!) -$ git pull origin master # Récupérer le travail - # de l'équipe -``` - - -## _Sync Branch_ -Terminologie de l'application GitHub - - -## Conflits - - -## Pull Requests -Ou comment utiliser GitHub pour vos revues de code - - -## Fork -Contribuez à l'open source diff --git a/slides/part-7-github-pages.md b/slides/part-7-github-pages.md deleted file mode 100644 index 76259f13d054d285a317478cd3d84561eb01e629..0000000000000000000000000000000000000000 --- a/slides/part-7-github-pages.md +++ /dev/null @@ -1,27 +0,0 @@ -## Dépôt magique - -`<user>.github.io` - -`master => http://<user>.github.io/` - - -## Branche magique - -Tous les autres dépôt GitHub: - -`gh-pages => http://<user>.github.io/<repository>/` - - -## Action! - -Un simple fichier `index.html` suffit :) - - -## Marque blanche - -`http://<user>.github.io => http://your.domain` - -Utilisez un fichier `CNAME` à la racine du dépôt. -[Détails](https://help.github.com/articles/setting-up-a-custom-domain-with-pages) - -Exemple: [ssaunier.github.io/CNAME](https://github.com/ssaunier/ssaunier.github.io/blob/master/CNAME) diff --git a/slides/part-8-thanks.md b/slides/part-8-thanks.md deleted file mode 100644 index 9e575cbbe20ec175f5e0e3341f6c36be6c2d9b15..0000000000000000000000000000000000000000 --- a/slides/part-8-thanks.md +++ /dev/null @@ -1,8 +0,0 @@ -Laurent Heirendt - - - -Sylvain Arreckx - - -Cheat sheet : [Web](http://rogerdudler.github.io/git-guide/index.html) or [PDF](http://rogerdudler.github.io/git-guide/files/git_cheat_sheet.pdf) prepared by [@rogerdudler](https://github.com/rogerdudler) diff --git a/slides/ready.md b/slides/ready.md new file mode 100644 index 0000000000000000000000000000000000000000..8083fdaa8ddbc611f3e2933917370f0e3e44ef82 --- /dev/null +++ b/slides/ready.md @@ -0,0 +1,5 @@ +## Ready to practice? + +<br>Go to https://github.com/uni-lu/group_members + +<br>And follow the instructions in the `README` file. diff --git a/slides/thanks.md b/slides/thanks.md new file mode 100644 index 0000000000000000000000000000000000000000..4f65b5d21da4dd42746de529b2f2e0103a140140 --- /dev/null +++ b/slides/thanks.md @@ -0,0 +1,11 @@ +### References + +[1]: **Git** Book: +https://git-scm.com/book/en/v2 + +<br>[2]: GitHub training services: https://services.github.com/training/ + + +### Cheat sheet +[Web](http://rogerdudler.github.io/git-guide/index.html) or [PDF](http://rogerdudler.github.io/git-guide/files/git_cheat_sheet.pdf) + diff --git a/slides/the_terminal.md b/slides/the_terminal.md new file mode 100644 index 0000000000000000000000000000000000000000..30844f9443182e47adcbcfa2a5c41a9cd74c9c76 --- /dev/null +++ b/slides/the_terminal.md @@ -0,0 +1,65 @@ +## The Terminal (shell) + +Starting the terminal presents itself with a line where you can enter a command +```bash +cesar@myComputer> +``` + +<div class="fragment"> +<br> +Often written, for covenience, as +```bash +$ +``` + +<br> +When you open your terminal (shell), you are located +in your home directory (unless otherwise configured), denoted as `~/`. + + +## Essential Linux commands + +List the contents of a directory +```bash +$ ls +``` + +<div class="fragment"> +<br> +Create a directory +```bash +$ mkdir myNewDirectory +``` + +<div class="fragment"> +<br> +Change the directory to a specific folder +```bash +$ cd myNewDirectory +``` + + +<br> +Change the directory 1 level and 2 levels up +```bash +$ cd .. +# 1 level up + +$ cd ../.. +# 2 levels up +``` + +<div class="fragment"> +<br> +Move a file or a directory +```bash +$ mv myFile.m myNewDirectory/. +``` + +<div class="fragment"> +<br> +Rename a file or a directory +```bash +$ mv myFile.m myNewFile.m +$ mv myNewDirectory myDirectory +``` diff --git a/slides/what_is_git.md b/slides/what_is_git.md new file mode 100644 index 0000000000000000000000000000000000000000..649f5c9462ab97edaa9ebd5ef6514ec9860b3d91 --- /dev/null +++ b/slides/what_is_git.md @@ -0,0 +1,25 @@ +## What is `git`? + +<!--  --> + +`git` is a **version control system** (VCS) for tracking changes in computer files and coordinating work on those files among multiple people [1]. + +<br><br><br>Designed and implemented in 2005 by **Linus Torvalds** + + + +<div align="left"><small>[1] *https://en.wikipedia.org/wiki/Git*</small></div> + + +## What is the use of `git`? + +* No need to fully rewrite code; **reuse code** and **save time** +* Keep the changes you made over time (**history**) +* Allows you to **backtrack** (if necessary) and undo unwanted changes +* Easily **add contributions** of your collaborators to the main code base + +note: + +Other points to mention: +* git shall not be considered as a nuisance, but as a tool that should help to track and trace the code. +* git is not to track performance. Not using it shows exactly the opposite.