From bf24baa9538d852bbd8d8b36d93cbf52fbbe06be Mon Sep 17 00:00:00 2001
From: Alexander Kondratyev <alex@nder.work>
Date: Wed, 22 Mar 2017 22:11:14 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=B2?=
 =?UTF-8?q?=D0=BD=D0=B5=D1=88=D0=BD=D0=B5=D0=B3=D0=BE=20=D0=B2=D0=B8=D0=B4?=
 =?UTF-8?q?=D0=B0=20=D0=9A=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=B0=20?=
 =?UTF-8?q?=D0=9C=D0=9A=D0=A2=D0=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 trademark/models.py                           |  2 +-
 .../templates/trademark/nice_detail.html      |  2 +-
 .../templates/trademark/nices_catalog.html    |  2 +-
 zsite/static/less/nice.less                   | 29 ++++++++++---------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/trademark/models.py b/trademark/models.py
index a3702ae..ca24615 100644
--- a/trademark/models.py
+++ b/trademark/models.py
@@ -95,7 +95,7 @@ class Nice(models.Model):
 
                     alphabet[letter][first_word] = ', '.join(set(words))
             letter_items = alphabet[letter]
-            alphabet[letter] = sorted(letter_items.items(), key=lambda x: type(x[1]), reverse=True)
+            alphabet[letter] = sorted(letter_items.items(), key=lambda x: type(x[1]))
             # alphabet[letter] = letter_items.items()
 
         print alphabet
diff --git a/trademark/templates/trademark/nice_detail.html b/trademark/templates/trademark/nice_detail.html
index 183a5df..128ca0a 100644
--- a/trademark/templates/trademark/nice_detail.html
+++ b/trademark/templates/trademark/nice_detail.html
@@ -7,7 +7,7 @@
 <div class="row">
     <div class="col-xs-12 col-sm-8">
 
-    <h1><i class="fa {{ nice.glyph }}" aria-hidden="true"></i> <strong>Класс {{ nice.nice_id }}</strong> <small>{{ nice.title }}</small></h1>
+    <h1 class="nice-title"><i class="fa {{ nice.glyph }}" aria-hidden="true"></i> <strong>Класс {{ nice.nice_id }}</strong> <small>{{ nice.title }}</small></h1>
 
     <ol class="list-unstyled list-inline breadcrumb" vocab="http://schema.org/" typeof="BreadcrumbList">
         <li property="itemListElement" typeof="ListItem">
diff --git a/trademark/templates/trademark/nices_catalog.html b/trademark/templates/trademark/nices_catalog.html
index 74d2c42..f894b45 100644
--- a/trademark/templates/trademark/nices_catalog.html
+++ b/trademark/templates/trademark/nices_catalog.html
@@ -44,7 +44,7 @@
     <ul class="nice-classes-list list-unstyled list-inline">
         {% for nice in nices %}
         <li>
-            <h4><i class="fa {{ nice.glyph }}" aria-hidden="true"></i> <a href="{% url 'trademark:nice-detail' pk=nice.id %}">Класс {{ nice.nice_id }}</a> <small>{{ nice.title }}</small></h4>
+            <h4 class="nice-title"><i class="fa {{ nice.glyph }}" aria-hidden="true"></i> <a href="{% url 'trademark:nice-detail' pk=nice.id %}">Класс {{ nice.nice_id }}</a> <small>{{ nice.title }}</small></h4>
             <p>{{ nice.description }}</p>
             <p>Примеры {% if nice.nice_id > 38 %}услуг{% else %}товаров{% endif %} из класса:</p>
             <ul class="nice-products-list list-inline">
diff --git a/zsite/static/less/nice.less b/zsite/static/less/nice.less
index 1bea347..1c7c25e 100644
--- a/zsite/static/less/nice.less
+++ b/zsite/static/less/nice.less
@@ -77,6 +77,22 @@
         }
     }
 }
+
+.nice-title {
+    i {
+        width: 25px;
+        vertical-align: middle;
+        text-align: right;
+
+        padding-right: 10px;
+    }
+
+    a {
+        margin-right: 10px;
+        margin-left: 5px;
+    }
+}
+
 .nice-landing {
     .trademark-search-block {
         h3 {
@@ -93,19 +109,6 @@
 
             h4 {
                 margin-left: -30px;
-
-                a {
-                    margin-right: 10px;
-                    margin-left: 5px;
-                }
-            }
-
-            i {
-                width: 25px;
-                vertical-align: middle;
-                text-align: right;
-
-                padding-right: 10px;
             }
         }