Merge pull request #72 from rafalp/develop

Fixes from develop

README.md

@@ -1,5 +1,4 @@
-Misago
-======
+# Misago [![Build Status](https://travis-ci.org/rafalp/Misago.png)](https://travis-ci.org/rafalp/Misago)
 
 Misago is an internet forum application written in Python and using Django as its foundation.
 Visit project homepage for discussion and demo: <http://misago-project.org>

deployment/settings.py

@@ -18,6 +18,12 @@ ADMIN_PATH = 'admincp'
 # System admins
 ADMINS = ()
 
+# Secret key is used by Django and Misago in hashes generation
+# YOU MUST REPLACE IT with random combination of characters
+# Make it messed up and long, this is example of good secret key:
+# JA*^Sd09as809!^*(DSA!K1m12o7ds8a791k1#@!829758!@@ii_*091)
+SECRET_KEY = 'CHANGE-ME!'
+
 # Database connection
 DATABASES = {
     'default': {
@@ -32,7 +38,7 @@ DATABASES = {
 
 # Override DB if we are in tests
 if 'test' in sys.argv:
-    DATABASES['default'] = {'ENGINE': 'django.db.backends.sqlite3'}
+    DATABASES['default'] = {'ENGINE': 'django.db.backends.sqlite3', 'NAME': 'db4testing'}
     SKIP_SOUTH_TESTS = True
 
 # Cache engine

misago/fixtures/captchasettings.py

@@ -8,9 +8,10 @@ settings_fixture = (
         'description': _("Those settings allow you to combat automatic registrations and spam messages on your forum."),
         'settings': (
             ('bots_registration', {
+                'value':        'no',
                 'type':         "string",
                 'input':        "choice",
-                'extra':        {'choices': [('', _("No protection")), ('recaptcha', _("reCaptcha")), ('qa', _("Question & Answer"))]},
+                'extra':        {'choices': [('no', _("No protection")), ('recaptcha', _("reCaptcha")), ('qa', _("Question & Answer"))]},
                 'separator':    _("Spambots Registrations"),
                 'name':         _("CAPTCHA type"),
                 'description':  _('CAPTCHA stands for "Completely Automated Public Turing test to tell Computers and Humans Apart". Its type of test developed on purpose of blocking automatic registrations.'),

static/cranefly/css/cranefly.css

@@ -881,7 +881,7 @@ footer .credits{color:#555555;font-size:90%;}footer .credits a:link,footer .cred
 .navbar-header .navbar-inner .navbar-blocks li a:hover.fresh,.navbar-header .navbar-inner .navbar-blocks li a:active.fresh,.navbar-header .navbar-inner .navbar-blocks li .btn-link:hover.fresh,.navbar-header .navbar-inner .navbar-blocks li .btn-link:active.fresh{background-color:#46a546;border-color:#378137;}
 .navbar-header .navbar-inner .navbar-blocks li a:hover i,.navbar-header .navbar-inner .navbar-blocks li a:active i,.navbar-header .navbar-inner .navbar-blocks li .btn-link:hover i,.navbar-header .navbar-inner .navbar-blocks li .btn-link:active i{background-image:url("../img/glyphicons-halflings-white.png");opacity:1;filter:alpha(opacity=100);}
 .navbar-header .navbar-inner .navbar-blocks li a:hover .label,.navbar-header .navbar-inner .navbar-blocks li a:active .label,.navbar-header .navbar-inner .navbar-blocks li .btn-link:hover .label,.navbar-header .navbar-inner .navbar-blocks li .btn-link:active .label{background-color:#eeeeee;color:#333333;}
-.navbar-header .navbar-inner .navbar-blocks li.user-profile a:link,.navbar-header .navbar-inner .navbar-blocks li.user-profile a:visited,.navbar-header .navbar-inner .navbar-blocks li.user-profile a:hover,.navbar-header .navbar-inner .navbar-blocks li.user-profile a:active{background:none;border:none;margin-right:8px;margin-top:5px;font-weight:bold;text-shadow:none;}.navbar-header .navbar-inner .navbar-blocks li.user-profile a:link img,.navbar-header .navbar-inner .navbar-blocks li.user-profile a:visited img,.navbar-header .navbar-inner .navbar-blocks li.user-profile a:hover img,.navbar-header .navbar-inner .navbar-blocks li.user-profile a:active img{background-color:#ffffff;border-radius:3px;-webkit-box-shadow:0px 0px 4px #eeeeee;-moz-box-shadow:0px 0px 4px #eeeeee;box-shadow:0px 0px 4px #eeeeee;margin-right:4px;width:32px;height:32px;position:relative;bottom:1px;}
+.navbar-header .navbar-inner .navbar-blocks li.user-profile a:link,.navbar-header .navbar-inner .navbar-blocks li.user-profile a:visited,.navbar-header .navbar-inner .navbar-blocks li.user-profile a:hover,.navbar-header .navbar-inner .navbar-blocks li.user-profile a:active{background:none;border:none;margin-right:8px;margin-top:5px;font-weight:bold;text-shadow:none;}.navbar-header .navbar-inner .navbar-blocks li.user-profile a:link img,.navbar-header .navbar-inner .navbar-blocks li.user-profile a:visited img,.navbar-header .navbar-inner .navbar-blocks li.user-profile a:hover img,.navbar-header .navbar-inner .navbar-blocks li.user-profile a:active img{border-radius:3px;margin-right:4px;width:32px;height:32px;position:relative;bottom:1px;}
 .navbar-header .navbar-inner .navbar-user-nav li .btn{padding:2px 8px;margin-left:8px;margin-top:13px;}.navbar-header .navbar-inner .navbar-user-nav li .btn:link,.navbar-header .navbar-inner .navbar-user-nav li .btn:active,.navbar-header .navbar-inner .navbar-user-nav li .btn:hover,.navbar-header .navbar-inner .navbar-user-nav li .btn:visited{color:#ffffff;}
 .navbar-header .navbar-inner .navbar-user-nav li .btn.btn-danger{text-shadow:0px 1px 0px #902d20;}.navbar-header .navbar-inner .navbar-user-nav li .btn.btn-danger:hover,.navbar-header .navbar-inner .navbar-user-nav li .btn.btn-danger:active,.navbar-header .navbar-inner .navbar-user-nav li .btn.btn-danger:focus{background-color:#e82c15;border-color:#d12813;}
 .navbar-header .navbar-inner .navbar-user-nav li .btn.btn-inverse{text-shadow:0px 1px 0px #0d0d0d;}.navbar-header .navbar-inner .navbar-user-nav li .btn.btn-inverse:hover,.navbar-header .navbar-inner .navbar-user-nav li .btn.btn-inverse:active,.navbar-header .navbar-inner .navbar-user-nav li .btn.btn-inverse:focus{background-color:#262626;border-color:#1a1a1a;}
@@ -998,11 +998,12 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:0.9;filter:alpha(opa
 .usercp .usercp-tabs li a:active,.usercp .usercp-tabs li a:hover{background-color:#3c85a3;color:#ffffff;text-shadow:0px 1px 0px #1a3946;}
 .usercp .usercp-tabs li.active a:link,.usercp .usercp-tabs li.active a:visited,.usercp .usercp-tabs li.active a:active,.usercp .usercp-tabs li.active a:hover{background-color:#cf402e;color:#ffffff;text-shadow:0px 1px 0px #672017;}
 .usercp .usercp-action .form-container{min-height:180px;}
-.usercp-avatar-menu{margin-bottom:0px;}.usercp-avatar-menu .media-object{background-color:#ffffff;border-radius:5px;margin-top:14px;width:125px;height:125px;}
+.usercp-avatar-menu{margin-bottom:0px;}.usercp-avatar-menu .media-object{border-radius:5px;margin-top:14px;width:125px;height:125px;}
 .usercp-avatar-menu .media-body{margin-left:153px;}.usercp-avatar-menu .media-body ul.unstyled{margin-left:-13px;}
-.usercp-avatar-select .usercp-avatar-gallery{margin:0px -14px;overflow:auto;padding-bottom-bottom:14px;}.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form{margin:0px;padding:0px;float:left;}.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar{margin:14px;padding:0px;}.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar,.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:active,.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:hover{opacity:1;filter:alpha(opacity=100);}.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar img,.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:active img,.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:hover img{background-color:#ffffff;opacity:1;filter:alpha(opacity=100);}
+.usercp-avatar-select .usercp-avatar-gallery{margin:0px -14px;overflow:auto;padding-bottom-bottom:14px;}.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form{margin:0px;padding:0px;float:left;}.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar{margin:14px;padding:0px;}.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar,.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:active,.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:hover{opacity:1;filter:alpha(opacity=100);}.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar img,.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:active img,.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:hover img{opacity:1;filter:alpha(opacity=100);}
 .usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:active img,.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:hover img{border-color:#0088cc;-webkit-box-shadow:0px 0px 3px #0088cc;-moz-box-shadow:0px 0px 3px #0088cc;box-shadow:0px 0px 3px #0088cc;}
-.usercp-avatar-crop .avatar-crop-preview{background-color:#ffffff;border-radius:5px;float:left;width:43.75px;height:43.75px;margin-right:14px;overflow:hidden;}
+.usercp-avatar-crop .avatar-crop-preview{border-radius:5px;float:left;width:43.75px;height:43.75px;margin-right:14px;overflow:hidden;}
+.usercp-avatar-crop .avatar-crop-target img{background-color:#ffffff;}
 .forum-map-category{background-color:#ffffff;border:1px solid #d5d5d5;border-radius:2px;-webkit-box-shadow:0px 0px 0px 3px #eeeeee;-moz-box-shadow:0px 0px 0px 3px #eeeeee;box-shadow:0px 0px 0px 3px #eeeeee;margin-bottom:20px;}.forum-map-category table{margin:0px;}.forum-map-category table caption{background-color:#fbfbfb;border:1px solid #d5d5d5;border-radius:2px 2px 0px 0px;margin:-1px;padding:3.966666666666667px 9.9px;color:#333333;font-size:11.9px;font-weight:bold;text-align:left;}.forum-map-category table caption small{margin-left:7px;color:#999999;font-size:11.9px;}
 .forum-map-category table .forum-map-forum h3,.forum-map-category table .forum-map-subforum h3{margin:0px;padding:0px;font-size:14px;line-height:20px;}.forum-map-category table .forum-map-forum h3 a:link,.forum-map-category table .forum-map-subforum h3 a:link,.forum-map-category table .forum-map-forum h3 a:visited,.forum-map-category table .forum-map-subforum h3 a:visited{color:#555555;}
 .forum-map-category table .forum-map-forum h3 a:active,.forum-map-category table .forum-map-subforum h3 a:active,.forum-map-category table .forum-map-forum h3 a:hover,.forum-map-category table .forum-map-subforum h3 a:hover{color:#333333;}
@@ -1025,7 +1026,7 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:0.9;filter:alpha(opa
 .user-alerts td.alert-icon .label.label-warning{background-color:#cf402e;border:1px solid #902d20;}
 .user-alerts td.alert-message{color:#555555;font-size:16.8px;}.user-alerts td.alert-message a:link,.user-alerts td.alert-message a:visited{color:#333333;font-weight:bold;}
 .user-alerts td.alert-date{color:#999999;text-align:right;}
-.news-feed .media{overflow:auto;}.news-feed .media .media-object{background-color:#ffffff;border-radius:3px;width:52px;height:52px;}
+.news-feed .media{overflow:auto;}.news-feed .media .media-object{border-radius:3px;width:52px;height:52px;}
 .news-feed .media .media-body{margin-left:66px;}.news-feed .media .media-body .post-preview:link,.news-feed .media .media-body .post-preview:active,.news-feed .media .media-body .post-preview:visited,.news-feed .media .media-body .post-preview:hover{display:block;margin-top:7px;color:#333333;font-size:16.8px;text-decoration:none;}
 .news-feed .media .media-body .media-footer{margin:0px;color:#999999;font-size:10.5px;font-weight:normal;}.news-feed .media .media-body .media-footer a{color:#555555;}
 .news-feed hr{border:none;border-top:1px solid #eeeeee;margin:20px 0px;}
@@ -1047,15 +1048,15 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:0.9;filter:alpha(opa
 .category-forums-list.category-forums-important{border:1px solid #902d20;-webkit-box-shadow:0px 0px 0px 3px #cf402e;-moz-box-shadow:0px 0px 0px 3px #cf402e;box-shadow:0px 0px 0px 3px #cf402e;}
 .category-forums-list.category-forums-inverse{border:1px solid #333333;-webkit-box-shadow:0px 0px 0px 3px #555555;-moz-box-shadow:0px 0px 0px 3px #555555;box-shadow:0px 0px 0px 3px #555555;}
 .category-forums-list.category-forums-info{border:1px solid #27576b;-webkit-box-shadow:0px 0px 0px 3px #3c85a3;-moz-box-shadow:0px 0px 0px 3px #3c85a3;box-shadow:0px 0px 0px 3px #3c85a3;}
-.profiles-list .user-cell{overflow:auto;}.profiles-list .user-cell .user-avatar{float:left;}.profiles-list .user-cell .user-avatar img{background-color:#ffffff;border-radius:3px;width:36px;height:36px;}
+.profiles-list .user-cell{overflow:auto;}.profiles-list .user-cell .user-avatar{float:left;}.profiles-list .user-cell .user-avatar img{border-radius:3px;width:36px;height:36px;}
 .profiles-list .user-cell .user-name:link,.profiles-list .user-cell .user-name:active,.profiles-list .user-cell .user-name:visited,.profiles-list .user-cell .user-name:hover{display:block;margin:0px;margin-left:43px;margin-top:9.1px;color:#333333;font-size:23.8px;}
-.user-profile .user-profile-header .header-avatar{background-color:#ffffff;border-radius:3px;float:left;width:80px;height:80px;margin-top:-8px;}
+.user-profile .user-profile-header .header-avatar{border-radius:3px;float:left;width:80px;height:80px;margin-top:-8px;}
 .user-profile .user-profile-header .header-side{margin-left:94px;}.user-profile .user-profile-header .header-side h1{margin-left:6.666666666666667px;}
 .user-profile hr{border:none;border-top:1px solid #eeeeee;margin:14px 0px;}
 .user-profile .user-details .label{font-size:14px;}
-.user-profile .user-list .user-cell{overflow:auto;}.user-profile .user-list .user-cell .user-avatar{float:left;}.user-profile .user-list .user-cell .user-avatar img{background-color:#ffffff;border-radius:3px;width:36px;height:36px;}
+.user-profile .user-list .user-cell{overflow:auto;}.user-profile .user-list .user-cell .user-avatar{float:left;}.user-profile .user-list .user-cell .user-avatar img{border-radius:3px;width:36px;height:36px;}
 .user-profile .user-list .user-cell .user-name:link,.user-profile .user-list .user-cell .user-name:active,.user-profile .user-list .user-cell .user-name:visited,.user-profile .user-list .user-cell .user-name:hover{display:block;margin:0px;margin-left:43px;margin-top:9.1px;color:#333333;font-size:23.8px;}
-.user-profile .content-list .media{overflow:auto;}.user-profile .content-list .media .media-object{background-color:#ffffff;border-radius:3px;width:52px;height:52px;}
+.user-profile .content-list .media{overflow:auto;}.user-profile .content-list .media .media-object{border-radius:3px;width:52px;height:52px;}
 .user-profile .content-list .media .media-body{margin-left:66px;}.user-profile .content-list .media .media-body .post-preview:link,.user-profile .content-list .media .media-body .post-preview:active,.user-profile .content-list .media .media-body .post-preview:visited,.user-profile .content-list .media .media-body .post-preview:hover{display:block;margin-top:7px;color:#333333;font-size:16.8px;text-decoration:none;}
 .user-profile .content-list .media .media-body .media-footer{margin:0px;color:#999999;font-size:10.5px;font-weight:normal;}.user-profile .content-list .media .media-body .media-footer a{color:#555555;}
 .forum-subforums-list{background-color:#ffffff;border:1px solid #d5d5d5;border-radius:2px;-webkit-box-shadow:0px 0px 0px 3px #eeeeee;-moz-box-shadow:0px 0px 0px 3px #eeeeee;box-shadow:0px 0px 0px 3px #eeeeee;margin-bottom:20px;}.forum-subforums-list table{margin:0px;}.forum-subforums-list table caption{background-color:#fbfbfb;border:1px solid #d5d5d5;border-radius:2px 2px 0px 0px;margin:-1px;padding:3.966666666666667px 9.9px;color:#333333;font-size:11.9px;font-weight:bold;text-align:left;}.forum-subforums-list table caption small{margin-left:7px;color:#999999;font-size:11.9px;}
@@ -1094,7 +1095,7 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:0.9;filter:alpha(opa
 .forum-threads-extra .threads-signin-message{float:right;}.forum-threads-extra .threads-signin-message a:link,.forum-threads-extra .threads-signin-message a:visited{color:#333333;}
 .thread-buttons{overflow:auto;}.thread-buttons .pull-right{margin-left:14px;}
 .thread-buttons .thread-signin-message{float:right;}.thread-buttons .thread-signin-message a:link,.thread-buttons .thread-signin-message a:visited{color:#333333;}
-.thread-body .post-wrapper .post-body{margin-bottom:20px;overflow:auto;}.thread-body .post-wrapper .post-body .user-avatar{background-color:#ffffff;border-radius:5px;float:left;width:100px;height:100px;}
+.thread-body .post-wrapper .post-body{margin-bottom:20px;overflow:auto;}.thread-body .post-wrapper .post-body .user-avatar{border-radius:5px;float:left;width:100px;height:100px;}
 .thread-body .post-wrapper .post-body .post-content{background-color:#ffffff;border:1px solid #e7e7e7;border-radius:5px;margin-left:121px;min-height:100px;position:relative;}.thread-body .post-wrapper .post-body .post-content:after,.thread-body .post-wrapper .post-body .post-content:before{right:100%;border:solid transparent;content:"";height:0;width:0;position:absolute;pointer-events:none;}
 .thread-body .post-wrapper .post-body .post-content:after{border-color:transparent;border-right-color:#ffffff;border-width:10.5px;top:14px;margin-top:0px;}
 .thread-body .post-wrapper .post-body .post-content:before{border-color:transparent;border-right-color:#e7e7e7;border-width:11.5px;top:14px;margin-top:-1px;}
@@ -1133,12 +1134,12 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:0.9;filter:alpha(opa
 .thread-body .post-checkpoints .post-checkpoint span{background-color:#fbfbfb;padding:0px 14px;color:#999999;}.thread-body .post-checkpoints .post-checkpoint span a{color:#333333;}
 .thread-body .post-checkpoints .post-checkpoint span i{opacity:0.43;filter:alpha(opacity=43);}
 .thread-moderation{background-color:#ffffff;border:1px solid #d5d5d5;border-radius:3px;-webkit-box-shadow:0px 0px 0px 3px #eeeeee;-moz-box-shadow:0px 0px 0px 3px #eeeeee;box-shadow:0px 0px 0px 3px #eeeeee;margin-bottom:20px;overflow:auto;padding:7px;}.thread-moderation form{margin:0px;}
-.thread-quick-reply{overflow:auto;margin-top:20px;}.thread-quick-reply .user-avatar{background-color:#ffffff;border-radius:3px;float:left;width:100px;height:100px;overflow:visible;}
+.thread-quick-reply{overflow:auto;margin-top:20px;}.thread-quick-reply .user-avatar{border-radius:3px;float:left;width:100px;height:100px;overflow:visible;}
 .thread-quick-reply .editor{margin-left:121px;position:relative;}.thread-quick-reply .editor:after,.thread-quick-reply .editor:before{right:100%;border:solid transparent;content:"";height:0;width:0;position:absolute;pointer-events:none;}
 .thread-quick-reply .editor:after{border-color:transparent;border-right-color:#ffffff;border-width:10.5px;top:14px;margin-top:0px;}
 .thread-quick-reply .editor:before{border-color:transparent;border-right-color:#e6e6e6;border-width:11.5px;top:14px;margin-top:-1px;}
 .thread-participants h3{margin:0px;margin-top:-6px;padding:0px;color:#555555;font-size:17.5px;font-weight:bold;}
-.thread-participants ul{background-color:#ffffff;border:1px solid #e2e2e2;border-radius:3px;margin:0px;margin-bottom:20px;padding:0px;}.thread-participants ul li{border-bottom:1px dotted #e2e2e2;margin:0px;padding:6px 8px;font-weight:bold;}.thread-participants ul li img{background-color:#ffffff;border-radius:2px;width:24px;height:24px;}
+.thread-participants ul{background-color:#ffffff;border:1px solid #e2e2e2;border-radius:3px;margin:0px;margin-bottom:20px;padding:0px;}.thread-participants ul li{border-bottom:1px dotted #e2e2e2;margin:0px;padding:6px 8px;font-weight:bold;}.thread-participants ul li img{border-radius:2px;width:24px;height:24px;}
 .thread-participants ul li a:link,.thread-participants ul li a:active,.thread-participants ul li a:visited,.thread-participants ul li a:hover{margin:0px 4px;color:#333333;font-weight:bold;}
 .thread-participants ul li:last-child{border-bottom:none;}
 .thread-participants ul li form{float:right;margin:0px;padding:0px;}.thread-participants ul li form button{padding-left:5px;padding-right:5px;}.thread-participants ul li form button i{position:relative;top:1px;}

static/cranefly/css/cranefly/navbar.less

@@ -127,9 +127,7 @@
             text-shadow: none;
 
             img {
-              background-color: @white;
               border-radius: @baseBorderRadius;
-              .box-shadow(0px 0px 4px @grayLighter);
               margin-right: 4px;
               width: 32px;
               height: 32px;

static/cranefly/css/cranefly/newsfeed.less

@@ -6,7 +6,6 @@
     overflow: auto;
 
     .media-object {
-      background-color: @white;
       border-radius: @baseBorderRadius;
       width: 52px;
       height: 52px;

static/cranefly/css/cranefly/profiles.less

@@ -9,7 +9,6 @@
       float: left;
 
       img {
-        background-color: @white;
         border-radius: @baseBorderRadius;
         width: 36px;
         height: 36px; 
@@ -33,7 +32,6 @@
 .user-profile {
   .user-profile-header {
     .header-avatar {
-      background-color: @white;
       border-radius: @baseBorderRadius;
       float: left;
       width: 80px;
@@ -70,7 +68,6 @@
         float: left;
 
         img {
-          background-color: @white;
           border-radius: @baseBorderRadius;
           width: 36px;
           height: 36px; 
@@ -96,7 +93,6 @@
       overflow: auto;
 
       .media-object {
-        background-color: @white;
         border-radius: @baseBorderRadius;
         width: 52px;
         height: 52px;

static/cranefly/css/cranefly/thread.less

@@ -26,7 +26,6 @@
       overflow: auto;
 
       .user-avatar {
-        background-color: @white;
         border-radius: @borderRadiusLarge;
         float: left;
         width: 100px;
@@ -426,7 +425,6 @@
   margin-top: @baseLineHeight;
 
   .user-avatar {
-    background-color: @white;
     border-radius: @baseBorderRadius;
     float: left;
     width: 100px;
@@ -493,7 +491,6 @@
       font-weight: bold;
 
       img {
-        background-color: @white;
         border-radius: @borderRadiusSmall;
         width: 24px;
         height: 24px;

static/cranefly/css/cranefly/usercp.less

@@ -52,7 +52,6 @@
   margin-bottom: 0px;
 
   .media-object {
-    background-color: @white;
     border-radius: @borderRadiusLarge;
     margin-top: @baseFontSize;
     width: 125px;
@@ -87,7 +86,6 @@
           .opacity(100);
 
           img {
-            background-color: @white;
             .opacity(100);
           }
         }
@@ -105,7 +103,6 @@
 
 .usercp-avatar-crop {
   .avatar-crop-preview {
-    background-color: @white;
     border-radius: @borderRadiusLarge;
     float: left;
     width: @fontSizeLarge * 2.5;
@@ -113,4 +110,10 @@
     margin-right: @baseFontSize;
     overflow: hidden;
   }
+
+  .avatar-crop-target {
+    img {
+      background-color: @white;
+    }
+  }
 }

templates/cranefly/usercp/avatar_crop.html

@@ -35,31 +35,6 @@
   </form>
   
 </div>
-
-{#
-<h2>{% trans %}Crop Avatar{% endtrans %} <small>{% trans %}Change your Avatar{% endtrans %}</small></h2>
-{% if message %}{{ macros.draw_message(message, 'alert-form') }}{% endif %}
-<form action="{% if after_upload %}{% url 'usercp_avatar_upload_crop' %}{% else %}{% url 'usercp_avatar_crop' %}{% endif %}" method="post">
-  <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
-  <input type="hidden" id="crop-b" name="crop_b" value="">
-  <input type="hidden" id="crop-w" name="crop_w" value="">
-  <input type="hidden" id="crop-x" name="crop_x" value="">
-  <input type="hidden" id="crop-y" name="crop_y" value="">
-  <div class="row">
-  	<div class="span6">
-      <div class="avatar-crop-target"><img src="{{ MEDIA_URL }}{{ source }}" id="target" alt="{% trans %}Uploaded Image{% endtrans %}"></div>
-    </div>
-    <div class="span3">
-      <div class="avatar-crop-preview">
-        <img src="{{ MEDIA_URL }}{{ source }}" id="preview" alt="{% trans %}Avatar Preview{% endtrans %}" class="jcrop-preview" />
-      </div>
-      <div class="form-actions">
-        <button name="save" type="submit" class="btn btn-primary">{% trans %}Crop Avatar{% endtrans %}</button>
-        <a href="{% url 'usercp_avatar' %}" class="btn">{% trans %}Cancel{% endtrans %}</a>
-      </div>
-    </div>
-  </div>
-</form>#}
 {% endblock %}
 
 {% block javascripts %}