mitri4
/
proekton.com
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modal forms edited

Browse Source
remotes/origin/PR-39
shishman 10 years ago
parent 504bd26f47
commit 175d4dcae0
4 changed files with 107 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 73
      assets/css/main.css
  2. 22
      projects/templates/project_filter.html
  3. 4
      users/templates/portfolio_create_form.html
  4. 45
      users/templates/worksell_create_form.html

73
assets/css/main.css
Unescape View File

@ -1041,7 +1041,7 @@ footer:after {
background-position: 0 -26px; background-position: 0 -26px;
} }
.rightPro ul li:last-child:before { .rightPro ul li:nth-child(3):before {
height: 22px; height: 22px;
background: url('../img/cenaList.png') no-repeat left; background: url('../img/cenaList.png') no-repeat left;
background-size: cover; background-size: cover;
@ -5639,13 +5639,13 @@ input[type="radio"]:checked + span {
right: 3px; right: 3px;
top: 16px; top: 16px;
} }
#portfolio-add-form .textAreaBlock2 p{ #portfolio-add-form .textAreaBlock2 p, #worksell-add-form .textAreaBlock2 p{
font-size: 15px; font-size: 15px;
font-family: 'Arial-MT-Regular', sans-serif; font-family: 'Arial-MT-Regular', sans-serif;
font-weight: bold; font-weight: bold;
color: #2c2c2c; color: #2c2c2c;
} }
#portfolio-add-form #text-new{ #portfolio-add-form #text-new, #worksell-add-form #text-new{
margin-top: 0; margin-top: 0;
} }
.textAreaBlock2 input{ .textAreaBlock2 input{
@ -5657,10 +5657,10 @@ input[type="radio"]:checked + span {
color: #9c9c9c; color: #9c9c9c;
font-family: 'Arial-MT-Regular', sans-serif; font-family: 'Arial-MT-Regular', sans-serif;
} }
#portfolio-add-form .polsF1 .btn{ #portfolio-add-form .polsF1 .btn, #worksell-add-form .polsF1 .btn{
border:1px solid #c2c2c2; border:1px solid #c2c2c2;
} }
#portfolio-add-form .bootstrap-select{ #portfolio-add-form .bootstrap-select, #worksell-add-form .bootstrap-select{
width: 100% !important; width: 100% !important;
} }
.textAreaBlock2 .add_file_to_port{ .textAreaBlock2 .add_file_to_port{
@ -5750,7 +5750,7 @@ input[type="radio"]:checked + span {
margin: 4px 0 4px 0; margin: 4px 0 4px 0;
} }
.birth_edit_dat .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn){ .birth_edit_dat .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn){
width: 190px; width: 190px !important;
} }
.btn-submit-link{ .btn-submit-link{
color: #333 !important; color: #333 !important;
@ -5758,4 +5758,65 @@ input[type="radio"]:checked + span {
border-color: #ccc !important; border-color: #ccc !important;
margin-bottom: 0 !important margin-bottom: 0 !important
} }
.infoProfile .dropdown-menu{
height: 316px;
}
.form-regestration{
padding: 20px 0 40px 0;
}
#resume-text-edit .modal-title, #fullfill-balance .modal-title, #withdraw-money .modal-title{
font-family: Arial, Verdana, Helvetica, sans-serif;
font-size: 16px;
text-transform: uppercase;
color: #2c2c2c;
font-weight: bold;
}
#withdraw-money .modal-body, #fullfill-balance .modal-body{
width: 100%;
display: table;
}
#withdraw-money .modal-body p, #fullfill-balance .modal-body p{
color: #2c2c2c;
font-family: Arial, Verdana, Helvetica, sans-serif;
font-weight: bold;
}
#withdraw-money .modal-footer .btn, #fullfill-balance .modal-footer .btn{
padding: 10px 34px;
border-radius: 40px;
font-family: 'pfdintextcomppro-regular', sans-serif;
font-size: 16px;
text-transform: uppercase;
letter-spacing: 2px;
}
:focus{
outline: none !important;
}
#withdraw-money .modal-footer .btn.btn-primary, #fullfill-balance .modal-footer .btn.btn-primary{
background-color: #000;
}
.modal-footer{
border-top: none;
}
#resume-text-edit .btn-submit-link{
float: right;
margin-top: 15px;
}
#resume-text-edit .searchF1{
padding: 0;
}
.list-summ-block{
min-height: 195px;
}
.select2-dropdown-open > a.select2-choice{
border: 1px solid #ff0029 !important;
}
.select2-display-none {
border: 1px solid #ff0029 !important;
}
.bootstrap-select.btn-group .dropdown-menu li a span.text {
font-size: 14px;
display: block;
text-transform: initial;
letter-spacing: normal;
}
/*end_new*/ /*end_new*/

22
projects/templates/project_filter.html
Unescape View File

