Skip to content

D
django-wiki
Commit bb893552 by benjaoming
Options

textarea height and edit page button layout

parent 4aef17a6
Showing with 32 additions and 40 deletions
wiki/static/wiki/bootstrap/css/wiki-bootstrap.css
...@@ -4112,12 +4112,6 @@ h1#article-title { ...@@ -4112,12 +4112,6 @@ h1#article-title {
font-size: 2.5em; font-size: 2.5em;
margin-top: 0px; margin-top: 0px;
} }
#article_edit_form label {
max-width: 100px;
}
#article_edit_form .controls {
margin-left: 120px;
}
label { label {
font-size: 16px; font-size: 16px;
font-weight: normal; font-weight: normal;
...@@ -4335,7 +4329,6 @@ input[type=file] { ...@@ -4335,7 +4329,6 @@ input[type=file] {
*******************************/ *******************************/
/* Special form class that just has 100% width elements */ /* Special form class that just has 100% width elements */
.wiki-form-block input[type='text'], .wiki-form-block input[type='text'],
.wiki-form-block textarea,
.wiki-form-block select { .wiki-form-block select {
width: auto; width: auto;
display: block; display: block;
...@@ -4355,27 +4348,22 @@ input[type=file] { ...@@ -4355,27 +4348,22 @@ input[type=file] {
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
} }
.wiki-form-block input[type='text']:-moz-placeholder, .wiki-form-block input[type='text']:-moz-placeholder,
.wiki-form-block textarea:-moz-placeholder,
.wiki-form-block select:-moz-placeholder { .wiki-form-block select:-moz-placeholder {
color: #999999; color: #999999;
} }
.wiki-form-block input[type='text']::-moz-placeholder, .wiki-form-block input[type='text']::-moz-placeholder,
.wiki-form-block textarea::-moz-placeholder,
.wiki-form-block select::-moz-placeholder { .wiki-form-block select::-moz-placeholder {
color: #999999; color: #999999;
} }
.wiki-form-block input[type='text']:-ms-input-placeholder, .wiki-form-block input[type='text']:-ms-input-placeholder,
.wiki-form-block textarea:-ms-input-placeholder,
.wiki-form-block select:-ms-input-placeholder { .wiki-form-block select:-ms-input-placeholder {
color: #999999; color: #999999;
} }
.wiki-form-block input[type='text']::-webkit-input-placeholder, .wiki-form-block input[type='text']::-webkit-input-placeholder,
.wiki-form-block textarea::-webkit-input-placeholder,
.wiki-form-block select::-webkit-input-placeholder { .wiki-form-block select::-webkit-input-placeholder {
color: #999999; color: #999999;
} }
.wiki-form-block input[type='text']:focus, .wiki-form-block input[type='text']:focus,
.wiki-form-block textarea:focus,
.wiki-form-block select:focus { .wiki-form-block select:focus {
border-color: rgba(82, 168, 236, 0.8); border-color: rgba(82, 168, 236, 0.8);
outline: 0; outline: 0;
...@@ -4383,24 +4371,19 @@ input[type=file] { ...@@ -4383,24 +4371,19 @@ input[type=file] {
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
} }
.wiki-form-block input[type='text'][disabled], .wiki-form-block input[type='text'][disabled],
.wiki-form-block textarea[disabled],
.wiki-form-block select[disabled], .wiki-form-block select[disabled],
.wiki-form-block input[type='text'][readonly], .wiki-form-block input[type='text'][readonly],
.wiki-form-block textarea[readonly],
.wiki-form-block select[readonly], .wiki-form-block select[readonly],
fieldset[disabled] .wiki-form-block input[type='text'], fieldset[disabled] .wiki-form-block input[type='text'],
fieldset[disabled] .wiki-form-block textarea,
fieldset[disabled] .wiki-form-block select { fieldset[disabled] .wiki-form-block select {
cursor: not-allowed; cursor: not-allowed;
background-color: #eeeeee; background-color: #eeeeee;
} }
textarea.wiki-form-block input[type='text'], textarea.wiki-form-block input[type='text'],
textarea.wiki-form-block textarea,
textarea.wiki-form-block select { textarea.wiki-form-block select {
height: auto; height: auto;
} }
.wiki-form-block input[type='text'].input-large, .wiki-form-block input[type='text'].input-large,
.wiki-form-block textarea.input-large,
.wiki-form-block select.input-large { .wiki-form-block select.input-large {
height: 56px; height: 56px;
padding: 14px 16px; padding: 14px 16px;
...@@ -4408,7 +4391,6 @@ textarea.wiki-form-block select { ...@@ -4408,7 +4391,6 @@ textarea.wiki-form-block select {
border-radius: 6px; border-radius: 6px;
} }
.wiki-form-block input[type='text'].input-small, .wiki-form-block input[type='text'].input-small,
.wiki-form-block textarea.input-small,
.wiki-form-block select.input-small { .wiki-form-block select.input-small {
height: 30px; height: 30px;
padding: 5px 10px; padding: 5px 10px;
...@@ -4516,6 +4498,10 @@ textarea.form-horizontal .wiki-control textarea { ...@@ -4516,6 +4498,10 @@ textarea.form-horizontal .wiki-control textarea {
display: inline-table; display: inline-table;
width: 280px; width: 280px;
} }
.form-vertical .wiki-control textarea,
.form-horizontal .wiki-control textarea {
height: 200px;
}
.form-vertical .wiki-control input[type='text'], .form-vertical .wiki-control input[type='text'],
.form-vertical .wiki-control select, .form-vertical .wiki-control select,
.form-vertical .wiki-control textarea { .form-vertical .wiki-control textarea {
......
wiki/static/wiki/bootstrap/css/wiki-bootstrap.min.css
...@@ -540,8 +540,6 @@ th.visible-print,td.visible-print{display:none !important;} ...@@ -540,8 +540,6 @@ th.visible-print,td.visible-print{display:none !important;}
#id_title{font-size:20px;height:40px;padding:6px;display:block;width:98%;} #id_title{font-size:20px;height:40px;padding:6px;display:block;width:98%;}
#id_summary{width:98%;padding:6px;} #id_summary{width:98%;padding:6px;}
h1#article-title{font-size:2.5em;margin-top:0px;} h1#article-title{font-size:2.5em;margin-top:0px;}
#article_edit_form label{max-width:100px;}
#article_edit_form .controls{margin-left:120px;}
label{font-size:16px;font-weight:normal;color:#777;} label{font-size:16px;font-weight:normal;color:#777;}
.controls ul{margin-left:0;list-style:none;} .controls ul{margin-left:0;list-style:none;}
#attachment_form #id_description{width:95%;} #attachment_form #id_description{width:95%;}
...@@ -582,15 +580,15 @@ input[type=file]{float:none;width:auto;} ...@@ -582,15 +580,15 @@ input[type=file]{float:none;width:auto;}
.ui-resizable-s{bottom:0;} .ui-resizable-s{bottom:0;}
.ui-resizable-e{right:0;} .ui-resizable-e{right:0;}
.ui-resizable{position:fixed !important;} .ui-resizable{position:fixed !important;}
@media print{.navbar,.nav-tabs li a,#article-breadcrumbs{display:none;} #article-menu li{display:none;} #article-title-li{display:block !important;}}.wiki-form-block input[type='text'],.wiki-form-block textarea,.wiki-form-block select{width:auto;display:block;width:100%;height:38px;padding:8px 12px;font-size:14px;line-height:1.428571429;color:#555555;vertical-align:middle;background-color:#ffffff;border:1px solid #cccccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;}.wiki-form-block input[type='text']:-moz-placeholder,.wiki-form-block textarea:-moz-placeholder,.wiki-form-block select:-moz-placeholder{color:#999999;} @media print{.navbar,.nav-tabs li a,#article-breadcrumbs{display:none;} #article-menu li{display:none;} #article-title-li{display:block !important;}}.wiki-form-block input[type='text'],.wiki-form-block select{width:auto;display:block;width:100%;height:38px;padding:8px 12px;font-size:14px;line-height:1.428571429;color:#555555;vertical-align:middle;background-color:#ffffff;border:1px solid #cccccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;}.wiki-form-block input[type='text']:-moz-placeholder,.wiki-form-block select:-moz-placeholder{color:#999999;}
.wiki-form-block input[type='text']::-moz-placeholder,.wiki-form-block textarea::-moz-placeholder,.wiki-form-block select::-moz-placeholder{color:#999999;} .wiki-form-block input[type='text']::-moz-placeholder,.wiki-form-block select::-moz-placeholder{color:#999999;}
.wiki-form-block input[type='text']:-ms-input-placeholder,.wiki-form-block textarea:-ms-input-placeholder,.wiki-form-block select:-ms-input-placeholder{color:#999999;} .wiki-form-block input[type='text']:-ms-input-placeholder,.wiki-form-block select:-ms-input-placeholder{color:#999999;}
.wiki-form-block input[type='text']::-webkit-input-placeholder,.wiki-form-block textarea::-webkit-input-placeholder,.wiki-form-block select::-webkit-input-placeholder{color:#999999;} .wiki-form-block input[type='text']::-webkit-input-placeholder,.wiki-form-block select::-webkit-input-placeholder{color:#999999;}
.wiki-form-block input[type='text']:focus,.wiki-form-block textarea:focus,.wiki-form-block select:focus{border-color:rgba(82, 168, 236, 0.8);outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);} .wiki-form-block input[type='text']:focus,.wiki-form-block select:focus{border-color:rgba(82, 168, 236, 0.8);outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);}
.wiki-form-block input[type='text'][disabled],.wiki-form-block textarea[disabled],.wiki-form-block select[disabled],.wiki-form-block input[type='text'][readonly],.wiki-form-block textarea[readonly],.wiki-form-block select[readonly],fieldset[disabled] .wiki-form-block input[type='text'],fieldset[disabled] .wiki-form-block textarea,fieldset[disabled] .wiki-form-block select{cursor:not-allowed;background-color:#eeeeee;} .wiki-form-block input[type='text'][disabled],.wiki-form-block select[disabled],.wiki-form-block input[type='text'][readonly],.wiki-form-block select[readonly],fieldset[disabled] .wiki-form-block input[type='text'],fieldset[disabled] .wiki-form-block select{cursor:not-allowed;background-color:#eeeeee;}
textarea.wiki-form-block input[type='text'],textarea.wiki-form-block textarea,textarea.wiki-form-block select{height:auto;} textarea.wiki-form-block input[type='text'],textarea.wiki-form-block select{height:auto;}
.wiki-form-block input[type='text'].input-large,.wiki-form-block textarea.input-large,.wiki-form-block select.input-large{height:56px;padding:14px 16px;font-size:18px;border-radius:6px;} .wiki-form-block input[type='text'].input-large,.wiki-form-block select.input-large{height:56px;padding:14px 16px;font-size:18px;border-radius:6px;}
.wiki-form-block input[type='text'].input-small,.wiki-form-block textarea.input-small,.wiki-form-block select.input-small{height:30px;padding:5px 10px;font-size:12px;border-radius:3px;} .wiki-form-block input[type='text'].input-small,.wiki-form-block select.input-small{height:30px;padding:5px 10px;font-size:12px;border-radius:3px;}
.wiki-control input{height:38px;padding:8px 12px;font-size:14px;line-height:1.428571429;color:#555555;vertical-align:middle;width:280px;display:inline-block;} .wiki-control input{height:38px;padding:8px 12px;font-size:14px;line-height:1.428571429;color:#555555;vertical-align:middle;width:280px;display:inline-block;}
.form-horizontal .wiki-control input,.form-horizontal .wiki-control select,.form-horizontal .wiki-control textarea{width:280px;display:inline-block;} .form-horizontal .wiki-control input,.form-horizontal .wiki-control select,.form-horizontal .wiki-control textarea{width:280px;display:inline-block;}
.form-horizontal .wiki-control input[type='text'],.form-horizontal .wiki-control select,.form-horizontal .wiki-control textarea{display:block;width:100%;height:38px;padding:8px 12px;font-size:14px;line-height:1.428571429;color:#555555;vertical-align:middle;background-color:#ffffff;border:1px solid #cccccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;}.form-horizontal .wiki-control input[type='text']:-moz-placeholder,.form-horizontal .wiki-control select:-moz-placeholder,.form-horizontal .wiki-control textarea:-moz-placeholder{color:#999999;} .form-horizontal .wiki-control input[type='text'],.form-horizontal .wiki-control select,.form-horizontal .wiki-control textarea{display:block;width:100%;height:38px;padding:8px 12px;font-size:14px;line-height:1.428571429;color:#555555;vertical-align:middle;background-color:#ffffff;border:1px solid #cccccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;}.form-horizontal .wiki-control input[type='text']:-moz-placeholder,.form-horizontal .wiki-control select:-moz-placeholder,.form-horizontal .wiki-control textarea:-moz-placeholder{color:#999999;}
...@@ -603,6 +601,7 @@ textarea.form-horizontal .wiki-control input[type='text'],textarea.form-horizont ...@@ -603,6 +601,7 @@ textarea.form-horizontal .wiki-control input[type='text'],textarea.form-horizont
.form-horizontal .wiki-control input[type='text'].input-large,.form-horizontal .wiki-control select.input-large,.form-horizontal .wiki-control textarea.input-large{height:56px;padding:14px 16px;font-size:18px;border-radius:6px;} .form-horizontal .wiki-control input[type='text'].input-large,.form-horizontal .wiki-control select.input-large,.form-horizontal .wiki-control textarea.input-large{height:56px;padding:14px 16px;font-size:18px;border-radius:6px;}
.form-horizontal .wiki-control input[type='text'].input-small,.form-horizontal .wiki-control select.input-small,.form-horizontal .wiki-control textarea.input-small{height:30px;padding:5px 10px;font-size:12px;border-radius:3px;} .form-horizontal .wiki-control input[type='text'].input-small,.form-horizontal .wiki-control select.input-small,.form-horizontal .wiki-control textarea.input-small{height:30px;padding:5px 10px;font-size:12px;border-radius:3px;}
.form-horizontal .wiki-control .input-group{display:inline-table;width:280px;} .form-horizontal .wiki-control .input-group{display:inline-table;width:280px;}
.form-vertical .wiki-control textarea,.form-horizontal .wiki-control textarea{height:200px;}
.form-vertical .wiki-control input[type='text'],.form-vertical .wiki-control select,.form-vertical .wiki-control textarea{display:block;width:100%;height:38px;padding:8px 12px;font-size:14px;line-height:1.428571429;color:#555555;vertical-align:middle;background-color:#ffffff;border:1px solid #cccccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;width:95%;display:inline-block;}.form-vertical .wiki-control input[type='text']:-moz-placeholder,.form-vertical .wiki-control select:-moz-placeholder,.form-vertical .wiki-control textarea:-moz-placeholder{color:#999999;} .form-vertical .wiki-control input[type='text'],.form-vertical .wiki-control select,.form-vertical .wiki-control textarea{display:block;width:100%;height:38px;padding:8px 12px;font-size:14px;line-height:1.428571429;color:#555555;vertical-align:middle;background-color:#ffffff;border:1px solid #cccccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;width:95%;display:inline-block;}.form-vertical .wiki-control input[type='text']:-moz-placeholder,.form-vertical .wiki-control select:-moz-placeholder,.form-vertical .wiki-control textarea:-moz-placeholder{color:#999999;}
.form-vertical .wiki-control input[type='text']::-moz-placeholder,.form-vertical .wiki-control select::-moz-placeholder,.form-vertical .wiki-control textarea::-moz-placeholder{color:#999999;} .form-vertical .wiki-control input[type='text']::-moz-placeholder,.form-vertical .wiki-control select::-moz-placeholder,.form-vertical .wiki-control textarea::-moz-placeholder{color:#999999;}
.form-vertical .wiki-control input[type='text']:-ms-input-placeholder,.form-vertical .wiki-control select:-ms-input-placeholder,.form-vertical .wiki-control textarea:-ms-input-placeholder{color:#999999;} .form-vertical .wiki-control input[type='text']:-ms-input-placeholder,.form-vertical .wiki-control select:-ms-input-placeholder,.form-vertical .wiki-control textarea:-ms-input-placeholder{color:#999999;}
......
wiki/static/wiki/bootstrap/less/wiki/wiki-bootstrap.less
...@@ -29,9 +29,6 @@ ...@@ -29,9 +29,6 @@
h1#article-title {font-size: 2.5em; margin-top: 0px;} h1#article-title {font-size: 2.5em; margin-top: 0px;}
#article_edit_form label {max-width: 100px;}
#article_edit_form .controls {margin-left: 120px;}
label { font-size: 16px; font-weight: normal; color: #777;} label { font-size: 16px; font-weight: normal; color: #777;}
.controls ul .controls ul
...@@ -231,7 +228,6 @@ input[type=file] {float: none; width: auto;} ...@@ -231,7 +228,6 @@ input[type=file] {float: none; width: auto;}
/* Special form class that just has 100% width elements */ /* Special form class that just has 100% width elements */
.wiki-form-block input[type='text'], .wiki-form-block input[type='text'],
.wiki-form-block textarea,
.wiki-form-block select .wiki-form-block select
{ {
...@@ -274,6 +270,12 @@ input[type=file] {float: none; width: auto;} ...@@ -274,6 +270,12 @@ input[type=file] {float: none; width: auto;}
width: 280px; width: 280px;
} }
.form-vertical .wiki-control textarea,
.form-horizontal .wiki-control textarea
{
height: 200px;
}
.form-vertical .wiki-control input[type='text'], .form-vertical .wiki-control input[type='text'],
.form-vertical .wiki-control select, .form-vertical .wiki-control select,
.form-vertical .wiki-control textarea .form-vertical .wiki-control textarea
......
wiki/templates/wiki/edit.html
...@@ -33,10 +33,8 @@ ...@@ -33,10 +33,8 @@
<div style="clear: both"></div> <div style="clear: both"></div>
{% include "wiki/includes/modals.html" %} <div class="form-group form-actions">
<div class="col-lg-8">
<div class="form-group form-actions row">
<div class="col-8 row">
<div class="col-lg-2"></div> <div class="col-lg-2"></div>
<div class="col-lg-10"> <div class="col-lg-10">
<a class="btn btn-default btn-large" onclick="$('#previewModal').modal('show'); document.getElementById('article_edit_form').target='previewWindow'; document.getElementById('article_edit_form').action='{% url 'wiki:preview' path=urlpath.path article_id=article.id %}'; $('#article_edit_form').submit()" href="#"> <a class="btn btn-default btn-large" onclick="$('#previewModal').modal('show'); document.getElementById('article_edit_form').target='previewWindow'; document.getElementById('article_edit_form').action='{% url 'wiki:preview' path=urlpath.path article_id=article.id %}'; $('#article_edit_form').submit()" href="#">
...@@ -48,14 +46,21 @@ ...@@ -48,14 +46,21 @@
{% trans "Save changes" %} {% trans "Save changes" %}
</a> </a>
</div> </div>
{% if article|can_delete:user %} </div>
<a href="{% url 'wiki:delete' path=urlpath.path article_id=article.id %}" class="pull-right btn"> {% if article|can_delete:user %}
<div class="col-lg-4">
<div class="pull-right">
<a href="{% url 'wiki:delete' path=urlpath.path article_id=article.id %}" class="btn btn-danger">
<span class="icon-trash"></span> <span class="icon-trash"></span>
{% trans "Delete article" %} {% trans "Delete article" %}
</a> </a>
{% endif %} </div>
</div> </div>
{% endif %}
</div> </div>
{% include "wiki/includes/modals.html" %}
<div class="modal fade wiki-modal" id="previewModal"> <div class="modal fade wiki-modal" id="previewModal">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment