Skip to content
2 changes: 1 addition & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h1 class="brand_name">
</ul>

<div class="wrapper cntr">
<p>Copyright © <span id="copyright-year"></span> | <a href="#">Privacy Policy</a>
<p>Copyright &copy; <span id="copyright-year"></span>
</div>
</div>
</footer>
2 changes: 0 additions & 2 deletions _includes/homepage/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ <h5 class="color4"><a href="#">Androidzie, Qt, Windows Phone.</a></h5>
<h3>Języki programowania</h3>
<h5 class="color4"><a href="#">Java, C++ i ObjectiveC, a wkrótce także .Net</a></h5>
</div>


</div>
</div>
</section>
7 changes: 3 additions & 4 deletions _includes/homepage/contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ <h5 class="color5">Polsko-Japońska Akademia
<dl class="dlist1">
<dt>Telefon:</dt>
<dd>
<a href="callto:#"> +48 22 58 44 500 </a>
<a href="callto:+48225844500">+48 22 58 44 500</a>
</dd>
<dt>E-mail:</dt>
<dd>
<a href="mailto:#"> pjatk@pja.edu.pl</a>
<a href="mailto:pjatk@pja.edu.pl">pjatk@pja.edu.pl</a>
</dd>
</dl>
</div>

<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12 wow fadeInRight mobile-cntr">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12 wow fadeInRight mobile-cntr">
<h3 class="mod1"><i class="fa-envelope-o icon3 mod1"></i> <span>Napisz do nas</span>
</h3>

Expand Down Expand Up @@ -49,6 +49,5 @@ <h3 class="mod1"><i class="fa-envelope-o icon3 mod1"></i> <span>Napisz do nas</s
</div>
</div>
</div>

</div>
</section>
9 changes: 3 additions & 6 deletions _includes/homepage/labs.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<section class="well3 bg4">
<div class="container">
<h2 class="wow fadeInLeft">OPIS LABORATORIUM</h2>

<div class="row">
<div class="col-md-6 col-sm-12 col-xs-12 wow fadeInLeft">
<div class="col-md-6 col-sm-12 col-xs-12 wow fadeInLeft">
<p>Laboratorium specjalizacji podlega nieustannemu rozwojowi finansowanemu z prac badawczych,
statutowych i funduszy uczelni. Przykładem tego procesu jest pracownia 133 wyposażona w
komputery Apple wspomagające tworzenie oprogramowania w oparciu o język ObjectiveC. </p>
Expand All @@ -12,22 +11,20 @@ <h2 class="wow fadeInLeft">OPIS LABORATORIUM</h2>
studentów, jest stale aktualizowane. Obecnie można wymienić urządzenia: </p>
</div>

<div class="col-md-3 col-sm-6 col-xs-12 wow fadeInRight">
<div class="col-md-3 col-sm-6 col-xs-12 wow fadeInRight">
<ul class="marked-list">
<li><a href="#">Nokia Lumia</a></li>
<li><a href="#">Samsung Galaxy</a></li>
<li><a href="#">Nexu</a></li>
</ul>
</div>
<div class="col-md-3 col-sm-6 col-xs-12 wow fadeInRight">
<div class="col-md-3 col-sm-6 col-xs-12 wow fadeInRight">
<ul class="marked-list">
<li><a href="#">Apple</a></li>
<li><a href="#">kostki Dice+</a></li>
<li><a href="#">Dell Venue 8</a></li>
</ul>
</div>


</div>
</div>
</section>
4 changes: 0 additions & 4 deletions _includes/homepage/projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ <h2>Projekty studentów</h2>
<div class="item">
<blockquote>
<h5>PJATK Android</h5>

<p>
<img src="/images/app-pjwstk-android.png" style="width: 250px">
</p>
Expand All @@ -18,15 +17,12 @@ <h5>PJATK Android</h5>
<div class="item">
<blockquote>
<h5>PJATK Apple</h5>

<p>
<img src="/images/app-pjwstk-apple.png" style="width: 250px">
</p>
<cite>PJATK <br><a href="https://itunes.apple.com/pl/app/pjwstk/id828657671?mt=8">itunes.apple.com</a></cite>
</blockquote>
</div>

</div>

</div>
</section>
3 changes: 0 additions & 3 deletions _includes/homepage/videos.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ <h5>3DprinterBuild</h5>
</a>
<h5>Halloween 2015</h5>
</div>