@ -5,11 +5,11 @@
{% block content %} {% block content %}
{% include 'partials/header.html' %} {% include 'partials/header.html' %}
<div class="container mainScore"> <div class="container mainScore">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<p class="titleScore">Биржа проектов</p> <p class="titleScore">Биржа проектов</p>
</div> </div>
<form action="{% url 'projects:project-filter' %}" method="GET" novalidate> <form action="{% url 'projects:project-filter' %}" method="GET" novalidate>
<div class="col-lg-12"> <div class="col-lg-12">
@ -50,7 +50,7 @@
</div> </div>
<div class="searchF1"> <div class="searchF1 resSearchF1">
<div class="col-lg-6"> <div class="col-lg-6">
<input <input
type="text" type="text"
@ -167,7 +167,7 @@
<input type="checkbox" name="{{ form.reverse_order.html_name }}" {% if reverse_order %}checked{% endif %} style="display: none"> <input type="checkbox" name="{{ form.reverse_order.html_name }}" {% if reverse_order %}checked{% endif %} style="display: none">
</div> </div>
</div> </div>
</form> </form>
@ -230,11 +230,11 @@
<div class="col-lg-12 pagin"> <div class="col-lg-12 pagin">
{% include 'partials/pagination.html' %} {% include 'partials/pagination.html' %}
</div> </div>
{% include 'partials/footer.html' %} {% include 'partials/footer.html' %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

4
users/templates/portfolio_create_form.html
Unescape View File

@ -95,9 +95,9 @@
<div class="extAreaBlock2 polsF1 text-nn box-sizing disTab"> <div class="extAreaBlock2 polsF1 text-nn box-sizing disTab">
<p></p> <p></p>
<div class="row"> <div class="row">
<div class="col-lg-6 make-new"> <div class="make-new">
<label>{{ portfolio_form.duplicate }}<span></span></label> <label style="margin-left: 0;">{{ portfolio_form.duplicate }}<span></span></label>
<p>Дублировать проект в готовые работы</p> <p>Дублировать проект в готовые работы</p>
</div> </div>

45
users/templates/worksell_create_form.html
Unescape View File

@ -43,56 +43,65 @@
value="{{ worksell_form.specialization.value }}"> value="{{ worksell_form.specialization.value }}">
</div> </div>
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="textAreaBlock2 polsF1 text-nn box-sizing disTab">
<p>Бюджет{{ worksell_form.budget.errors.as_text }}</p> <p>Бюджет{{ worksell_form.budget.errors.as_text }}</p>
<div class="row"> <div class="row">
<div class="col-lg-8"> <div class="col-lg-6">
<input type="text" class="box-sizing" name="{{ worksell_form.budget.html_name }}" value="{{ worksell_form.budget.value }}"> <input type="text" class="box-sizing" name="{{ worksell_form.budget.html_name }}" value="{{ worksell_form.budget.value }}">
</div> </div>
<div class="col-lg-4"> <div class="col-lg-3">
{{ worksell_form.currency}} {{ worksell_form.currency}}
</div> </div>
</div> </div>
</div> </div>
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="textAreaBlock2 polsF1 text-nn box-sizing disTab">
<p>Срок выполнения{{ worksell_form.budget.errors.as_text }}</p> <p>Срок выполнения{{ worksell_form.budget.errors.as_text }}</p>
<div class="row"> <div class="row">
<div class="col-lg-8"> <div class="col-lg-6">
<input type="text" class="box-sizing" name="{{ worksell_form.term.html_name }}" value="{{ worksell_form.term.value }}"> <input type="text" class="box-sizing" name="{{ worksell_form.term.html_name }}" value="{{ worksell_form.term.value }}">
</div> </div>
<div class="col-lg-4"> <div class="col-lg-3">
{{ worksell_form.term_type }} {{ worksell_form.term_type }}
</div> </div>
</div> </div>
</div> </div>
<div class="polsF1 polsF2 disTab"> <div class="textAreaBlock2 polsF1 text-nn box-sizing disTab">
<p>Вид строительства</p> <p>Вид строительства</p>
<div class="row">
<div class="col-lg-6">
{{ worksell_form.construction_type}} {{ worksell_form.construction_type}}
</div>
</div>
</div> </div>
<div class="polsF1 polsF2 disTab"> <div class="textAreaBlock2 polsF1 text-nn box-sizing disTab">
<p>Классификация здания</p> <p>Классификация здания</p>
<div class="row">
<div class="col-lg-6">
{{ worksell_form.building_classification}} {{ worksell_form.building_classification}}
</div>
</div>
</div> </div>
<div class="polsF1 polsF2 disTab"> <div class="polsF1 disTab">
<input type="hidden" name="{{ worksell_form.contractor.html_name }}" value="{{ request.user.pk }}" /> <input type="hidden" name="{{ worksell_form.contractor.html_name }}" value="{{ request.user.pk }}" />
</div> </div>
<div class="polsF1 polsF2 disTab"> <div class="polsF1 disTab">
<input type="hidden" name="images-ids" id="upload-files-worksell-pk" /> <input type="hidden" name="images-ids" id="upload-files-worksell-pk" />
</div> </div>
<!-- The fileinput-button span is used to style the file input field as button --> <!-- The fileinput-button span is used to style the file input field as button -->
<span class="btn btn-success fileinput-button"> <div class="textAreaBlock2 polsF1 text-nn box-sizing disTab" style="margin-bottom: 12px;">
<i class="glyphicon glyphicon-plus"></i> <span class="btn btn-success fileinput-button add_file_to_port">
<span>Выберите файлы</span> <span>Выберите файлы</span>
<!-- The file input field used as target for the file upload widget --> <!-- The file input field used as target for the file upload widget -->
<input id="fileupload-worksell" type="file" name="file" multiple> <input id="fileupload-worksell" type="file" name="file" multiple>
</span> </span>
</div>
<br> <br>
<br> <br>
<!-- The global progress bar --> <!-- The global progress bar -->
@ -103,7 +112,7 @@
<div id="files-worksell" class="files"></div> <div id="files-worksell" class="files"></div>
<br> <br>
<div class="searchF1 polsF1 polsFF links-filter"> <div class="polsFF links-filter">
<input class="btn-submit-link" type="submit" value="Разместить проект"> <input class="btn-submit-link" type="submit" value="Разместить проект">
</div> </div>

Write Preview
Loading…
Cancel
Save