Merge branch 'master' of https://bitbucket.org/PekopT/archilance into mukhtar

archilance/settings/prod.py

@@ -1,3 +1,18 @@
 from .base import *
 
-DEBUG = False
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'archilance',
+        'USER': 'postgres',
+        'PASSWORD': 'vfhbyrf',
+        'HOST': 'localhost',
+        'PORT': '',
+    }
+}
+
+
+DEBUG = True
+TEMPLATE_DEBUG = True
+SECRET_KEY = 'vb6@b9zj7^f!^+x*e8=e!oundyu1!e*&0i(3gu2xwo4%fx4h&n'

assets/css/main.css

@@ -412,7 +412,7 @@ ul li {
     width: 100%;
     background-color: #F2F2F2;
     position: relative;
-    margin-bottom: 140px;
+    /*margin-bottom: 140px;*/
 }
 
 .scoreButtons > p {
@@ -541,6 +541,8 @@ footer {
     width: 100%;
     position: relative;
     background-color: #F7F7F7;
+    margin-top: 80px;
+    float: left;
 }
 
 footer:after {
@@ -1048,7 +1050,7 @@ footer:after {
 
 .pagin {
     text-align: center;
-    margin: 30px 0 30px 0;
+    margin: 30px 0 0px 0;
 }
 
 .pagin nav {
@@ -1650,10 +1652,11 @@ input[type="checkbox"]:checked + span {
 
 .menuUser ul {
     float: left;
+    width: 100%;
 }
 
 .menuUser ul li {
-    width: 101%;
+    width: 100%;
     margin-top: 1px;
     position: relative;
     background-color: #F1F1F1;
@@ -3262,7 +3265,7 @@ input[type="checkbox"]:checked + span {
     width: 100%;
     border-top: 1px solid #DADADA;
     border-bottom: 1px solid #DADADA;
-    margin: 18px 0 80px; 0;
+    margin: 18px 0 0px 0;
     float: left;
 }
 
@@ -4346,7 +4349,7 @@ input[type="checkbox"]:checked + span {
     width: 100%;
     float: left;
     margin: 0 0 80px 0;
-    padding: 67px 0 15px 0;
+    padding: 67px 0 0 0;
     background-color: #ddd;
     text-align: center;
 }
@@ -5703,4 +5706,30 @@ input[type="radio"]:checked + span {
 #order-stages > div:nth-last-child(2), #order-stages > div:last-child{
     border: none;
 }
+.linkSort button{
+    font-size: 14px;
+    font-family: 'Arial-MT-Regular', sans-serif;
+    float: left;
+    color: #6b6b6b;
+    padding: 11px 23px;
+    border-radius: 40px;
+    margin-right: 6px;
+    border: 1px solid #c2c2c2;
+    background-color: #fff;
+}
+.linkSort button:after{
+    content: "\e252";
+    font-family: 'Glyphicons Halflings';
+    position: relative;
+    right: -5px;
+    top: 3px;
+    font-style: normal;
+    font-weight: normal;
+    line-height: 1;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+}
+.linkSort button:focus{
+    outline: none;
+}
 /*end_new*/