diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 3dc6317f..c2fd0ade 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 69c3d24d..df358b99 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -816,18 +816,23 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - cursor: not-allowed; + cursor: text; padding: 4px 3px 4px 5px; - overflow-y: auto; - overflow-x: hidden; } .uneditable-input[disabled], .uneditable-textarea[disabled] { background-color: #f5f5f5; border-color: #ddd; + cursor: not-allowed; +} +.uneditable-input { + white-space: pre; + overflow: hidden; } .uneditable-textarea { height: 54px; white-space: pre-wrap; + overflow-y: auto; + overflow-x: hidden; } .uneditable-textarea[rows="1"] { height: 36px; @@ -1090,9 +1095,6 @@ textarea.editor-ckeditor { -moz-border-radius: 14px; border-radius: 14px; } -.uneditable-form .uneditable-input, .uneditable-form .uneditable-textarea { - cursor: text; -} .uneditable-form .form-actions { background-color: transparent; } diff --git a/docs/javascript.html b/docs/javascript.html index c004436b..379a9346 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1652,7 +1652,7 @@ $('.myCarousel').carousel({

Markup

Use the data-fileupload attribute to register the file upload widget. The main container should either have the .fileupload-new class for a new record or if the record - does not have file or .fileupload-exists if an existing file is present. Elements inside the container with the .fileupload-new and fileupload-exists + does not have file or .fileupload-exists if an existing file is present. Elements inside the container with the .fileupload-new and .fileupload-exists class will be shown or hidden based on the current state. The content of .fileupload-preview is replaced when a file is selected. Implement a button to clear the file with data-dismiss="fileupload".