diff --git a/apps/documenteditor/main/app/template/LeftMenu.template b/apps/documenteditor/main/app/template/LeftMenu.template index 53e256e39..0412049d8 100644 --- a/apps/documenteditor/main/app/template/LeftMenu.template +++ b/apps/documenteditor/main/app/template/LeftMenu.template @@ -9,7 +9,7 @@ - +
diff --git a/apps/documenteditor/main/app/view/PageThumbnails.js b/apps/documenteditor/main/app/view/PageThumbnails.js index a9acd064b..87578bc9d 100644 --- a/apps/documenteditor/main/app/view/PageThumbnails.js +++ b/apps/documenteditor/main/app/view/PageThumbnails.js @@ -81,9 +81,9 @@ define([ var sizeSettingTemplate = _.template('
' + '' + '
' + - '' + + '' + '
' + - '' + + '' + '
', '
'); @@ -94,7 +94,7 @@ define([ hint: this.textThumbnailsSettings, menu: new Common.UI.Menu({ menuAlign: 'tr-br', - style: 'min-width: 200px;', + style: 'min-width: 198px;', items: [ { caption: this.textThumbnailsSize, diff --git a/apps/documenteditor/main/resources/img/toolbar/1.25x/btn-menu-thumbs.png b/apps/documenteditor/main/resources/img/toolbar/1.25x/btn-menu-thumbs.png new file mode 100644 index 000000000..d80e8bcb3 Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/1.25x/btn-menu-thumbs.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/1.25x/thumbnail-big.png b/apps/documenteditor/main/resources/img/toolbar/1.25x/thumbnail-big.png new file mode 100644 index 000000000..044aba22d Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/1.25x/thumbnail-big.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/1.25x/thumbnail-small.png b/apps/documenteditor/main/resources/img/toolbar/1.25x/thumbnail-small.png new file mode 100644 index 000000000..c57da9de9 Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/1.25x/thumbnail-small.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/btn-menu-thumbs.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/btn-menu-thumbs.png new file mode 100644 index 000000000..b589a998d Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/1.5x/btn-menu-thumbs.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/thumbnail-big.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/thumbnail-big.png new file mode 100644 index 000000000..f6001dfe0 Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/1.5x/thumbnail-big.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/thumbnail-small.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/thumbnail-small.png new file mode 100644 index 000000000..b2d90f008 Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/1.5x/thumbnail-small.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/1.75x/btn-menu-thumbs.png b/apps/documenteditor/main/resources/img/toolbar/1.75x/btn-menu-thumbs.png new file mode 100644 index 000000000..68dcbd4c5 Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/1.75x/btn-menu-thumbs.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/1.75x/thumbnail-big.png b/apps/documenteditor/main/resources/img/toolbar/1.75x/thumbnail-big.png new file mode 100644 index 000000000..8ebf6e182 Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/1.75x/thumbnail-big.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/1.75x/thumbnail-small.png b/apps/documenteditor/main/resources/img/toolbar/1.75x/thumbnail-small.png new file mode 100644 index 000000000..a61eb6d0b Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/1.75x/thumbnail-small.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/btn-menu-thumbs.png b/apps/documenteditor/main/resources/img/toolbar/1x/btn-menu-thumbs.png new file mode 100644 index 000000000..d825e39f0 Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/1x/btn-menu-thumbs.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/thumbnail-big.png b/apps/documenteditor/main/resources/img/toolbar/1x/thumbnail-big.png new file mode 100644 index 000000000..09171568e Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/1x/thumbnail-big.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/thumbnail-small.png b/apps/documenteditor/main/resources/img/toolbar/1x/thumbnail-small.png new file mode 100644 index 000000000..faf633b22 Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/1x/thumbnail-small.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/btn-menu-thumbs.png b/apps/documenteditor/main/resources/img/toolbar/2x/btn-menu-thumbs.png new file mode 100644 index 000000000..77c9145ba Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/2x/btn-menu-thumbs.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/thumbnail-big.png b/apps/documenteditor/main/resources/img/toolbar/2x/thumbnail-big.png new file mode 100644 index 000000000..2b0567984 Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/2x/thumbnail-big.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/thumbnail-small.png b/apps/documenteditor/main/resources/img/toolbar/2x/thumbnail-small.png new file mode 100644 index 000000000..41fcc6c43 Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/2x/thumbnail-small.png differ diff --git a/apps/documenteditor/main/resources/less/thumbnails.less b/apps/documenteditor/main/resources/less/thumbnails.less index 1deb3682f..5098c7576 100644 --- a/apps/documenteditor/main/resources/less/thumbnails.less +++ b/apps/documenteditor/main/resources/less/thumbnails.less @@ -39,7 +39,7 @@ font-size: 11px; font-weight: normal; margin: 0; - padding-left: 8px; + padding-left: 12px; line-height: 25px; } .thumbnails-sld-box { @@ -52,7 +52,18 @@ } #sld-thumbnails-size { display: inline-block; - margin: 0 10px; + margin: 0 10px 0 8px; + } + } + } + + .dropdown-menu { + li { + a { + padding: 5px 20px 5px 33px; + &.checked:before { + margin-left: -24px; + } } } }