Skip to content

Commit 776e920

Browse files
committed
Fixes to the slides
1 parent 5a293f1 commit 776e920

File tree

2 files changed

+29
-16
lines changed

2 files changed

+29
-16
lines changed

Topics/04. Stylus/slides/README.md

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,16 @@
106106
- Stylus **selectors are absolutely the same as in regular CSS**
107107
- Every CSS code is valid Stylus code!
108108
- `.class`, `#id`, `tagName`
109+
- _Examples:_
110+
111+
```stylus
112+
#root .nav
113+
list-style-type none
114+
#root .nav .nav-item
115+
float left
116+
margin 0
117+
padding 0
118+
```
109119

110120
<!-- attr: { showInPresentation:true, style:'font-size: 0.8em' } -->
111121
<!-- # Selectors in Stylus -->
@@ -223,7 +233,7 @@
223233

224234
<!-- attr: { showInPresentation:true } -->
225235
<!-- # Stylus Features: Variables -->
226-
```styl
236+
```stylus
227237
/* Stylus */
228238
link-color = #ffffff;
229239
v-link-color = #646363;
@@ -234,7 +244,7 @@ a
234244
```
235245

236246

237-
```styl
247+
```css
238248
/* CSS */
239249
a {
240250
color: #fff;
@@ -431,17 +441,6 @@ box(border = none, bg = rgba(0, 0, 0, 0.7), size = 200px)
431441
box '1px solid black' rgba(123, 0, 0, 0.6) 100px
432442
```
433443

434-
<!-- attr: { showInPresentation:true } -->
435-
# @extend or Mixins?
436-
- Why both `mixins` and `@extend`?
437-
- `Mixins` have parameters and generate different code, based on the parameters
438-
- `@extend` provides a way to minify the number of classes on an element
439-
- Instead of adding `.clearfix` to all elements that clear, add it to the selector that the elements already have
440-
441-
<!-- attr: { class:'slide-section demo', showInPresentation:true, hasScriptWrapper:true } -->
442-
<!-- # Stylus Features: Mixins with Arguments
443-
## [Demo](https://github.com/TelerikAcademy/CSS/tree/master/Topics/04.%20Stylus/demos/08.%20mixins-with-args) -->
444-
445444
<!-- attr: { id:'selector-inheritance', showInPresentation:true, style:'font-size: 0.8em;' } -->
446445
# <a id="selector-inheritance"></a>Selector Inheritance
447446
- Selectors in Stylus can be inherited using `@extend`
@@ -484,7 +483,19 @@ box(border = none, bg = rgba(0, 0, 0, 0.7), size = 200px)
484483
## [Demo](https://github.com/TelerikAcademy/CSS/tree/master/Topics/04.%20Stylus/demos/09.%20selector-inheritance%28%40extend%29) -->
485484

486485

486+
<!-- attr: { showInPresentation:true } -->
487+
# @extend or Mixins?
488+
- Why both `mixins` and `@extend`?
489+
- `Mixins` have parameters and generate different code, based on the parameters
490+
- `@extend` provides a way to minify the number of classes on an element
491+
- Instead of adding `.clearfix` to all elements that clear, add it to the selector that the elements already have
492+
493+
<!-- attr: { class:'slide-section demo', showInPresentation:true, hasScriptWrapper:true } -->
494+
<!-- # Stylus Features: Mixins with Arguments
495+
## [Demo](https://github.com/TelerikAcademy/CSS/tree/master/Topics/04.%20Stylus/demos/08.%20mixins-with-args) -->
496+
487497
<!-- section start -->
498+
488499
<!-- attr: { class:'slide-section', showInPresentation:true } -->
489500
<!-- # Stylus: Scripting, Libraries and Importing -->
490501

@@ -546,6 +557,8 @@ body
546557
linear-gradient #333 #fff
547558
```
548559

560+
<!-- section start -->
561+
549562
<!-- attr: { class:'slide-section', showInPresentation:true } -->
550563
<!-- # Stylus Overview
551564
## Questions? -->
@@ -561,7 +574,7 @@ body
561574
- [facebook.com/TelerikAcademy](facebook.com/TelerikAcademy)
562575
- Telerik Software Academy Forums
563576
- forums.academy.telerik.com
564-
577+
565578
<!-- <img class="slide-image" showInPresentation="true" src="imgs/pic08.png" style="top:58.18%; left:90.52%; width:16.97%; z-index:-1" /> -->
566579
<!-- <img class="slide-image" showInPresentation="true" src="imgs/pic09.png" style="top:34.35%; left:68.14%; width:36.30%; z-index:-1" /> -->
567-
<!-- <img class="slide-image" showInPresentation="true" src="imgs/pic10.png" style="top:48.92%; left:75.91%; width:10.85%; z-index:-1" /> -->
580+
<!-- <img class="slide-image" showInPresentation="true" src="imgs/pic10.png" style="top:48.92%; left:75.91%; width:10.85%; z-index:-1" /> -->

Topics/04. Stylus/slides/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="https://rawgit.com/TelerikAcademy/Common/master/revealjs-theme/css/theme/black.css" id="theme">
1313
<link rel="stylesheet" href="https://rawgit.com/TelerikAcademy/Common/master/revealjs-theme/css/theme/telerik-academy-dark.css">
1414
<!-- Code syntax highlighting -->
15-
<link rel="stylesheet" href="https://rawgit.com/TelerikAcademy/Common/master/revealjs-theme/lib/css/github.css">
15+
<link rel="stylesheet" href="https://rawgit.com/TelerikAcademy/Common/master/revealjs-theme/lib/css/tomorrow.css">
1616
<!-- Printing and PDF exports -->
1717
<script>
1818
var link = document.createElement('link');

0 commit comments

Comments
 (0)