diff --git a/.gitignore b/.gitignore index 50ae82ee..d720fcdf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ __django +reValuate/db.sqlite3 +*.sqlite3 diff --git a/reValuate/db.sqlite3 b/reValuate/db.sqlite3 index 85e84453..bd917c24 100644 Binary files a/reValuate/db.sqlite3 and b/reValuate/db.sqlite3 differ diff --git a/reValuate/home/static/home/css/style.css b/reValuate/home/static/home/css/style.css index a590a13e..41859db9 100644 --- a/reValuate/home/static/home/css/style.css +++ b/reValuate/home/static/home/css/style.css @@ -80,7 +80,7 @@ header { height: 100%; width: 0; position: fixed; - z-index: 1; + z-index: 99; left: 0; top: 0; background-color: #469330; @@ -191,4 +191,64 @@ footer{ top: 50%; left: 50%; transform: translate(-50%, -50%); -} \ No newline at end of file +} + +@-webkit-keyframes text-shadow-pop-right { + 0% { + text-shadow: 0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555; + -webkit-transform: translateX(0); + transform: translateX(0) + } + + 100% { + text-shadow: 1px 0 #555,2px 0 #555,3px 0 #555,4px 0 #555,5px 0 #555,6px 0 #555,7px 0 #555,8px 0 #555; + -webkit-transform: translateX(-8px); + transform: translateX(-8px) + } +} + +@keyframes text-shadow-pop-right { + 0% { + text-shadow: 0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555,0 0 #555; + -webkit-transform: translateX(0); + transform: translateX(0) + } + + 100% { + text-shadow: 1px 0 #555,2px 0 #555,3px 0 #555,4px 0 #555,5px 0 #555,6px 0 #555,7px 0 #555,8px 0 #555; + -webkit-transform: translateX(-8px); + transform: translateX(-8px) + } +} + +.text-shadow-pop-right{-webkit-animation:text-shadow-pop-right .6s both;animation:text-shadow-pop-right .6s both} + +@-webkit-keyframes scale-in-center { + 0% { + -webkit-transform: scale(0); + transform: scale(0); + opacity: 1; + } + 100% { + -webkit-transform: scale(1); + transform: scale(1); + opacity: 1; + } +} +@keyframes scale-in-center { + 0% { + -webkit-transform: scale(0); + transform: scale(0); + opacity: 1; + } + 100% { + -webkit-transform: scale(1); + transform: scale(1); + opacity: 1; + } +} + +.scale-in-center { + -webkit-animation: scale-in-center 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both; + animation: scale-in-center 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both; +} diff --git a/reValuate/templates/base.html b/reValuate/templates/base.html index 86e64f24..9aa3130b 100644 --- a/reValuate/templates/base.html +++ b/reValuate/templates/base.html @@ -10,68 +10,67 @@ - + {% block optionalParams %} {% endblock %} {% block aboveNav %} {% endblock %} - -
+ +
×
Класация За нас {% if user.is_authenticated %} - Излез! + Излез! {% else %} Влез! {% endif %}

___

- {% if user.is_authenticated %} + {% if user.is_authenticated %} Качи Прогрес - {% endif %} - + {% endif %}
+ +
- - {% block content %} - {% endblock %} - - - + {% block content %} + {% endblock %} +
+ \ No newline at end of file diff --git a/reValuate/templates/leaderboard.html b/reValuate/templates/leaderboard.html index 2d33fef1..dc9d23c3 100644 --- a/reValuate/templates/leaderboard.html +++ b/reValuate/templates/leaderboard.html @@ -4,159 +4,74 @@ {% block optionalParams %} {% endblock %} {% block content %} -
-
-
- -

Най-много reCoins

-
-
-
    - {% for i, z in leaderboard.items %} -
  1. - {{ i }} - {{z}} reCoins -
    2. - {% endfor %} -
-
-
-
-
-
-
- -

Най-много качена медия

-
-
-
    - {% for i, z in user_media.items reversed %} -
  1. - {{ i }} - {{z}} снимки и видеа -
    2. - {% endfor %} -
-
-
-
+
+
+

reCoins Класация


+
    +{% for i, z in leaderboard.items %} + {% if forloop.counter == 1 %} +
  • {{ forloop.counter }}. {{ i }} има {{ z }}

    • + {% elif forloop.counter == 2 %} +
  • {{ forloop.counter }}. {{ i }} има {{ z }}

    • + + {% elif forloop.counter == 3 %} +
  • {{ forloop.counter }}. {{ i }} has {{ z }}

    • + + {% else %} +
  • {{ forloop.counter }}. {{ i }} has {{ z }}

    • +
+ {% endif %} +{% endfor %} +
{% endblock %} \ No newline at end of file