<div class="col-lg-4 wow fadeInLeft" data-wow-delay="2.5s">
<a class="various fancybox.iframe" href="http://www.youtube.com/embed/8zg7UOzygos?autoplay=1">
<div class="video-img" >
Expand All @@ -56,7 +55,5 @@ <h5>Halloween 2015</h5>
<h5>That's how we learn with Tomaszew</h5>
</div>
</div>


</div>
</section>
8 changes: 4 additions & 4 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
{% include head.html %}
<body>
<div class="page">
{% include header.html %}
{{ content }}
{% include footer.html %}
</div>
{% include header.html %}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tu coś się źle wcięło chyba.

{{ content }}
{% include footer.html %}
</div>
<script src="/js/script.js"></script>
</body>
</html>
22 changes: 22 additions & 0 deletions _sass/_mixins.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
@mixin border-radius($radius) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Chyba żadne z tych prefiksów nie są już potrzebne wg http://shouldiprefix.com

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Usunięty mixin dla border-radius

-moz-border-radius: $radius;
-o-border-radius: $radius;
border-radius: $radius;
}

@mixin box-shadow($shadow...) {
-moz-box-shadow: $shadow;
-o-box-shadow: $shadow;
box-shadow: $shadow;
}

@mixin transition($transition...) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

transition też nie trzeba prefixować wg http://shouldiprefix.com, jest jakiś inny powód żeby to zostawić?

-moz-transition: $transition;
-o-transition: $transition;
transition: $transition;
}

@mixin border-box() {
-moz-box-sizing: border-box;
box-sizing: border-box;
}
5 changes: 5 additions & 0 deletions _sass/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
$mobile-breakpoint: 991px;

$color-default: #c2c2c2; //szary domyslny
$color-default-dark: #f4f5f5; //szary ciemniejszy
$color-primary: #29d9c2; //czerwony
16 changes: 6 additions & 10 deletions _sass/camera.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "_mixins.scss";

/*========================================================
Camera
=========================================================*/
Expand Down Expand Up @@ -94,9 +96,9 @@
}

