Skip to content

Commit

Permalink
Próba naprawienia konfliktów
Browse files Browse the repository at this point in the history
  • Loading branch information
stsdc committed Oct 25, 2015
2 parents 3882bab + 2e7ff32 commit aeed5d2
Show file tree
Hide file tree
Showing 44 changed files with 4,714 additions and 1,110 deletions.
4 changes: 1 addition & 3 deletions author.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
$current_member = (isset($_GET['author_name'])) ? get_user_by('slug', $author_name) : get_userdata(intval($author));
global $wp_query;
$current_member = $wp_query->get_queried_object();
$project_count = 0;
// project_counter();

//dla sprawdzenia konkretnej roli, wrzucamy je do zmiennych
$synergia_member = in_array( 'synergia_member', (array) $current_member->roles );
Expand Down Expand Up @@ -55,7 +55,6 @@
if( $items->have_posts() ) {
while( $items->have_posts() ) {
$items->the_post();
project_count($current_member->ID, $items->found_posts);
?>
<div class="post-list-item ">
<div class="thumb">
Expand All @@ -77,7 +76,6 @@
}
}
else {
project_count($current_member->ID, 0);
echo 'Nic a nic';
}
?>
Expand Down
2 changes: 1 addition & 1 deletion css/admin.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion css/main.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions css/main.css.map

Large diffs are not rendered by default.

119 changes: 119 additions & 0 deletions css/scss/_animate.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
@charset "UTF-8";

/*!
Animate.css - http://daneden.me/animate
Licensed under the MIT license - http://opensource.org/licenses/MIT
Copyright (c) 2015 Daniel Eden
*/

.animated {
-webkit-animation-duration: 1s;
animation-duration: 1s;
-webkit-animation-fill-mode: both;
animation-fill-mode: both;
}

.animated.infinite {
-webkit-animation-iteration-count: infinite;
animation-iteration-count: infinite;
}

.animated.hinge {
-webkit-animation-duration: 2s;
animation-duration: 2s;
}
@-webkit-keyframes slideInLeft {
from {
-webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0);
visibility: visible;
}

to {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
}

@keyframes slideInLeft {
from {
-webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0);
visibility: visible;
}

to {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
}

.slideInLeft {
-webkit-animation-name: slideInLeft;
animation-name: slideInLeft;
}

@-webkit-keyframes slideInRight {
from {
-webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0);
visibility: visible;
}

to {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
}

@keyframes slideInRight {
from {
-webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0);
visibility: visible;
}

to {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
}

.slideInRight {
-webkit-animation-name: slideInRight;
animation-name: slideInRight;
}

@-webkit-keyframes fadeInUp {
from {
opacity: 0;
-webkit-transform: translate3d(0, 100%, 0);
transform: translate3d(0, 100%, 0);
}

to {
opacity: 1;
-webkit-transform: none;
transform: none;
}
}

@keyframes fadeInUp {
from {
opacity: 0;
-webkit-transform: translate3d(0, 100%, 0);
transform: translate3d(0, 100%, 0);
}

to {
opacity: 1;
-webkit-transform: none;
transform: none;
}
}

.fadeInUp {
-webkit-animation-name: fadeInUp;
animation-name: fadeInUp;
}
Loading

0 comments on commit aeed5d2

Please sign in to comment.