CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix #517 -- Changed navpills to navtabs in email template editor (#533)

Browse Source 
* Changed navpills to navtabs in email template editor

* Issue 517 - Added border radius to email template tabs and removed excess bottom margin.
This commit is contained in:
Tydon K
2017-07-02 08:51:41 -07:00
committed by Raphael Michel
parent 6f24a2a88c
commit b4715f0931
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pretix/control/templates/pretixcontrol/event/mail_settings_fragment.html
View File

@@ -23,6 +23,14 @@
{% with form|getattr:item as field %} {% with form|getattr:item as field %}
<label class="col-md-3 control-label">{{ field.label }}</label> <label class="col-md-3 control-label">{{ field.label }}</label>
<div class="col-md-9"> <div class="col-md-9">
<ul class="nav nav-tabs">
<li role="presentation" class="active">
<a data-toggle="tab" type="edit" href="#{{ item }}_edit"><i class="fa fa-pencil-square-o fa-fw"></i> {% trans "Edit" %}</a>
</li>
<li role="presentation">
<a data-toggle="tab" type="preview" href="#{{ item }}_preview"><i class="fa fa-tv fa-fw"></i> {% trans "Preview" %}</a>
</li>
</ul>
<div class="tab-content"> <div class="tab-content">
<div id="{{ item }}_edit" class="tab-pane fade in active"> <div id="{{ item }}_edit" class="tab-pane fade in active">
{% bootstrap_field field show_label=False form_group_class="" %} {% bootstrap_field field show_label=False form_group_class="" %}
@@ -33,14 +41,6 @@
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
<ul class="nav nav-pills pull-right">
<li role="presentation" class="active">
<a data-toggle="pill" type="edit" href="#{{ item }}_edit"><i class="fa fa-pencil-square-o fa-fw"></i> {% trans "Edit" %}</a>
</li>
<li role="presentation">
<a data-toggle="pill" type="preview" href="#{{ item }}_preview"><i class="fa fa-tv fa-fw"></i> {% trans "Preview" %}</a>
</li>
</ul>
</div> </div>
{% endwith %} {% endwith %}
</div> </div>

14
src/pretix/static/pretixcontrol/scss/_forms.scss
View File

@@ -74,8 +74,18 @@ div[data-formset-body], div[data-formset-form], div[data-nested-formset-form], d
margin-bottom: 0; margin-bottom: 0;
} }
.container ul.nav-pills { .preview-panel .nav-tabs {
margin: 20px 0; border-bottom: 0px solid #ddd;
}
.tab-content {
border: 1px solid #ddd;
border-radius: 0px 5px 5px 5px;
padding: 5px 5px 0px 5px;
}
.mail-preview-group {
margin-bottom: -15px;
} }
.variation-matrix { .variation-matrix {