Merge with master

ivatar/ivataraccount/templates/choose_libravatar_export.html

@@ -7,20 +7,6 @@
 {% block content %}
 <style>
 input[type=checkbox] {display:none}
-input[type=checkbox].text + label {
-padding-left:0;
-font-weight:normal;
-}
-input[type=checkbox].text + label:before {
-font-family: FontAwesome;
-display: inline-block;
-letter-spacing:5px;
-font-size:20px;
-color:#36b7d7;
-vertical-align:middle;
-}
-input[type=checkbox].text + label:before {content: "\f0c8"}
-input[type=checkbox].text:checked + label:before {content: "\f14a"}
 input[type=checkbox].image + label:before {
 font-family: FontAwesome;
 display: inline-block;
@@ -36,7 +22,9 @@ input[type=checkbox].image:checked + label:before {letter-spacing: 3px}
       {% if emails %}
         <h4>{% trans 'Email addresses we found in the export - existing ones will not be re-added' %}</h4>
         {% for email in emails %}
-          <input type="checkbox" checked name="email_{{ forloop.counter }}" id="email_{{ forloop.counter }}" value="{{ email }}" class="text"><label for="email_{{ forloop.counter }}">{{ email }}</label><br/>
+        <div class="checkbox">
+          <input type="checkbox" checked name="email_{{ forloop.counter }}" id="email_{{ forloop.counter }}" value="{{ email }}" class="text"><label for="email_{{ forloop.counter }}">{{ email }}</label>
+          </div>
         {% endfor %}
       {% endif %}
       {% if photos %}

ivatar/ivataraccount/templates/crop_photo.html

@@ -8,11 +8,7 @@
 
 {% block content %}
 <style>
-.jcrop-holder > div > div:nth-child(1) {
+
-outline-width:2px;
-outline-style:solid;
-outline-color:#36b7d7;
-}
 </style>
 <h1>{% trans 'Crop photo' %}</h1>
 

ivatar/ivataraccount/templates/preferences.html

@@ -5,21 +5,6 @@
 {% block title %}{% trans 'Your Preferences' %}{% endblock title %}
 
 {% block content %}
-<style>
-input[type=radio] {display:none}
-input[type=radio] + label {
-padding-left:0;
-}
-input[type=radio] + label:before {
-font-family: FontAwesome;
-display: inline-block;
-letter-spacing:5px;
-font-size:20px;
-vertical-align:middle;
-}
-input[type=radio] + label:before {content: "\f10c"}
-input[type=radio]:checked + label:before {content: "\f192"}
-</style>
 <h1>{% trans 'Account settings' %}</h1>
 
 <p>

ivatar/ivataraccount/templates/upload_libravatar_export.html

@@ -5,30 +5,6 @@
 {% block title %}{% trans 'Upload an export from libravatar' %} - ivatar{% endblock title %}
 
 {% block content %}
-<style>
-input[type=checkbox] {display:none}
-input[type=checkbox] + label {
-padding-left:0;
-}
-input[type=checkbox] + label:before {
-font-family: FontAwesome;
-display: inline-block;
-letter-spacing:5px;
-font-size:20px;
-color:#36b7d7;
-vertical-align:middle;
-}
-input[type=checkbox] + label:before {content: "\f0c8"}
-input[type=checkbox]:checked + label:before {content: "\f14a"}
-.uploadbtn:before {
-position:absolute;
-left:0;
-right:0;
-text-align:center;
-content:"Select file";
-font-family: 'Montserrat', sans-serif;
-}
-</style>
   <h1>{% trans 'Upload an export from libravatar' %}</h1>
 
     <form enctype="multipart/form-data" method="post">

ivatar/ivataraccount/templates/upload_photo.html

@@ -8,30 +8,6 @@
 <link rel="prefetch" href="{% static '/js/jcrop.js' %}">{% endblock header %}
 
 {% block content %}
-<style>
-input[type=checkbox] {display:none}
-input[type=checkbox] + label {
-padding-left:0;
-}
-input[type=checkbox] + label:before {
-font-family: FontAwesome;
-display: inline-block;
-letter-spacing:5px;
-font-size:20px;
-color:#36b7d7;
-vertical-align:middle;
-}
-input[type=checkbox] + label:before {content: "\f0c8"}
-input[type=checkbox]:checked + label:before {content: "\f14a"}
-.uploadbtn:before {
-position:absolute;
-left:0;
-right:0;
-text-align:center;
-content:"Select file";
-font-family: 'Montserrat', sans-serif;
-}
-</style>
   <h1>{% trans 'Upload a new photo' %}</h1>
 
   <form enctype="multipart/form-data" action="{% url 'upload_photo' %}" method="post">{% csrf_token %}

ivatar/static/css/tortin.less

@@ -269,6 +269,35 @@ color:#FFFFFF;
 background-color:darken(@bg-hero, 10%);
 color:#FFFFFF;
 }
+.checkbox input, .radio input {display:none}
+.checkbox input + label, .radio input + label {
+padding-left:0;
+}
+.checkbox input + label:before, .radio input + label:before {
+font-family: FontAwesome;
+display: inline-block;
+letter-spacing:5px;
+font-size:20px;
+color:@bg-hero;
+vertical-align:middle;
+}
+.checkbox input + label:before {content: "\f0c8"}
+.checkbox input:checked + label:before {content: "\f14a"}
+.radio input + label:before {content: "\f10c"}
+.radio input:checked + label:before {content: "\f192"}
+.uploadbtn:before {
+position:absolute;
+left:0;
+right:0;
+text-align:center;
+content:"Select file";
+font-family: 'Montserrat', sans-serif;
+}
+.jcrop-holder > div > div:nth-child(1) {
+outline-width:2px;
+outline-style:solid;
+outline-color:@bg-hero;
+}
 @media (max-width:767px) {
 .navbar-tortin .navbar-nav .open .dropdown-menu > li > a {
 color:#FFFFFF