Merge branch 'PR-52'

remotes/origin/PR-58
booblegum 9 years ago
commit 3139c87017
  1. 68
      assets/css/main.css
  2. 2
      templates/partials/base.html

@ -1336,34 +1336,34 @@ footer:after {
margin: 33px 0 28px 0; margin: 33px 0 28px 0;
} }
label { /*label {*/
width: 23px; /*width: 23px;*/
height: 23px; /*height: 23px;*/
display: block; /*display: block;*/
position: relative; /*position: relative;*/
float: left; /*float: left;*/
margin-right: 10px; /*margin-right: 10px;*/
} /*}*/
input[type="checkbox"] + span { /*input[type="checkbox"] + span {*/
position: absolute; /*position: absolute;*/
left: 0; /*left: 0;*/
top: 0; /*top: 0;*/
width: 100%; /*width: 100%;*/
height: 100%; /*height: 100%;*/
background: url('../img/check.png') no-repeat center; /*background: url('../img/check.png') no-repeat center;*/
background-position: 0 0; /*background-position: 0 0;*/
background-size: cover; /*background-size: cover;*/
cursor: pointer; /*cursor: pointer;*/
} /*}*/
/*.sro input[type="checkbox"] {*/ /*.sro input[type="checkbox"] {*/
/*opacity: 0;*/ /*opacity: 0;*/
/*}*/ /*}*/
input[type="checkbox"]:checked + span { /*input[type="checkbox"]:checked + span {*/
background-position: 0 -23px; /*background-position: 0 -23px;*/
} /*}*/
.sro p { .sro p {
font-size: 15px; font-size: 15px;
@ -4481,19 +4481,19 @@ label {
position: relative; position: relative;
} }
input[type="checkbox"] + span { /*input[type="checkbox"] + span {*/
position: absolute; /*position: absolute;*/
left: 0; /*left: 0;*/
top: 0; /*top: 0;*/
width: 100%; /*width: 100%;*/
height: 100%; /*height: 100%;*/
background: url('../img/check.png') no-repeat; /*background: url('../img/check.png') no-repeat;*/
cursor: pointer; /*cursor: pointer;*/
} /*}*/
input[type="checkbox"]:checked + span { /*input[type="checkbox"]:checked + span {*/
background-position: 0 -23px; /*background-position: 0 -23px;*/
} /*}*/
.text-block { .text-block {
width: 100%; width: 100%;

@ -15,8 +15,6 @@
{# {% compress css %}#} {# {% compress css %}#}
{% block old_css %} {% block old_css %}
<link rel='stylesheet' href='{% static "css/reset.css" %}'> <link rel='stylesheet' href='{% static "css/reset.css" %}'>
<link rel='stylesheet' href='{% static "css/bootstrap.css" %}'>
<link rel='stylesheet' href='{% static "css/font-awesome.min.css" %}'>
<link rel='stylesheet' href='{% static "lib/bootstrap-select/css/bootstrap-select.css" %}'> <link rel='stylesheet' href='{% static "lib/bootstrap-select/css/bootstrap-select.css" %}'>
<link rel='stylesheet' href='{% static "lib/select2/select2.css" %}'> <!-- Tmp --> <link rel='stylesheet' href='{% static "lib/select2/select2.css" %}'> <!-- Tmp -->
<link rel='stylesheet' href='{% static "css/swiper.min.css" %}'> <link rel='stylesheet' href='{% static "css/swiper.min.css" %}'>

Loading…
Cancel
Save