Skip to content

changes in presentation_inheritance #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

changes in presentation_inheritance #23

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6e2458
Merge pull request #1 from coders-school/master
Marcinati Jun 15, 2020
55470bb
Merge pull request #14 from coders-school/master
Marcinati Jun 15, 2020
847829e
Merge pull request #33 from coders-school/master
Marcinati Jun 23, 2020
b5e3c7f
unnecessary <div>, keyboard
Marcinati Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions module2/presentation_inheritance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ private:
GraphicsCard graphics_card_;
Memory memory_;
Screen screen_;
Keyboard keyboard_;
};
```

Expand Down Expand Up @@ -125,7 +124,6 @@ public:

private:
Screen screen_;
Keyboard keyboard_;
};
```
<!-- .element: class="fragment fade-in" -->
Expand Down Expand Up @@ -169,20 +167,6 @@ Załóżmy, że dodajemy klasę `Screen`. Klasa ta wyświetla na bieżąco inter
Chcemy też stworzyć klasę reprezentującą ekran dotykowy - `TouchScreen`, który również umożliwia odczyt akcji od użytkownika i ich wyświetlanie.
<!-- .element: class="fragment fade-in" -->

<style>
.container {
display: flex;
}
.col {
flex: 1;
margin: 1%;
}
</style>

<div class="container">

<div class="col">
Comment on lines -172 to -184
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you want it to be one column only? :)
It's not visible on GH I guess but it is in a presentation.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pr

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

html is visible on https://coders.school/edu/courses/obiektowosc-2-dziedziczenie-interfejsy-klasy-abstrakcyjne/lesson/dziedziczenie/

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I haven't seen it. I'll do this in another way. Let me close this PR and deliver changes on my own.


```cpp
class Screen {
public:
Expand All @@ -196,10 +180,6 @@ private:
```
<!-- .element: class="fragment fade-in" -->

</div>

<div class="col">

```cpp
class TouchScreen {
public:
Expand All @@ -215,10 +195,6 @@ private:
```
<!-- .element: class="fragment fade-in" -->

</div>

</div>

### Jak uprościć powyższy kod?
<!-- .element: class="fragment fade-in" -->

Expand Down