Merge remote-tracking branch 'origin/master'

remotes/origin/feature/LIL-711
nikita 7 years ago
commit 652142d8f7
  1. 1
      apps/user/templates/user/bonus-history.html
  2. 2
      project/templates/blocks/user_menu.html

@ -3,7 +3,6 @@
{% load rupluralize from plural %}
{% block content %}
{% include "../blocks/profile-menu.html" with active="bonuses" %}
<div class="section section_gray" style="padding-bottom: 0;">
<div class="section__center center center_sm">

@ -1,7 +1,7 @@
{% load static %} {% load thumbnail %}
{% load rupluralize from plural %}
{% if request.user.is_authenticated %}
<div class="header__bonuses" style="display: none">
<div class="header__bonuses">
<a class="header__bonuses-link" href="{% url 'user-bonuses' %}">
<img class="header__lil-coin-img" src="{% static 'img/lilcoin.png' %}" />
{{ request.user.bonus }}

Loading…
Cancel
Save