diff options
| author | Nicolas Lempereur <nle@odoo.com> | 2015-08-28 17:22:17 +0200 |
|---|---|---|
| committer | Nicolas Lempereur <nle@odoo.com> | 2015-09-29 14:47:24 +0200 |
| commit | d33086c03fc1a0882be38ae62989b7f72df20d3b (patch) | |
| tree | 20b5776f6902916f4c67d9d356e9db2a107eb952 /addons/web_editor/static/lib/summernote/src/less | |
| parent | e9ac1bff8bcef56ae09bbba3910202075f7eb89a (diff) | |
[IMP] web_editor: update summernote up to 2015-08-31
update summernote library up to revision:
https://github.com/summernote/summernote/commit/a0f26e300
see https://github.com/summernote/summernote/ for history
closes #8704
Diffstat (limited to 'addons/web_editor/static/lib/summernote/src/less')
| -rw-r--r-- | addons/web_editor/static/lib/summernote/src/less/summernote.less | 128 |
1 files changed, 69 insertions, 59 deletions
diff --git a/addons/web_editor/static/lib/summernote/src/less/summernote.less b/addons/web_editor/static/lib/summernote/src/less/summernote.less index c9c538e940d..806d1860ed7 100644 --- a/addons/web_editor/static/lib/summernote/src/less/summernote.less +++ b/addons/web_editor/static/lib/summernote/src/less/summernote.less @@ -1,4 +1,4 @@ -/* @_import "elements.less"; */ +/* @_import "elements.less"; ODOO: removed call directly */ /* Theme Variables ------------------------------------------*/ @@ -10,6 +10,7 @@ .note-editor { border: 1px solid @border-color; position: relative; + /* overflow: hidden; ODOO: removed for embedded editor */ /* dropzone */ @dropzone-color: lightskyblue; @@ -17,8 +18,7 @@ .note-dropzone { position: absolute; display: none; - z-index: 1; - border: 2px dashed @dropzone-color; + z-index: 100; color: @dropzone-color; background-color: white; opacity: 0.95; @@ -33,7 +33,6 @@ } &.hover { - border: 2px dashed @dropzone-active-color; color: @dropzone-active-color; } } @@ -42,9 +41,16 @@ display: table; } - .note-toolbar { - background-color: @background-color; - border-bottom: 1px solid @border-color; + /* codeview mode */ + &.codeview { + .note-editing-area { + .note-editable { + display: none; + } + .note-codable { + display: block; + } + } } /* fullscreen mode */ @@ -62,13 +68,43 @@ } } - /* codeview mode */ - &.codeview { + .note-editing-area { + position: relative; + overflow: hidden; + + /* editable */ .note-editable { - display: none; + background-color: #fff; + color: #000; + padding: 10px; + overflow: auto; + outline: none; + + &[contenteditable=true]:empty:not(:focus):before { + content:attr(data-placeholder); + } + &[contenteditable="false"] { + background-color: #e5e5e5; + } } + + /* codeable */ .note-codable { - display: block; + display: none; + width: 100%; + padding: 10px; + border: none; + box-shadow: none; + font-family: Menlo, Monaco, monospace, sans-serif; + font-size: 14px; + color: #ccc; + background-color: #222; + resize: none; + + /* override BS2 default style */ + .box-sizing(border-box); + .rounded(0); + margin-bottom: 0; } } @@ -76,9 +112,9 @@ .note-statusbar { background-color: @background-color; .note-resizebar { + padding-top: 1px; height: 8px; width: 100%; - border-top: 1px solid @border-color; cursor: ns-resize; .note-icon-bar { width: 20px; @@ -87,50 +123,16 @@ } } } - - /* editable */ - .note-editable[contenteditable=true]:empty:not(:focus):before { - content:attr(data-placeholder); - color: #a9a9a9; - } - - .note-editable { - padding: 10px; - overflow: auto; - outline: none; - } - .note-editable[contenteditable="false"] { - background-color: #e5e5e5; - } - - /* codeable */ - .note-codable { - display: none; - width: 100%; - padding: 10px; - border: none; - box-shadow: none; - font-family: Menlo, Monaco, monospace, sans-serif; - font-size: 14px; - color: #ccc; - background-color: #222; - resize: none; - - /* override BS2 default style */ - .box-sizing(border-box); - .rounded(0); - margin-bottom: 0; - } } /* Air Mode Layout - ------------------------------------------*/ +------------------------------------------*/ .note-air-editor { outline: none; } /* Popover - ------------------------------------------*/ +------------------------------------------*/ .note-popover .popover { max-width: none; .popover-content { @@ -149,8 +151,8 @@ } /* Popover and Toolbar (Button container) - ------------------------------------------*/ -.note-popover .popover .popover-content, .note-toolbar { +------------------------------------------*/ +.note-popover .popover .popover-content, .panel-heading.note-toolbar { margin: 0; padding: 0 0 5px 5px; @@ -258,15 +260,17 @@ &::before { right: 9px; left: auto !important; } &::after { right: 10px; left: auto !important; } } - /* dropdown-menu for selectbox */ - li a i { - color: deepskyblue; - visibility: hidden; - } - li a.checked i { - visibility: visible; + &.note-check { + li a i { + color: deepskyblue; + visibility: hidden; + } + li a.checked i { + visibility: visible; + } } + } .note-fontsize-10 { @@ -292,7 +296,7 @@ } /* Dialog - ------------------------------------------*/ +------------------------------------------*/ .note-dialog { &>div { display: none; /* BS2's hide pacth. */ @@ -386,7 +390,7 @@ } /* Handle - ------------------------------------------*/ +------------------------------------------*/ .note-handle { /* control selection */ .note-control-selection { @@ -444,6 +448,12 @@ cursor: se-resize; } + .note-control-se.note-control-holder { + cursor: default; + border-top: none; + border-left: none; + } + .note-control-selection-info { right: 0; bottom: 0; |