.camera_loader {
@include border-radius(18px);
background: #fff url(../images/camera-loader.gif) no-repeat center;
border: 1px solid #ffffff;
border-radius: 18px;
height: 36px;
left: 50%;
overflow: hidden;
Expand Down Expand Up @@ -193,11 +195,9 @@
height: 100%;
}
.camera_caption .container {
@include border-box();
color: #fff;
text-align: center;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.camera_caption .container h2 {
color: #fff;
Expand Down Expand Up @@ -245,23 +245,19 @@
text-align: center;
}
.camera_pag_ul li {
@include border-radius(50%);
@include border-box();
display: inline-block;
width: 34px;
height: 34px;
line-height: 34px;
text-align: center;
cursor: pointer;
-webkit-border-radius: 50%;
-moz-border-radius: 50%;
border-radius: 50%;
background: none;
-moz-transition: 0.3s all ease;
-o-transition: 0.3s all ease;
-webkit-transition: 0.3s all ease;
transition: 0.3s all ease;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
border: 5px solid #fff;
}
.camera_pag_ul li.cameracurrent, .camera_pag_ul li:hover {
Expand Down
7 changes: 3 additions & 4 deletions _sass/owl-carousel.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "_mixins.scss";

/*========================================================
Owl Carousel
=========================================================*/
Expand Down Expand Up @@ -203,7 +205,6 @@
height: 100%;
background-position: center center;
background-repeat: no-repeat;
-webkit-background-size: contain;
-moz-background-size: contain;
-o-background-size: contain;
background-size: contain;
Expand Down Expand Up @@ -263,13 +264,11 @@
margin-top: 32px;
}
.owl-dots .owl-dot {
@include border-radius(50%);
display: inline-block;
width: 8px;
height: 8px;
background: #c2c2c2;
-webkit-border-radius: 50%;
-moz-border-radius: 50%;
border-radius: 50%;
}
.owl-dots .owl-dot:hover, .owl-dots .owl-dot.active {
background: #36393c;
Expand Down
43 changes: 12 additions & 31 deletions _sass/style-pjatk.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import "_mixins.scss";

/* camera.scss
=========================================================*/
Expand Down Expand Up @@ -59,6 +60,8 @@
/* Mail Form Validation
========================================================*/
.mfValidation {
@include box-shadow(2px 2px 2px 0 rgba(0, 0, 0, 0.1));
@include border-radius(5px);
-moz-transform-origin: 0% 50%;
-ms-transform-origin: 0% 50%;
-o-transform-origin: 0% 50%;
Expand All @@ -73,12 +76,6 @@
-ms-animation: notifanim-fo 0.4s cubic-bezier(0.55, 0, 0.1, 1) forwards;
-o-animation: notifanim-fo 0.4s cubic-bezier(0.55, 0, 0.1, 1) forwards;
animation: notifanim-fo 0.4s cubic-bezier(0.55, 0, 0.1, 1) forwards;
-webkit-box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.1);
-moz-box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.1);
box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.1);
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
position: absolute;
top: -10px;
left: 20px;
Expand Down Expand Up @@ -133,6 +130,7 @@
}
@media (max-width: 767px) {
.mfValidation {
@include box-shadow(none);
text-align: right;
top: auto;
top: -18px;
Expand All @@ -143,9 +141,6 @@
padding: 0;
margin: 0 0 3px;
min-height: 0;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
.mfValidation:before {
display: none;
Expand Down Expand Up @@ -486,6 +481,8 @@
}

.mfProgress .msg {
@include border-box();
@include box-shadow(2px 2px 2px 0 rgba(0, 0, 0, 0.5));
-moz-transform-origin: 0% 50%;
-ms-transform-origin: 0% 50%;
-o-transform-origin: 0% 50%;
Expand All @@ -500,12 +497,6 @@
-ms-animation: notifanim-fo 0.4s ease-in-out forwards;
-o-animation: notifanim-fo 0.4s ease-in-out forwards;
animation: notifanim-fo 0.4s ease-in-out forwards;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
-webkit-box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.5);
-moz-box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.5);
box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.5);
position: absolute;
padding: 10px;
border-radius: 27px;
Expand Down Expand Up @@ -982,6 +973,7 @@ footer .brand_name span {
transform: translateY(-30%);
}
.subsribe_mailform .mfValidation {
@include box-shadow(none);
-moz-transform-origin: 0% 50%;
-ms-transform-origin: 0% 50%;
-o-transform-origin: 0% 50%;
Expand All @@ -996,9 +988,6 @@ footer .brand_name span {
-ms-animation: notifanim-fo 0.4s cubic-bezier(0.55, 0, 0.1, 1) forwards;
-o-animation: notifanim-fo 0.4s cubic-bezier(0.55, 0, 0.1, 1) forwards;
animation: notifanim-fo 0.4s cubic-bezier(0.55, 0, 0.1, 1) forwards;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
position: absolute;
top: 5px;
left: auto;
Expand Down Expand Up @@ -1054,6 +1043,7 @@ footer .brand_name span {
}
@media (max-width: 767px) {
.subsribe_mailform .mfValidation {
@include box-shadow(none);
text-align: right;
top: auto;
left: auto;
Expand All @@ -1063,9 +1053,6 @@ footer .brand_name span {
padding: 0;
margin: 0 0 3px;
min-height: 0;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
.subsribe_mailform .mfValidation:before {
display: none;
Expand Down Expand Up @@ -1282,9 +1269,7 @@ footer .brand_name span {
}
}
.subsribe_mailform .mfControls .btn {
-webkit-border-radius: 30px;
-moz-border-radius: 30px;
border-radius: 30px;
@include border-radius(30px);
height: 79px;
padding: 28px 42px;
font-family: "Open Sans", sans-serif;
Expand Down Expand Up @@ -1403,6 +1388,9 @@ footer .brand_name span {
content: '\f058';
}
.subsribe_mailform .mfProgress .msg {
@include border-box();
@include border-radius(30px);
@include box-shadow(2px 2px 2px 0 rgba(0, 0, 0, 0.5));
-moz-transform-origin: 0% 50%;
-ms-transform-origin: 0% 50%;
-o-transform-origin: 0% 50%;
Expand All @@ -1417,15 +1405,8 @@ footer .brand_name span {
-ms-animation: notifanim-fo 0.4s ease-in-out forwards;
-o-animation: notifanim-fo 0.4s ease-in-out forwards;
animation: notifanim-fo 0.4s ease-in-out forwards;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
-webkit-box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.5);
-moz-box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.5);
box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.5);
position: absolute;
padding: 10px;
border-radius: 30px;
font-size: 14px;
line-height: 20px;
opacity: 0;
Expand Down
Loading