Skip to content

D
django-wiki
Commit d07ba79a by benjaoming
Options

fix #193 - only add style to input type=text/password

parent c8d93079
Showing with 32 additions and 15 deletions
wiki/static/wiki/bootstrap/css/wiki-bootstrap.css
...@@ -4403,7 +4403,8 @@ textarea.wiki-form-block select { ...@@ -4403,7 +4403,8 @@ textarea.wiki-form-block select {
border-radius: 3px; border-radius: 3px;
} }
/* General styling, any kind of form input */ /* General styling, any kind of form input */
.wiki-control input { .wiki-control input[type=text],
.wiki-control input[type=password] {
height: 38px; height: 38px;
padding: 8px 12px; padding: 8px 12px;
font-size: 14px; font-size: 14px;
...@@ -4414,6 +4415,7 @@ textarea.wiki-form-block select { ...@@ -4414,6 +4415,7 @@ textarea.wiki-form-block select {
display: inline-block; display: inline-block;
} }
.form-horizontal .wiki-control input[type='text'], .form-horizontal .wiki-control input[type='text'],
.form-horizontal .wiki-control input[type='password'],
.form-horizontal .wiki-control select, .form-horizontal .wiki-control select,
.form-horizontal .wiki-control textarea { .form-horizontal .wiki-control textarea {
display: block; display: block;
...@@ -4435,26 +4437,31 @@ textarea.wiki-form-block select { ...@@ -4435,26 +4437,31 @@ textarea.wiki-form-block select {
display: inline-block; display: inline-block;
} }
.form-horizontal .wiki-control input[type='text']:-moz-placeholder, .form-horizontal .wiki-control input[type='text']:-moz-placeholder,
.form-horizontal .wiki-control input[type='password']:-moz-placeholder,
.form-horizontal .wiki-control select:-moz-placeholder, .form-horizontal .wiki-control select:-moz-placeholder,
.form-horizontal .wiki-control textarea:-moz-placeholder { .form-horizontal .wiki-control textarea:-moz-placeholder {
color: #999999; color: #999999;
} }
.form-horizontal .wiki-control input[type='text']::-moz-placeholder, .form-horizontal .wiki-control input[type='text']::-moz-placeholder,
.form-horizontal .wiki-control input[type='password']::-moz-placeholder,
.form-horizontal .wiki-control select::-moz-placeholder, .form-horizontal .wiki-control select::-moz-placeholder,
.form-horizontal .wiki-control textarea::-moz-placeholder { .form-horizontal .wiki-control textarea::-moz-placeholder {
color: #999999; color: #999999;
} }
.form-horizontal .wiki-control input[type='text']:-ms-input-placeholder, .form-horizontal .wiki-control input[type='text']:-ms-input-placeholder,
.form-horizontal .wiki-control input[type='password']:-ms-input-placeholder,
.form-horizontal .wiki-control select:-ms-input-placeholder, .form-horizontal .wiki-control select:-ms-input-placeholder,
.form-horizontal .wiki-control textarea:-ms-input-placeholder { .form-horizontal .wiki-control textarea:-ms-input-placeholder {
color: #999999; color: #999999;
} }
.form-horizontal .wiki-control input[type='text']::-webkit-input-placeholder, .form-horizontal .wiki-control input[type='text']::-webkit-input-placeholder,
.form-horizontal .wiki-control input[type='password']::-webkit-input-placeholder,
.form-horizontal .wiki-control select::-webkit-input-placeholder, .form-horizontal .wiki-control select::-webkit-input-placeholder,
.form-horizontal .wiki-control textarea::-webkit-input-placeholder { .form-horizontal .wiki-control textarea::-webkit-input-placeholder {
color: #999999; color: #999999;
} }
.form-horizontal .wiki-control input[type='text']:focus, .form-horizontal .wiki-control input[type='text']:focus,
.form-horizontal .wiki-control input[type='password']:focus,
.form-horizontal .wiki-control select:focus, .form-horizontal .wiki-control select:focus,
.form-horizontal .wiki-control textarea:focus { .form-horizontal .wiki-control textarea:focus {
border-color: rgba(82, 168, 236, 0.8); border-color: rgba(82, 168, 236, 0.8);
...@@ -4463,23 +4470,28 @@ textarea.wiki-form-block select { ...@@ -4463,23 +4470,28 @@ textarea.wiki-form-block select {
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);
} }
.form-horizontal .wiki-control input[type='text'][disabled], .form-horizontal .wiki-control input[type='text'][disabled],
.form-horizontal .wiki-control input[type='password'][disabled],
.form-horizontal .wiki-control select[disabled], .form-horizontal .wiki-control select[disabled],
.form-horizontal .wiki-control textarea[disabled], .form-horizontal .wiki-control textarea[disabled],
.form-horizontal .wiki-control input[type='text'][readonly], .form-horizontal .wiki-control input[type='text'][readonly],
.form-horizontal .wiki-control input[type='password'][readonly],
.form-horizontal .wiki-control select[readonly], .form-horizontal .wiki-control select[readonly],
.form-horizontal .wiki-control textarea[readonly], .form-horizontal .wiki-control textarea[readonly],
fieldset[disabled] .form-horizontal .wiki-control input[type='text'], fieldset[disabled] .form-horizontal .wiki-control input[type='text'],
fieldset[disabled] .form-horizontal .wiki-control input[type='password'],
fieldset[disabled] .form-horizontal .wiki-control select, fieldset[disabled] .form-horizontal .wiki-control select,
fieldset[disabled] .form-horizontal .wiki-control textarea { fieldset[disabled] .form-horizontal .wiki-control textarea {
cursor: not-allowed; cursor: not-allowed;
background-color: #eeeeee; background-color: #eeeeee;
} }
textarea.form-horizontal .wiki-control input[type='text'], textarea.form-horizontal .wiki-control input[type='text'],
textarea.form-horizontal .wiki-control input[type='password'],
textarea.form-horizontal .wiki-control select, textarea.form-horizontal .wiki-control select,
textarea.form-horizontal .wiki-control textarea { textarea.form-horizontal .wiki-control textarea {
height: auto; height: auto;
} }
.form-horizontal .wiki-control input[type='text'].input-large, .form-horizontal .wiki-control input[type='text'].input-large,
.form-horizontal .wiki-control input[type='password'].input-large,
.form-horizontal .wiki-control select.input-large, .form-horizontal .wiki-control select.input-large,
.form-horizontal .wiki-control textarea.input-large { .form-horizontal .wiki-control textarea.input-large {
height: 56px; height: 56px;
...@@ -4488,6 +4500,7 @@ textarea.form-horizontal .wiki-control textarea { ...@@ -4488,6 +4500,7 @@ textarea.form-horizontal .wiki-control textarea {
border-radius: 6px; border-radius: 6px;
} }
.form-horizontal .wiki-control input[type='text'].input-small, .form-horizontal .wiki-control input[type='text'].input-small,
.form-horizontal .wiki-control input[type='password'].input-small,
.form-horizontal .wiki-control select.input-small, .form-horizontal .wiki-control select.input-small,
.form-horizontal .wiki-control textarea.input-small { .form-horizontal .wiki-control textarea.input-small {
height: 30px; height: 30px;
...@@ -4496,7 +4509,8 @@ textarea.form-horizontal .wiki-control textarea { ...@@ -4496,7 +4509,8 @@ textarea.form-horizontal .wiki-control textarea {
border-radius: 3px; border-radius: 3px;
} }
/* other fields */ /* other fields */
.form-horizontal .wiki-control input { .form-horizontal .wiki-control input[type=text],
.form-horizontal .wiki-control input[type=password] {
width: 280px; width: 280px;
display: inline-block; display: inline-block;
} }
......
wiki/static/wiki/bootstrap/css/wiki-bootstrap.min.css
...@@ -590,17 +590,17 @@ input[type=file]{float:none;width:auto;} ...@@ -590,17 +590,17 @@ input[type=file]{float:none;width:auto;}
textarea.wiki-form-block input[type='text'],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 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 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[type=text],.wiki-control input[type=password]{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[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;width:280px;display:inline-block;}.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 input[type='password'],.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;width:280px;display:inline-block;}.form-horizontal .wiki-control input[type='text']:-moz-placeholder,.form-horizontal .wiki-control input[type='password']:-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']::-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']::-moz-placeholder,.form-horizontal .wiki-control input[type='password']::-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']:-ms-input-placeholder,.form-horizontal .wiki-control select:-ms-input-placeholder,.form-horizontal .wiki-control textarea:-ms-input-placeholder{color:#999999;} .form-horizontal .wiki-control input[type='text']:-ms-input-placeholder,.form-horizontal .wiki-control input[type='password']:-ms-input-placeholder,.form-horizontal .wiki-control select:-ms-input-placeholder,.form-horizontal .wiki-control textarea:-ms-input-placeholder{color:#999999;}
.form-horizontal .wiki-control input[type='text']::-webkit-input-placeholder,.form-horizontal .wiki-control select::-webkit-input-placeholder,.form-horizontal .wiki-control textarea::-webkit-input-placeholder{color:#999999;} .form-horizontal .wiki-control input[type='text']::-webkit-input-placeholder,.form-horizontal .wiki-control input[type='password']::-webkit-input-placeholder,.form-horizontal .wiki-control select::-webkit-input-placeholder,.form-horizontal .wiki-control textarea::-webkit-input-placeholder{color:#999999;}
.form-horizontal .wiki-control input[type='text']:focus,.form-horizontal .wiki-control select:focus,.form-horizontal .wiki-control textarea: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);} .form-horizontal .wiki-control input[type='text']:focus,.form-horizontal .wiki-control input[type='password']:focus,.form-horizontal .wiki-control select:focus,.form-horizontal .wiki-control textarea: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);}
.form-horizontal .wiki-control input[type='text'][disabled],.form-horizontal .wiki-control select[disabled],.form-horizontal .wiki-control textarea[disabled],.form-horizontal .wiki-control input[type='text'][readonly],.form-horizontal .wiki-control select[readonly],.form-horizontal .wiki-control textarea[readonly],fieldset[disabled] .form-horizontal .wiki-control input[type='text'],fieldset[disabled] .form-horizontal .wiki-control select,fieldset[disabled] .form-horizontal .wiki-control textarea{cursor:not-allowed;background-color:#eeeeee;} .form-horizontal .wiki-control input[type='text'][disabled],.form-horizontal .wiki-control input[type='password'][disabled],.form-horizontal .wiki-control select[disabled],.form-horizontal .wiki-control textarea[disabled],.form-horizontal .wiki-control input[type='text'][readonly],.form-horizontal .wiki-control input[type='password'][readonly],.form-horizontal .wiki-control select[readonly],.form-horizontal .wiki-control textarea[readonly],fieldset[disabled] .form-horizontal .wiki-control input[type='text'],fieldset[disabled] .form-horizontal .wiki-control input[type='password'],fieldset[disabled] .form-horizontal .wiki-control select,fieldset[disabled] .form-horizontal .wiki-control textarea{cursor:not-allowed;background-color:#eeeeee;}
textarea.form-horizontal .wiki-control input[type='text'],textarea.form-horizontal .wiki-control select,textarea.form-horizontal .wiki-control textarea{height:auto;} textarea.form-horizontal .wiki-control input[type='text'],textarea.form-horizontal .wiki-control input[type='password'],textarea.form-horizontal .wiki-control select,textarea.form-horizontal .wiki-control textarea{height:auto;}
.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 input[type='password'].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 input[type='password'].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{width:280px;display:inline-block;} .form-horizontal .wiki-control input[type=text],.form-horizontal .wiki-control input[type=password]{width:280px;display:inline-block;}
.form-horizontal .wiki-control .input-group{width:280px;display:inline-table;} .form-horizontal .wiki-control .input-group{width:280px;display:inline-table;}
.form-vertical .wiki-control textarea,.form-horizontal .wiki-control textarea{height:200px;} .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;}
......
wiki/static/wiki/bootstrap/less/wiki/wiki-bootstrap.less
...@@ -239,7 +239,8 @@ input[type=file] {float: none; width: auto;} ...@@ -239,7 +239,8 @@ input[type=file] {float: none; width: auto;}
} }
/* General styling, any kind of form input */ /* General styling, any kind of form input */
.wiki-control input .wiki-control input[type=text],
.wiki-control input[type=password]
{ {
display: inline-block; display: inline-block;
height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border) height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
...@@ -253,6 +254,7 @@ input[type=file] {float: none; width: auto;} ...@@ -253,6 +254,7 @@ input[type=file] {float: none; width: auto;}
} }
.form-horizontal .wiki-control input[type='text'], .form-horizontal .wiki-control input[type='text'],
.form-horizontal .wiki-control input[type='password'],
.form-horizontal .wiki-control select, .form-horizontal .wiki-control select,
.form-horizontal .wiki-control textarea .form-horizontal .wiki-control textarea
{ {
...@@ -262,7 +264,8 @@ input[type=file] {float: none; width: auto;} ...@@ -262,7 +264,8 @@ input[type=file] {float: none; width: auto;}
} }
/* other fields */ /* other fields */
.form-horizontal .wiki-control input .form-horizontal .wiki-control input[type=text],
.form-horizontal .wiki-control input[type=password]
{ {
width: 280px; width: 280px;
display: inline-block; display: inline-block;
......
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