Merge branch 'release/v7.1.0' into develop

This commit is contained in:
Julia Radzhabova 2022-03-24 16:35:28 +03:00
commit 49bd75e457
452 changed files with 334 additions and 2363 deletions

View file

@ -606,8 +606,12 @@ define([
this.hidePwd = true;
}
var me = this;
var prevstart = me._input[0].selectionStart,
prevend = me._input[0].selectionEnd;
setTimeout(function () {
me.focus();
me._input[0].selectionStart = prevstart;
me._input[0].selectionEnd = prevend;
}, 1);
},
@ -648,8 +652,12 @@ define([
this._btnElm.off('mouseup', this.passwordHide);
this._btnElm.off('mouseout', this.passwordHide);
var me = this;
var prevstart = me._input[0].selectionStart,
prevend = me._input[0].selectionEnd;
setTimeout(function () {
me.focus();
me._input[0].selectionStart = prevstart;
me._input[0].selectionEnd = prevend;
}, 1);
}
},

View file

@ -800,7 +800,7 @@ define(function(){ 'use strict';
{id: 'menu-effect-group-entrance', value: AscFormat.PRESET_CLASS_ENTR, caption: this.textEntrance, iconClsCustom: 'animation-entrance-custom'},
{id: 'menu-effect-group-emphasis', value: AscFormat.PRESET_CLASS_EMPH, caption: this.textEmphasis, iconClsCustom: 'animation-emphasis-custom'},
{id: 'menu-effect-group-exit', value: AscFormat.PRESET_CLASS_EXIT, caption: this.textExit, iconClsCustom: 'animation-exit-custom'},
{id: 'menu-effect-group-path', value: AscFormat.PRESET_CLASS_PATH, caption: this.textPath, iconClsCustom: 'animation-motion_paths-custom'}
{id: 'menu-effect-group-path', value: AscFormat.PRESET_CLASS_PATH, caption: this.textPath, iconClsCustom: 'animation-motion-paths-custom'}
];
},
@ -808,49 +808,49 @@ define(function(){ 'use strict';
return [
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_APPEAR, iconCls: 'animation-entrance-appear', displayValue: this.textAppear},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FADE, iconCls: 'animation-entrance-fade', displayValue: this.textFade},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FLY_IN_FROM, iconCls: 'animation-entrance-fly_in', displayValue: this.textFlyIn},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FLOAT_UP, iconCls: 'animation-entrance-float_in', displayValue: this.textFloatIn, familyEffect: 'entrfloat'},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FLY_IN_FROM, iconCls: 'animation-entrance-fly-in', displayValue: this.textFlyIn},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FLOAT_UP, iconCls: 'animation-entrance-float-in', displayValue: this.textFloatIn, familyEffect: 'entrfloat'},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_SPLIT, iconCls: 'animation-entrance-split', displayValue: this.textSplit},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_WIPE_FROM, iconCls: 'animation-entrance-wipe', displayValue: this.textWipe},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_CIRCLE, iconCls: 'animation-entrance-shape', displayValue: this.textShape, familyEffect: 'entrshape'},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_WHEEL, iconCls: 'animation-entrance-wheel', displayValue: this.textWheel},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_RANDOM_BARS, iconCls: 'animation-entrance-random_bars', displayValue: this.textRandomBars},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_GROW_AND_TURN, iconCls: 'animation-entrance-grow_turn', displayValue: this.textGrowTurn},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_RANDOM_BARS, iconCls: 'animation-entrance-random-bars', displayValue: this.textRandomBars},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_GROW_AND_TURN, iconCls: 'animation-entrance-grow-turn', displayValue: this.textGrowTurn},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_ZOOM, iconCls: 'animation-entrance-zoom', displayValue: this.textZoom},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_SWIVEL, iconCls: 'animation-entrance-swivel', displayValue: this.textSwivel},
{group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_BOUNCE, iconCls: 'animation-entrance-bounce', displayValue: this.textBounce},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_PULSE, iconCls: 'animation-emphasis-pulse', displayValue: this.textPulse},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_COLOR_PULSE, iconCls: 'animation-emphasis-color_pulse', displayValue: this.textColorPulse},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_COLOR_PULSE, iconCls: 'animation-emphasis-color-pulse', displayValue: this.textColorPulse},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_TEETER, iconCls: 'animation-emphasis-teeter', displayValue: this.textTeeter},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_SPIN, iconCls: 'animation-emphasis-spin', displayValue: this.textSpin},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_GROW_SHRINK, iconCls: 'animation-emphasis-grow_or_Shrink', displayValue: this.textGrowShrink},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_GROW_SHRINK, iconCls: 'animation-emphasis-grow-or-shrink', displayValue: this.textGrowShrink},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_DESATURATE, iconCls: 'animation-emphasis-desaturate', displayValue: this.textDesaturate},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_CONTRASTING_DARKEN, iconCls: 'animation-emphasis-darken', displayValue: this.textDarken},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_LIGHTEN, iconCls: 'animation-emphasis-lighten', displayValue: this.textLighten},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_TRANSPARENCY, iconCls: 'animation-emphasis-transparency', displayValue: this.textTransparency},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_OBJECT_COLOR, iconCls: 'animation-emphasis-object_color', displayValue: this.textObjectColor},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR, iconCls: 'animation-emphasis-complementary_color', displayValue: this.textComplementaryColor},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_LINE_COLOR, iconCls: 'animation-emphasis-line_color', displayValue: this.textLineColor},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_FILL_COLOR, iconCls: 'animation-emphasis-fill_color', displayValue: this.textFillColor},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_OBJECT_COLOR, iconCls: 'animation-emphasis-object-color', displayValue: this.textObjectColor},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR, iconCls: 'animation-emphasis-complementary-color', displayValue: this.textComplementaryColor},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_LINE_COLOR, iconCls: 'animation-emphasis-line-color', displayValue: this.textLineColor},
{group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_FILL_COLOR, iconCls: 'animation-emphasis-fill-color', displayValue: this.textFillColor},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_DISAPPEAR, iconCls: 'animation-exit-disappear', displayValue: this.textDisappear},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_FADE, iconCls: 'animation-exit-fade', displayValue: this.textFade},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_FLY_OUT_TO, iconCls: 'animation-exit-fly_out', displayValue: this.textFlyOut},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_FLOAT_DOWN, iconCls: 'animation-exit-float_out', displayValue: this.textFloatOut, familyEffect: 'exitfloat'},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_FLY_OUT_TO, iconCls: 'animation-exit-fly-out', displayValue: this.textFlyOut},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_FLOAT_DOWN, iconCls: 'animation-exit-float-out', displayValue: this.textFloatOut, familyEffect: 'exitfloat'},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_SPLIT, iconCls: 'animation-exit-split', displayValue: this.textSplit},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_WIPE_FROM, iconCls: 'animation-exit-wipe', displayValue: this.textWipe},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_CIRCLE, iconCls: 'animation-exit-shape', displayValue: this.textShape, familyEffect: 'shape'},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_WHEEL, iconCls: 'animation-exit-wheel', displayValue: this.textWheel},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_RANDOM_BARS, iconCls: 'animation-exit-random_bars', displayValue: this.textRandomBars},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_SHRINK_AND_TURN, iconCls: 'animation-exit-shrink_turn', displayValue: this.textShrinkTurn},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_RANDOM_BARS, iconCls: 'animation-exit-random-bars', displayValue: this.textRandomBars},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_SHRINK_AND_TURN, iconCls: 'animation-exit-shrink-turn', displayValue: this.textShrinkTurn},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_ZOOM, iconCls: 'animation-exit-zoom', displayValue: this.textZoom},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_SWIVEL, iconCls: 'animation-exit-swivel', displayValue: this.textSwivel},
{group: 'menu-effect-group-exit', value: AscFormat.EXIT_BOUNCE, iconCls: 'animation-exit-bounce', displayValue: this.textBounce},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_DOWN, iconCls: 'animation-motion_paths-lines', displayValue: this.textLines, familyEffect: 'pathlines'},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_DOWN, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcs, familyEffect: 'patharcs'},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_DOWN, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurns, familyEffect: 'pathturns'},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_CIRCLE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textShapes, familyEffect: 'pathshapes'},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR, iconCls: 'animation-motion_paths-loops', displayValue: this.textLoops, familyEffect: 'pathloops'}//,
//{group: 'menu-effect-group-path', value: AscFormat.MOTION_CUSTOM_PATH, iconCls: 'animation-motion_paths-custom_path', displayValue: this.textCustomPath}
{group: 'menu-effect-group-path', value: AscFormat.MOTION_DOWN, iconCls: 'animation-motion-paths-lines', displayValue: this.textLines, familyEffect: 'pathlines'},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_DOWN, iconCls: 'animation-motion-paths-arcs', displayValue: this.textArcs, familyEffect: 'patharcs'},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_DOWN, iconCls: 'animation-motion-paths-turns', displayValue: this.textTurns, familyEffect: 'pathturns'},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_CIRCLE, iconCls: 'animation-motion-paths-shapes', displayValue: this.textShapes, familyEffect: 'pathshapes'},
{group: 'menu-effect-group-path', value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR, iconCls: 'animation-motion-paths-loops', displayValue: this.textLoops, familyEffect: 'pathloops'}//,
//{group: 'menu-effect-group-path', value: AscFormat.MOTION_CUSTOM_PATH, iconCls: 'animation-motion-paths-custom-path', displayValue: this.textCustomPath}
];
},

View file

@ -126,11 +126,13 @@ textarea.form-control:focus {
position: absolute;
right: @scaled-one-px-value-ie;
right: @scaled-one-px-value;
top: @scaled-one-px-value-ie;
top: @scaled-one-px-value;
.btn-group > .btn-toolbar,
& > .btn-toolbar {
height: 22px;
padding-top: 1px;
height: 20px;
height: calc(22px - @scaled-one-px-value * 2);
}
}

View file

@ -6,6 +6,10 @@
.wrap-comment {
padding: 16px 24px 0 16px;
background-color: @background-tertiary;
.comment-date {
color: @text-secondary;
}
.name {
font-weight: 600;
font-size: 16px;

View file

@ -89,15 +89,6 @@
.popover__titled {
.list {
ul {
background-color: var(--f7-list-bg-color);
li:first-child, li:last-child {
border-radius: 0;
a {
border-radius: 0;
}
}
}
&:first-child, &:last-child {
ul {
border-radius: 0;
@ -137,10 +128,6 @@
.list:last-child {
li:last-child {
a {
//border-radius: 0;
}
&:after {
content: '';
position: absolute;
@ -163,70 +150,6 @@
}
}
// Bullets, numbers and multilevels
.bullets,
.numbers,
.multilevels {
.list{
margin: 5px;
ul {
&:before, &:after {
display: none;
}
display: flex;
justify-content: space-around;
width: 100%;
margin-top: 10px;
padding: 0 5px;
background: none;
}
&:first-child li:first-child, &:last-child li:last-child {
border-radius: 0;
}
&:last-child li:last-child:after {
display: none;
}
}
.list .item-content {
padding-left: 0;
min-height: 68px;
.item-inner{
padding: 0;
&:after {
display: none;
}
}
}
li {
width: 70px;
height: 70px;
border: 1px solid #c4c4c4;
html.pixel-ratio-2 & {
border: 0.5px solid #c4c4c4;
}
html.pixel-ratio-3 & {
border: 0.33px solid #c4c4c4;
}
.thumb {
width: 100%;
height: 100%;
background-color: @fill-white;
background-size: cover;
label {
width: 100%;
text-align: center;
position: absolute;
top: 34%;
color: @fill-black;
}
}
}
}
.popover {
li:last-child {
.segmented a {
@ -250,9 +173,6 @@
}
.list {
li {
color: @text-normal;
}
.item-content {
.color-preview {
width: 22px;
@ -261,9 +181,6 @@
margin-top: 21px;
box-sizing: border-box;
box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset;
&.auto {
background-color: @autoColor;
}
}
.item-after {
.color-preview {
@ -273,22 +190,9 @@
}
}
}
li.no-indicator {
.item-link {
.item-inner {
padding-right: 15px;
&:before {
content: none;
}
}
}
}
.item-inner {
color: @text-normal;
padding-top: 7px;
color: @text-normal;
.item-after {
color: @text-normal;
.after-start {
margin: 0 5px;
}
@ -315,11 +219,6 @@
display: flex;
align-items: center;
justify-content: center;
&.active {
color: @brandColor;
// background-color: var(--button-active-opacity);
background-color: @button-active-opacity;
}
}
}
}
@ -396,13 +295,6 @@
font-family: inherit;
cursor: pointer;
outline: 0;
&.active {
background: @brandColor;
color: @fill-white;
i.icon {
background-color: @fill-white;
}
}
}
.button-fill {

View file

@ -263,29 +263,6 @@
}
// List
.list {
li {
color: @text-normal;
}
.item-inner {
color: @text-normal;
}
li.no-indicator {
.item-link {
.item-inner{
padding-right: 15px;
&:before {
content: none;
}
}
}
}
.item-link {
.item-inner {
.item-after {
color: @text-normal;
}
}
}
&.inputs-list {
.item-input, .item-link {
.item-inner {
@ -324,14 +301,6 @@
&:first-child {
margin-left: 0;
}
&.active {
color: @brandColor;
// background-color: var(--button-active-opacity);
background-color: @button-active-opacity;
// i.icon {
// background-color: @white;
// }
}
}
}
}
@ -345,82 +314,6 @@
margin-top: -3px;
box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset;
background: @fill-white;
&.auto {
background-color: @autoColor;
}
}
}
}
// Bullets, numbers and multilevels
.bullets,
.numbers,
.multilevels {
.list{
margin: 5px;
ul {
background: none;
&:before, &:after {
display: none;
}
display: flex;
justify-content: space-around;
width: 100%;
margin-top: 10px;
padding: 0 5px;
}
&:first-child li:first-child, &:last-child li:last-child {
border-radius: 0;
}
}
.list .item-content {
padding-left: 0;
min-height: 68px;
.item-inner{
padding: 0;
&:after {
display: none;
}
}
}
li {
width: 70px;
height: 70px;
border: 1px solid @gray;
html.pixel-ratio-2 & {
border: 0.5px solid @gray;
}
html.pixel-ratio-3 & {
border: 0.33px solid @gray;
}
.thumb {
width: 100%;
height: 100%;
background-color: @fill-white;
background-size: cover;
label {
width: 100%;
text-align: center;
position: absolute;
top: 34%;
color: @fill-black;
}
}
}
}
.popover__titled {
.list {
ul {
background-color: var(--f7-list-bg-color);
li:first-child, li:last-child {
border-radius: 0;
a {
border-radius: 0;
}
}
}
}
}
@ -517,12 +410,11 @@
background-size: 24px 24px;
transition-duration: .3s;
.encoded-svg-background('<svg xmlns="http://www.w3.org/2000/svg" fill="@{white}" height="24" viewBox="0 0 24 24" width="24"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/></svg>');
&::placeholder {
color: @fill-white;
}
}
.searchbar input::placeholder {
color: @fill-white;
}
.navbar {
.searchbar-expandable.searchbar-enabled {
top: 0;

View file

@ -68,8 +68,13 @@
margin-top: 0;
}
.inner-range-title {
color: @text-normal;
padding: 15px 0 0 15px;
}
.range-number {
color: @text-normal;
}
}
.page-content {
&.no-padding-top {
@ -88,6 +93,16 @@
}
.list {
li.no-indicator {
.item-link {
.item-inner{
padding-right: 15px;
&:before {
content: none;
}
}
}
}
.item-text {
text-overflow: initial;
white-space: normal;
@ -98,6 +113,86 @@
.font-item img {
filter: var(--image-border-types-filter, none)
}
.buttons {
.button.active {
background-color: @button-active-opacity;
}
}
.item-content {
.color-preview.auto {
background-color: @autoColor;
}
}
}
// Bullets, numbers and multilevels
.bullets,
.numbers,
.multilevels {
.list{
margin: 5px;
ul {
background: none;
&:before, &:after {
display: none;
}
display: flex;
justify-content: space-around;
width: 100%;
margin-top: 10px;
padding: 0 5px;
li {
width: 70px;
height: 70px;
border: 1px solid @gray;
html.pixel-ratio-2 & {
border: 0.5px solid @gray;
}
html.pixel-ratio-3 & {
border: 0.33px solid @gray;
}
.thumb {
width: 100%;
height: 100%;
background-color: @fill-white;
background-size: cover;
label {
width: 100%;
text-align: center;
position: absolute;
top: 34%;
color: @fill-black;
}
}
}
}
}
.row.list .item-content {
padding-left: 0;
min-height: 68px;
.item-inner{
padding: 0;
&:after {
display: none;
}
}
}
}
.popover__titled .popover-inner{
.list {
ul {
background-color: var(--f7-list-bg-color);
li:first-child, li:last-child {
a {
border-radius: 0;
}
}
}
}
}
.shapes {

View file

@ -1,38 +0,0 @@
// About
.about {
.page-content {
text-align: center;
}
.content-block:first-child {
margin: 15px 0;
}
.content-block {
margin: 0 auto 15px;
a {
color: #000;
}
}
h3 {
font-weight: normal;
margin: 0;
&.vendor {
color: #000;
font-weight: bold;
margin-top: 15px;
}
}
p > label {
margin-right: 5px;
}
.logo {
background: url('../../../../common/mobile/resources/img/about/logo.svg') no-repeat center;
margin-top: 20px;
}
}

View file

@ -1,8 +0,0 @@
// Active button icon color
.button {
&.active {
i.icon {
background-color: #fff;
}
}
}

View file

@ -1,460 +0,0 @@
.page-change {
background-color: @fill-white;
.block-description {
background-color: @fill-white;
padding-top: 15px;
padding-bottom: 15px;
margin: 0;
max-width: 100%;
word-wrap: break-word;
}
#user-name {
font-size: 17px;
line-height: 22px;
color: @fill-black;
margin: 0;
}
#date-change {
font-size: 14px;
line-height: 18px;
color: @text-tertiary;
margin: 0;
margin-top: 3px;
}
#text-change {
color: @fill-black;
font-size: 15px;
line-height: 20px;
margin: 0;
margin-top: 10px;
}
.block-btn, .content-block.block-btn:first-child {
position: absolute;
bottom: 0;
display: flex;
flex-direction: row;
justify-content: space-between;
margin: 0;
width: 100%;
height: 44px;
align-items: center;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2);
#btn-reject-change {
margin-left: 20px;
}
#btn-goto-change {
margin-left: 10px;
}
.change-buttons, .accept-reject {
display: flex;
}
.next-prev {
display: flex;
.link {
width: 44px;
}
}
.link {
position: relative;
display: flex;
justify-content: center;
align-items: center;
font-size: 17px;
height: 44px;
min-width: 44px;
}
}
#no-changes {
padding: 16px;
}
}
.navbar .center-collaboration {
display: flex;
justify-content: space-around;
}
.container-collaboration {
.navbar .right.close-collaboration {
position: absolute;
right: 10px;
}
.page-content .list-block:first-child {
margin-top: -1px;
}
}
//Display mode
.page-display-mode[data-page="display-mode-view"] {
.list-block {
li.media-item {
.item-title {
font-weight: normal;
}
.item-subtitle {
font-size: 14px;
color: @gray;
}
}
}
}
//Edit users
@initialEditUser: #373737;
#user-list {
.item-content {
padding-left: 0;
}
.item-inner {
justify-content: flex-start;
padding-left: 15px;
}
.length {
margin-left: 4px;
}
.color {
min-width: 40px;
min-height: 40px;
margin-right: 20px;
text-align: center;
border-radius: 50px;
line-height: 40px;
color: @initialEditUser;
font-weight: 500;
}
ul:before {
content: none;
}
}
//Comments
.page-comments, .add-comment, .page-view-comments, .container-edit-comment, .container-add-reply, .page-edit-comment, .page-add-reply, .page-edit-reply {
.header-comment {
display: flex;
justify-content: space-between;
padding-right: 16px;
.comment-right {
display: flex;
justify-content: space-between;
width: 70px;
}
}
.list-block .item-inner {
display: block;
padding: 16px 0;
word-wrap: break-word;
}
.list-reply {
padding-left: 26px;
}
.reply-textarea, .comment-textarea, .edit-reply-textarea {
resize: vertical;
}
.user-name {
font-size: 17px;
line-height: 22px;
color: @fill-black;
margin: 0;
font-weight: bold;
}
.comment-date, .reply-date {
font-size: 13px;
line-height: 18px;
color: @text-secondary;
margin: 0;
margin-top: 0px;
}
.comment-text, .reply-text {
color: @fill-black;
font-size: 15px;
line-height: 25px;
margin: 0;
max-width: 100%;
padding-right: 15px;
pre {
white-space: pre-wrap;
}
}
.reply-item {
margin-top: 15px;
padding-right: 16px;
padding-top: 13px;
.header-reply {
display: flex;
justify-content: space-between;
}
.user-name {
padding-top: 3px;
}
&:before {
content: '';
position: absolute;
left: auto;
bottom: 0;
right: auto;
top: 0;
height: 1px;
width: 100%;
background-color: @listBlockBorderColor;
display: block;
z-index: 15;
-webkit-transform-origin: 50% 100%;
transform-origin: 50% 100%;
}
}
.comment-quote {
color: @text-secondary;
border-left: 1px solid @text-secondary;
padding-left: 10px;
padding-right: 16px;
margin: 5px 0;
font-size: 15px;
}
.wrap-comment, .wrap-reply {
padding: 16px 24px 0 16px;
}
.comment-textarea, .reply-textarea, .edit-reply-textarea {
margin-top: 10px;
background:transparent;
outline:none;
width: 100%;
font-size: 17px;
border: none;
border-radius: 3px;
min-height: 100px;
}
}
.settings.popup .list-block ul.list-reply:last-child:after, .settings.popover .list-block ul.list-reply:last-child:after {
display: none;
}
.container-edit-comment {
.page {
background-color: @fill-white;
}
}
//view comment
.container-view-comment {
position: fixed;
-webkit-transition: height 100ms;
transition: height 120ms;
background-color: #FFFFFF;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
height: 50%;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12);
.pages {
background-color: #FFFFFF;
}
.page-view-comments {
background-color: #FFFFFF;
.list-block {
margin-bottom: 100px;
ul:before, ul:after {
content: none;
}
.item-inner {
padding: 0;
}
}
}
.toolbar {
position: fixed;
background-color: #FFFFFF;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14);
&:before {
content: none;
}
.toolbar-inner {
display: flex;
justify-content: space-between;
padding: 0 16px;
.button-left {
min-width: 80px;
}
.button-right {
min-width: 62px;
display: flex;
justify-content: space-between;
a {
padding: 0 12px;
}
}
}
}
.swipe-container {
display: flex;
justify-content: center;
height: 40px;
.icon-swipe {
margin-top: 8px;
width: 40px;
height: 4px;
background: rgba(0, 0, 0, 0.12);
border-radius: 2px;
}
}
.list-block {
margin-top: 0;
}
&.popover {
position: absolute;
border-radius: 4px;
min-height: 170px;
height: 400px;
max-height: 600px;
.toolbar {
position: absolute;
border-radius: 0 0 4px 4px;
.toolbar-inner {
padding-right: 0;
}
}
.pages {
position: absolute;
.page {
border-radius: 13px;
.page-content {
padding: 16px;
padding-bottom: 80px;
.list-block {
margin-bottom: 0px;
.item-content {
padding-left: 0;
.header-comment, .reply-item {
padding-right: 0;
}
}
}
.block-reply {
margin-top: 10px;
.reply-textarea {
min-height: 70px;
width: 278px;
border: 1px solid #c4c4c4;
border-radius: 6px;
padding: 5px;
}
}
.edit-reply-textarea {
min-height: 60px;
width: 100%;
border: 1px solid #c4c4c4;
border-radius: 6px;
padding: 5px;
height: 60px;
margin-top: 10px;
}
.comment-text {
padding-right: 0;
.comment-textarea {
border: 1px solid #c4c4c4;
border-radius: 6px;
padding: 8px;
min-height: 80px;
height: 80px;
}
}
}
}
}
}
}
#done-comment {
color: @brandColor;
}
.page-add-comment {
background-color: @fill-white;
.wrap-comment, .wrap-reply {
padding: 16px 24px 0 16px;
.header-comment {
justify-content: flex-start;
}
.user-name {
font-weight: bold;
font-size: 17px;
padding-left: 5px;
}
.comment-date {
font-size: 13px;
color: @text-secondary;
padding-left: 5px;
}
.wrap-textarea {
margin-top: 16px;
padding-right: 6px;
.comment-textarea {
font-size: 17px;
border: none;
margin-top: 0;
min-height: 100px;
border-radius: 4px;
width: 100%;
padding-left: 5px;
&::placeholder {
color: @gray;
font-size: 17px;
}
}
}
}
}
.container-add-reply {
height: 100%;
.navbar {
a.link i + span {
margin-left: 0;
}
}
.page {
background-color: #FFFFFF;
}
}
.actions-modal-button.color-red {
color: @red;
}
.page-edit-comment, .page-add-reply, .page-edit-reply {
background-color: #FFFFFF;
.header-comment {
justify-content: flex-start;
}
.navbar {
.right {
height: 100%;
#add-reply, #edit-comment, #edit-reply {
display: flex;
align-items: center;
padding-left: 16px;
padding-right: 16px;
height: 100%;
}
}
}
}
.container-edit-comment {
position: fixed;
}

View file

@ -1,171 +0,0 @@
// Color palette
.color-palette {
a {
flex-grow: 1;
position: relative;
min-width: 10px;
min-height: 26px;
margin: 1px 1px 0 0;
box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset;
&.active {
&:after {
content:' ';
position: absolute;
width: 100%;
height: 100%;
box-shadow: 0 0 0 1px white, 0 0 0 4px @brandColor;
z-index: 1;
border-radius: 1px;
}
}
&.transparent {
background-repeat: no-repeat;
background-size: 100% 100%;
.encoded-svg-background("<svg xmlns='http://www.w3.org/2000/svg' x='0px' y='0px' viewBox='0 0 22 22' xml:space='preserve'><line stroke='#ff0000' stroke-linecap='undefined' stroke-linejoin='undefined' id='svg_1' y2='0' x2='22' y1='22' x1='0' stroke-width='2' fill='none'/></svg>");
}
}
.theme-colors {
.item-inner {
display: inline-block;
overflow: visible;
}
}
.standart-colors, .dynamic-colors {
.item-inner {
overflow: visible;
}
}
}
.custom-colors {
display: flex;
justify-content: space-around;
align-items: center;
margin: 15px;
&.phone {
max-width: 300px;
margin: 0 auto;
margin-top: 4px;
.button-round {
margin-top: 20px;
}
}
.right-block {
margin-left: 20px;
}
.button-round {
height: 72px;
width: 72px;
padding: 0;
display: flex;
justify-content: center;
align-items: center;
border-radius: 100px;
background-color: #ffffff;
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
border-color: transparent;
margin-top: 25px;
&.active-state {
background-color: rgba(0, 0, 0, 0.1);
}
}
.color-hsb-preview {
width: 72px;
height: 72px;
border-radius: 100px;
overflow: hidden;
border: 1px solid #c4c4c4;
}
.new-color-hsb-preview {
width: 100%;
height: 36px;
}
.current-color-hsb-preview {
width: 100%;
height: 36px;
}
.list-block ul:before, .list-block ul:after {
content: none;
}
.list-block ul li {
border: 1px solid rgba(0, 0, 0, 0.3);
}
.color-picker-wheel {
position: relative;
width: 290px;
max-width: 100%;
height: auto;
font-size: 0;
svg {
width: 100%;
height: auto;
}
.color-picker-wheel-handle {
width: calc(100% / 6);
height: calc(100% / 6);
position: absolute;
box-sizing: border-box;
border: 2px solid #fff;
box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
background: red;
border-radius: 50%;
left: 0;
top: 0;
}
.color-picker-sb-spectrum {
background-color: #000;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%);
position: relative;
width: 45%;
height: 45%;
left: 50%;
top: 50%;
transform: translate3d(-50%, -50%, 0);
position: absolute;
}
.color-picker-sb-spectrum-handle {
width: 4px;
height: 4px;
position: absolute;
left: -2px;
top: -2px;
z-index: 1;
&:after {
background-color: inherit;
content: '';
position: absolute;
width: 16px;
height: 16px;
border: 1px solid #fff;
border-radius: 50%;
box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5);
box-sizing: border-box;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
transition: 150ms;
transition-property: transform;
transform-origin: center;
}
&.color-picker-sb-spectrum-handle-pressed:after {
transform: scale(1.5) translate(-33.333%, -33.333%);
}
}
}
}
#font-color-auto.active .color-auto {
box-shadow: 0 0 0 1px white, 0 0 0 4px @brandColor;
border-radius: 1px;
}

View file

@ -1,21 +0,0 @@
.color-schemes-menu {
cursor: pointer;
display: block;
background-color: #fff;
.item-inner {
justify-content: flex-start;
}
.color-schema-block {
display: flex;
}
.color {
min-width: 26px;
min-height: 26px;
margin: 0 2px 0 0;
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset;
}
.text {
margin-left: 20px;
color: #212121;
}
}

View file

@ -1,117 +0,0 @@
// Container
.phone.ios {
.container-edit,
.container-collaboration,
.container-filter {
.navbar {
.hairline(top, @toolbarBorderColor);
}
.page-content {
.list-block:first-child {
margin-top: -1px;
}
}
}
}
.container-edit,
.container-add,
.container-settings,
.container-collaboration,
.container-filter {
&.popover {
width: 360px;
}
}
.settings {
&.popup,
&.popover {
.list-block {
ul {
border-radius: 0 !important;
background: #fff;
&:last-child {
.hairline(bottom, @listBlockBorderColor);
}
}
&:first-child {
margin-top: 0;
}
&:last-child {
margin-bottom: 30px;
}
li:first-child a,
li:last-child a {
border-radius: 0 !important;
}
}
&,
.popover-inner {
> .content-block {
width: 100%;
height: 100%;
margin: 0;
padding: 0;
color: #000;
}
}
.popover-view {
border-radius: 13px;
> .pages {
border-radius: 13px;
}
}
.content-block:first-child {
margin-top: 0;
.content-block-inner {
&:before {
height: 0;
}
}
}
}
.categories {
width: 100%;
> .buttons-row {
width: 100%;
.button {
padding: 0 1px;
}
}
}
.popover-inner {
height: 400px;
}
}
.container-add {
.categories {
> .buttons-row {
.button {
&.active {
i.icon {
background-color: transparent;
}
}
display: flex;
justify-content: center;
align-items: center;
}
}
}
}

View file

@ -1,95 +0,0 @@
// Context menu
.document-menu {
@contextMenuBg: rgba(0,0,0,0.9);
@modalHairlineColor: rgba(230,230,230,0.9);
@modalButtonColor : rgba(200,200,200,0.9);
background-color: @contextMenuBg;
width: auto;
border-radius: 8px;
z-index: 12500;
.popover-angle {
&:after {
background: @contextMenuBg;
}
}
.list-block {
font-size: 14px;
white-space: pre;
&:first-child {
ul {
.hairline-remove(left);
border-radius: 7px 0 0 7px;
}
li:first-child a{
border-radius: 7px 0 0 7px;
}
}
&:last-child {
ul {
.hairline-remove(right);
border-radius: 0 7px 7px 0;
}
li:last-child a{
border-radius: 0 7px 7px 0;
}
}
&:first-child:last-child {
li:first-child:last-child a, ul:first-child:last-child {
border-radius: 7px;
}
}
.item-link {
display: inline-block;
html:not(.watch-active-state) &:active, &.active-state {
//.transition(0ms);
background-color: #d9d9d9;
.item-inner {
.hairline-color(right, transparent);
}
}
html.phone & {
padding: 0 10px;
}
&.list-button {
color: @white;
.hairline(right, @modalHairlineColor);
line-height: 36px;
}
}
// List items
li {
display: inline-block;
}
// Last-childs
li {
&:last-child {
.list-button {
.hairline-remove(right);
}
}
&:last-child, &:last-child li:last-child {
.item-inner {
.hairline-remove(right);
}
}
li:last-child, &:last-child li {
.item-inner {
.hairline(right, @modalHairlineColor);
}
}
}
.no-hairlines();
.no-hairlines-between()
}
}

View file

@ -1,35 +0,0 @@
// Data view
.dataview {
&.page-content {
background: @white;
}
.row {
justify-content: space-around;
}
ul {
padding: 0 10px;
list-style: none;
li {
display: inline-block;
}
}
.active {
position: relative;
z-index: 1;
&::after {
content: '';
position: absolute;
width: 22px;
height: 22px;
right: -5px;
bottom: -5px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{brandColor}"><g><circle fill="#fff" cx="11" cy="11" r="11"/><path d="M11,21A10,10,0,1,1,21,11,10,10,0,0,1,11,21h0ZM17.4,7.32L17.06,7a0.48,0.48,0,0,0-.67,0l-7,6.84L6.95,11.24a0.51,0.51,0,0,0-.59.08L6,11.66a0.58,0.58,0,0,0,0,.65l3.19,3.35a0.38,0.38,0,0,0,.39,0L17.4,8a0.48,0.48,0,0,0,0-.67h0Z"/></g></svg>');
}
}
}

View file

@ -1,93 +0,0 @@
// List extend
.item-content {
.item-after {
&.splitter {
color: #000;
label {
margin: 0 5px;
}
.buttons-row {
min-width: 90px;
margin-left: 10px;
}
}
&.value {
display: block;
min-width: 60px;
color: @black;
margin-left: 10px;
text-align: right;
}
input.field {
color: @brandColor;
&.placeholder-color::-webkit-input-placeholder {
color: @brandColor;
}
&.right {
text-align: right;
}
}
}
&.buttons {
.item-inner {
padding-top: 0;
padding-bottom: 0;
align-items: stretch;
> .row {
width: 100%;
align-items: stretch;
.button {
flex: 1;
border: none;
height: inherit;
border-radius: 0;
font-size: 17px;
display: flex;
align-items: center;
justify-content: center;
}
}
}
}
.item-after .color-preview {
width: 75px;
height: 30px;
margin-top: -3px;
box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset;
}
i .color-preview {
width: 22px;
height: 8px;
display: inline-block;
margin-top: 21px;
box-sizing: border-box;
box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset;
}
}
.item-link {
&.no-indicator {
.item-inner {
background-image: none;
padding-right: 15px;
}
}
}
.list-block {
.item-link.list-button {
color: @brandColor;
}
}

View file

@ -1,10 +1,6 @@
.device-ios {
.wrap-comment {
height: calc(100% - 60px);
background-color: @background-tertiary;
.comment-date {
color: @text-secondary;
}
}
.add-comment-popup, .add-reply-popup, .add-comment-dialog, .add-reply-dialog {
.wrap-textarea {

View file

@ -1,38 +0,0 @@
// About
.about {
.page-content {
text-align: center;
}
.content-block:first-child {
margin: 15px 0;
}
.content-block {
margin: 0 auto 15px;
a {
color: #000;
}
}
h3 {
font-weight: normal;
margin: 0;
&.vendor {
color: #000;
font-weight: bold;
margin-top: 15px;
}
}
p > label {
margin-right: 5px;
}
.logo {
background: url('../../../../common/mobile/resources/img/about/logo.svg') no-repeat center;
}
}

View file

@ -1,9 +0,0 @@
// Active button icon color
.button {
&.active {
i.icon {
background-color: #fff;
}
}
}

View file

@ -1,507 +0,0 @@
.page-change {
.block-description {
background-color: @fill-white;
padding-top: 15px;
padding-bottom: 15px;
margin: 0;
max-width: 100%;
word-wrap: break-word;
}
#user-name {
font-size: 16px;
line-height: 22px;
color: @fill-black;
margin: 0;
}
#date-change {
font-size: 14px;
line-height: 18px;
color: @text-tertiary;
margin: 0;
margin-top: 3px;
}
#text-change {
color: @fill-black;
font-size: 15px;
line-height: 20px;
margin: 0;
margin-top: 10px;
}
.block-btn {
position: absolute;
bottom: 0;
display: flex;
flex-direction: row;
justify-content: space-between;
margin: 0;
width: 100%;
height: 56px;
align-items: center;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2);
#btn-reject-change {
margin-left: 15px;
}
.change-buttons, .accept-reject, .next-prev {
display: flex;
}
.link {
position: relative;
display: flex;
justify-content: center;
align-items: center;
font-size: 14px;
text-transform: uppercase;
font-weight: 500;
height: 56px;
min-width: 48px;
}
}
.header-change {
display: flex;
justify-content: flex-start;
padding-right: 16px;
.initials-change {
height: 40px;
width: 40px;
border-radius: 50px;
color: #FFFFFF;
display: flex;
justify-content: center;
align-items: center;
margin-right: 16px;
font-size: 18px;
}
}
#no-changes {
padding: 16px;
}
}
.container-collaboration {
.navbar .right.close-collaboration {
position: absolute;
right: 5px;
}
.page-content .list-block:first-child {
margin-top: -1px;
}
}
//Display mode
.page-display-mode {
.list-block {
.item-subtitle {
font-size: 14px;
color: @gray;
}
}
}
//Edit users
@initialEditUser: #373737;
#user-list {
.item-content {
padding-left: 0;
}
.item-inner {
justify-content: flex-start;
padding-left: 15px;
}
.length {
margin-left: 4px;
}
.color {
min-width: 40px;
min-height: 40px;
margin-right: 20px;
text-align: center;
border-radius: 50px;
line-height: 40px;
color: @initialEditUser;
font-weight: 400;
}
ul:before {
content: none;
}
}
//Comments
.page-comments, .page-add-comment, .page-view-comments, .container-edit-comment, .container-add-reply, .page-edit-comment, .page-add-reply, .page-edit-reply {
.list-block {
ul {
&:before, &:after {
content: none;
}
}
.item-inner {
display: block;
padding: 16px 0;
word-wrap: break-word;
&:after {
content: none;
}
}
}
.list-reply {
padding-left: 26px;
}
.reply-textarea, .comment-textarea, .edit-reply-textarea {
resize: vertical;
}
.user-name {
font-size: 16px;
line-height: 22px;
color: @fill-black;
margin: 0;
}
.comment-date, .reply-date {
font-size: 12px;
line-height: 18px;
color: @text-secondary;
margin: 0;
margin-top: 0px;
}
.comment-text, .reply-text {
color: @fill-black;
font-size: 15px;
line-height: 25px;
margin: 0;
max-width: 100%;
padding-right: 15px;
pre {
white-space: pre-wrap;
}
}
.reply-item {
padding-right: 16px;
padding-top: 13px;
.header-reply {
display: flex;
justify-content: space-between;
}
.user-name {
padding-top: 3px;
}
}
.comment-quote {
color: @text-secondary;
border-left: 1px solid @text-secondary;
padding-left: 10px;
padding-right: 16px;
margin: 5px 0;
font-size: 15px;
}
.wrap-comment, .wrap-reply {
padding: 16px 24px 0 16px;
}
.comment-textarea, .reply-textarea, .edit-reply-textarea {
margin-top: 10px;
background:transparent;
outline:none;
width: 100%;
font-size: 15px;
border: none;
border-radius: 3px;
min-height: 100px;
}
.header-comment {
display: flex;
justify-content: space-between;
padding-right: 16px;
.comment-right {
display: flex;
justify-content: space-between;
width: 70px;
}
.comment-left {
display: flex;
justify-content: space-between;
}
.initials-comment {
height: 40px;
width: 40px;
border-radius: 50px;
color: #FFFFFF;
display: flex;
justify-content: center;
align-items: center;
margin-right: 16px;
font-size: 18px;
}
}
.header-reply {
.reply-left {
display: flex;
justify-content: space-between;
align-items: flex-start;
}
.initials-reply {
width: 24px;
height: 24px;
color: #FFFFFF;
font-size: 11px;
display: flex;
justify-content: center;
align-items: center;
margin-right: 16px;
border-radius: 50px;
margin-top: 5px;
}
}
}
.settings.popup .list-block ul.list-reply:last-child:after, .settings.popover .list-block ul.list-reply:last-child:after {
display: none;
}
//view comment
.container-view-comment {
position: fixed;
-webkit-transition: height 100ms;
transition: height 100ms;
background-color: #FFFFFF;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
height: 50%;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14);
.page-view-comments {
background-color: #FFFFFF;
.list-block {
margin-bottom: 120px;
ul:before, ul:after {
content: none;
}
.item-inner {
padding: 0;
}
}
}
.toolbar {
position: fixed;
background-color: #FFFFFF;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14);
&.toolbar-bottom {
top: auto;
}
&:before {
content: none;
}
a {
&.link {
color: @brandColor;
font-size: 16px;
}
}
.toolbar-inner {
display: flex;
justify-content: space-between;
padding: 0 16px;
.button-left {
min-width: 80px;
}
.button-right {
min-width: 62px;
display: flex;
justify-content: space-between;
a {
padding: 0 8px;
}
}
}
}
.swipe-container {
display: flex;
justify-content: center;
height: 40px;
background-color: @background-primary;
.icon-swipe {
margin-top: 8px;
width: 40px;
height: 4px;
background: rgba(0, 0, 0, 0.12);
border-radius: 2px;
}
}
.list-block {
margin-top: 0;
}
&.popover {
position: absolute;
border-radius: 4px;
min-height: 170px;
height: 400px;
max-height: 600px;
.toolbar {
position: absolute;
border-radius: 0 0 4px 4px;
.toolbar-inner {
padding-right: 0;
}
}
.pages {
position: absolute;
.page {
border-radius: 13px;
.page-content {
padding: 16px;
padding-bottom: 80px;
.list-block {
margin-bottom: 0px;
.item-content {
padding-left: 0;
.header-comment, .reply-item {
padding-right: 0;
}
}
}
.block-reply {
margin-top: 10px;
.reply-textarea {
min-height: 70px;
width: 278px;
border: 1px solid #c4c4c4;
border-radius: 6px;
padding: 5px;
}
}
.edit-reply-textarea {
min-height: 60px;
width: 100%;
border: 1px solid #c4c4c4;
border-radius: 6px;
padding: 5px;
height: 60px;
margin-top: 10px;
}
.comment-text {
padding-right: 0;
.comment-textarea {
border: 1px solid #c4c4c4;
border-radius: 6px;
padding: 8px;
min-height: 80px;
height: 80px;
}
}
}
}
}
}
}
#done-comment {
padding: 0 16px;
}
.page-add-comment {
.wrap-comment, .wrap-reply {
padding: 16px 24px 0 16px;
.header-comment {
justify-content: flex-start;
}
.user-name {
font-size: 17px;
font-weight: bold;
}
.comment-date {
font-size: 13px;
color: @text-secondary;
}
.wrap-textarea {
margin-top: 16px;
padding-right: 6px;
.comment-textarea {
font-size: 17px;
border: none;
margin-top: 0;
min-height: 100px;
border-radius: 4px;
&::placeholder {
color: @gray;
font-size: 17px;
}
}
}
}
}
.container-edit-comment, .container-add-reply {
height: 100%;
.navbar {
&:after {
content: '';
position: absolute;
left: 0;
bottom: 0;
right: auto;
top: auto;
height: 1px;
width: 100%;
background-color: #c4c4c4;
display: block;
z-index: 15;
-webkit-transform-origin: 50% 100%;
transform-origin: 50% 100%;
}
.navbar-inner {
justify-content: space-between;
}
a.link i + span {
margin-left: 0;
}
.center {
font-size: 18px;
}
.right {
margin-left: 0;
}
}
.page-add-comment {
background-color: @fill-white;
}
.header-comment {
justify-content: flex-start;
}
}
.actions-modal-button.color-red {
color: @red;
}
.page-edit-comment, .page-add-reply, .page-edit-reply {
background-color: @fill-white;
.header-comment {
justify-content: flex-start;
}
.navbar {
.right {
height: 100%;
#add-new-reply, #edit-comment, #edit-reply {
display: flex;
align-items: center;
padding-left: 16px;
padding-right: 16px;
height: 100%;
}
}
}
}
.container-edit-comment {
position: fixed;
}

View file

@ -1,175 +0,0 @@
// Color palette
.color-palette {
a {
flex-grow: 1;
position: relative;
min-width: 10px;
min-height: 26px;
margin: 1px 1px 0 0;
box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset;
&.active {
&:after {
content:' ';
position: absolute;
width: 100%;
height: 100%;
box-shadow: 0 0 0 1px white, 0 0 0 4px @brandColor;
z-index: 1;
border-radius: 1px;
}
}
&.transparent {
background-repeat: no-repeat;
background-size: 100% 100%;
.encoded-svg-background("<svg xmlns='http://www.w3.org/2000/svg' x='0px' y='0px' viewBox='0 0 22 22' xml:space='preserve'><line stroke='#ff0000' stroke-linecap='undefined' stroke-linejoin='undefined' id='svg_1' y2='0' x2='22' y1='22' x1='0' stroke-width='2' fill='none'/></svg>");
}
}
.theme-colors {
.item-inner {
display: inline-block;
overflow: visible;
}
}
.standart-colors, .dynamic-colors {
.item-inner {
overflow: visible;
}
}
&.list-block:last-child li:last-child a {
border-radius: 0;
}
}
.custom-colors {
display: flex;
justify-content: space-around;
align-items: center;
margin: 15px;
&.phone {
max-width: 300px;
margin: 0 auto;
margin-top: 4px;
.button-round {
margin-top: 20px;
}
}
.right-block {
margin-left: 20px;
}
.button-round {
height: 72px;
width: 72px;
padding: 0;
display: flex;
justify-content: center;
align-items: center;
border-radius: 100px;
background-color: @brandColor;
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
border-color: transparent;
margin-top: 25px;
&.active-state {
background-color: rgba(0, 0, 0, 0.1);
}
}
.color-hsb-preview {
width: 72px;
height: 72px;
border-radius: 100px;
overflow: hidden;
border: 1px solid #ededed;
}
.new-color-hsb-preview {
width: 100%;
height: 36px;
}
.current-color-hsb-preview {
width: 100%;
height: 36px;
}
.list-block ul:before, .list-block ul:after {
content: none;
}
.list-block ul li {
border: 1px solid rgba(0, 0, 0, 0.3);
}
.color-picker-wheel {
position: relative;
width: 290px;
max-width: 100%;
height: auto;
font-size: 0;
svg {
width: 100%;
height: auto;
}
.color-picker-wheel-handle {
width: calc(100% / 6);
height: calc(100% / 6);
position: absolute;
box-sizing: border-box;
border: 2px solid #fff;
box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
background: red;
border-radius: 50%;
left: 0;
top: 0;
}
.color-picker-sb-spectrum {
background-color: #000;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%);
position: relative;
width: 45%;
height: 45%;
left: 50%;
top: 50%;
transform: translate3d(-50%, -50%, 0);
position: absolute;
}
.color-picker-sb-spectrum-handle {
width: 4px;
height: 4px;
position: absolute;
left: -2px;
top: -2px;
z-index: 1;
&:after {
background-color: inherit;
content: '';
position: absolute;
width: 16px;
height: 16px;
border: 1px solid #fff;
border-radius: 50%;
box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5);
box-sizing: border-box;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
transition: 150ms;
transition-property: transform;
transform-origin: center;
}
&.color-picker-sb-spectrum-handle-pressed:after {
transform: scale(1.5) translate(-33.333%, -33.333%);
}
}
}
}
#font-color-auto.active .color-auto {
box-shadow: 0 0 0 1px white, 0 0 0 4px @brandColor;
border-radius: 1px;
}

View file

@ -1,21 +0,0 @@
.color-schemes-menu {
cursor: pointer;
display: block;
background-color: #fff;
.item-inner {
justify-content: flex-start;
}
.color-schema-block {
display: flex;
}
.color {
min-width: 26px;
min-height: 26px;
margin: 0 2px 0 0;
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset;
}
.text {
margin-left: 20px;
color: #212121;
}
}

View file

@ -1,77 +0,0 @@
// Container
.phone.android {
.container-edit,
.container-collaboration,
.container-filter {
.page-content {
.list-block:first-child {
margin-top: -1px;
}
}
}
}
.container-edit,
.container-add,
.container-settings,
.container-collaboration,
.container-filter {
&.popover {
width: 360px;
}
}
.settings {
&.popup,
&.popover {
.list-block {
ul {
border-radius: 0;
background: #fff;
}
&:first-child {
margin-top: 0;
li:first-child a {
border-radius: 0;
}
}
}
&,
.popover-inner {
> .content-block {
width: 100%;
height: 100%;
margin: 0;
padding: 0;
}
}
.popover-view {
border-radius: 2px;
> .pages {
border-radius: 2px;
}
}
}
.categories {
width: 100%;
height: 100%;
margin: 0;
padding: 0;
> .toolbar {
top: 0;
height: 100%;
}
}
.popover-inner {
height: 400px;
}
}

View file

@ -1,29 +0,0 @@
// Context menu
.document-menu {
width: auto;
line-height: 1 !important;
z-index: 12500;
.popover-inner {
overflow: hidden;
}
.list-block {
white-space: pre;
ul {
height: 48px;
}
li {
display: inline-block;
}
.item-link {
html.phone & {
padding: 0 10px;
}
}
}
}

View file

@ -1,32 +0,0 @@
// Data view
.dataview {
.row {
justify-content: space-around;
}
ul {
padding: 0 10px;
list-style: none;
justify-content: space-around;
li {
display: inline-block;
}
}
.active {
position: relative;
z-index: 1;
&::after {
content: '';
position: absolute;
width: 22px;
height: 22px;
right: -5px;
bottom: -5px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{brandColor}"><g><circle fill="#fff" cx="11" cy="11" r="11"/><path d="M11,21A10,10,0,1,1,21,11,10,10,0,0,1,11,21h0ZM17.4,7.32L17.06,7a0.48,0.48,0,0,0-.67,0l-7,6.84L6.95,11.24a0.51,0.51,0,0,0-.59.08L6,11.66a0.58,0.58,0,0,0,0,.65l3.19,3.35a0.38,0.38,0,0,0,.39,0L17.4,8a0.48,0.48,0,0,0,0-.67h0Z"/></g></svg>');
}
}
}

View file

@ -1,73 +0,0 @@
// List extend
.item-content{
.item-after {
&.splitter {
label {
color: #000;
margin:0 5px;
line-height: 36px;
}
.button {
min-width: 40px;
margin-left: 0;
}
}
&.value {
display: block;
min-width: 50px;
color: @black;
margin-left: 10px;
text-align: right;
}
}
&.buttons {
.item-inner {
padding-top: 0;
padding-bottom: 0;
> .row {
width: 100%;
.button {
flex: 1;
font-size: 17px;
margin-left: 5px;
&:first-child {
margin-left: 0;
}
&.active {
color: #fff;
background-color: @brandColor;
}
}
}
}
}
.color-preview {
width: 30px;
height: 30px;
border-radius: 16px;
margin-top: -3px;
box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset;
}
}
.item-link {
&.no-indicator {
.item-inner {
background-image: none;
padding-right: 16px;
}
}
}
.popover .list-block:last-child li:last-child .buttons a {
border-radius: 3px;
}

View file

@ -1,10 +1,6 @@
.device-android {
.wrap-comment {
height: calc(100% - 72px);
background-color: @background-tertiary;
.comment-date {
color: @text-secondary;
}
}
.add-comment-popup, .add-reply-popup, .add-comment-dialog, .add-reply-dialog {
.wrap-textarea {

View file

@ -1616,6 +1616,12 @@ define([
this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
this.api.asc_registerCallback('asc_onConnectionStateChanged', _.bind(this.onUserConnection, this));
this.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this));
var value = Common.localStorage.getItem('de-settings-unit');
value = (value!==null) ? parseInt(value) : (this.appOptions.customization && this.appOptions.customization.unit ? Common.Utils.Metric.c_MetricUnits[this.appOptions.customization.unit.toLocaleLowerCase()] : Common.Utils.Metric.getDefaultMetric());
(value===undefined) && (value = Common.Utils.Metric.getDefaultMetric());
Common.Utils.Metric.setCurrentMetric(value);
Common.Utils.InternalSettings.set("de-settings-unit", value);
},
applyModeEditorElements: function() {
@ -1664,11 +1670,7 @@ define([
toolbarView.on('insertcontrol', _.bind(me.onInsertControl, me));
}
var value = Common.localStorage.getItem('de-settings-unit');
value = (value!==null) ? parseInt(value) : (this.appOptions.customization && this.appOptions.customization.unit ? Common.Utils.Metric.c_MetricUnits[this.appOptions.customization.unit.toLocaleLowerCase()] : Common.Utils.Metric.getDefaultMetric());
(value===undefined) && (value = Common.Utils.Metric.getDefaultMetric());
Common.Utils.Metric.setCurrentMetric(value);
Common.Utils.InternalSettings.set("de-settings-unit", value);
var value = Common.Utils.InternalSettings.get("de-settings-unit");
me.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter));
value = Common.localStorage.itemExists('de-hidden-rulers') ? Common.localStorage.getBool('de-hidden-rulers') : (this.appOptions.customization && !!this.appOptions.customization.hideRulers);

View file

@ -444,6 +444,8 @@ define([
},
onAddChartStylesPreview: function(styles){
if (!this.cmbChartStyle) return;
var me = this;
if (styles && styles.length>0){
var stylesStore = this.cmbChartStyle.menuPicker.store;

View file

@ -1147,33 +1147,47 @@ define([
'<td class="left"><label>' + this.txtSpaces + '</label></td>',
'<td class="right"><label id="id-info-spaces"></label></td>',
'</tr>',
'<tr class="pdf-info">',
'<td class="left"><label>' + this.txtPageSize + '</label></td>',
'<td class="right"><label id="id-info-page-size"></label></td>',
'</tr>',
'<tr class="divider"></tr>',
'<tr class="divider"></tr>',
// '<tr>',
// '<td class="left"><label>' + this.txtEditTime + '</label></td>',
// '<td class="right"><label id="id-info-edittime"></label></td>',
// '</tr>',
'<tr>',
'<tr class="docx-info">',
'<td class="left"><label>' + this.txtTitle + '</label></td>',
'<td class="right"><div id="id-info-title"></div></td>',
'</tr>',
'<tr>',
'<tr class="docx-info">',
'<td class="left"><label>' + this.txtSubject + '</label></td>',
'<td class="right"><div id="id-info-subject"></div></td>',
'</tr>',
'<tr>',
'<tr class="docx-info">',
'<td class="left"><label>' + this.txtComment + '</label></td>',
'<td class="right"><div id="id-info-comment"></div></td>',
'</tr>',
'<tr class="divider"></tr>',
'<tr class="divider"></tr>',
'<tr class="divider docx-info"></tr>',
'<tr class="divider docx-info"></tr>',
'<tr class="pdf-info">',
'<td class="left"><label>' + this.txtTitle + '</label></td>',
'<td class="right"><label id="id-lbl-info-title"></label></td>',
'</tr>',
'<tr class="pdf-info">',
'<td class="left"><label>' + this.txtSubject + '</label></td>',
'<td class="right"><label id="id-lbl-info-subject"></label></td>',
'</tr>',
'<tr class="divider pdf-info pdf-title"></tr>',
'<tr class="divider pdf-info pdf-title"></tr>',
'<tr>',
'<td class="left"><label>' + this.txtModifyDate + '</label></td>',
'<td class="right"><label id="id-info-modify-date"></label></td>',
'</tr>',
'<tr>',
'<td class="left"><label>' + this.txtModifyBy + '</label></td>',
'<td class="right"><label id="id-info-modify-by"></label></td>',
'<td class="left"><label>' + this.txtModifyBy + '</label></td>',
'<td class="right"><label id="id-info-modify-by"></label></td>',
'</tr>',
'<tr class="divider modify">',
'<tr class="divider modify">',
@ -1185,7 +1199,23 @@ define([
'<td class="left"><label>' + this.txtAppName + '</label></td>',
'<td class="right"><label id="id-info-appname"></label></td>',
'</tr>',
'<tr>',
'<tr class="pdf-info">',
'<td class="left"><label>' + this.txtAuthor + '</label></td>',
'<td class="right"><label id="id-lbl-info-author"></label></td>',
'</tr>',
'<tr class="pdf-info">',
'<td class="left"><label>' + this.txtPdfVer + '</label></td>',
'<td class="right"><label id="id-info-pdf-ver"></label></td>',
'</tr>',
'<tr class="pdf-info">',
'<td class="left"><label>' + this.txtPdfTagged + '</label></td>',
'<td class="right"><label id="id-info-pdf-tagged"></label></td>',
'</tr>',
'<tr class="pdf-info">',
'<td class="left"><label>' + this.txtFastWV + '</label></td>',
'<td class="right"><label id="id-info-fast-wv"></label></td>',
'</tr>',
'<tr class="docx-info">',
'<td class="left" style="vertical-align: top;"><label style="margin-top: 3px;">' + this.txtAuthor + '</label></td>',
'<td class="right" style="vertical-align: top;"><div id="id-info-author">',
'<table>',
@ -1230,6 +1260,7 @@ define([
this.lblStatParagraphs = $markup.findById('#id-info-paragraphs');
this.lblStatSymbols = $markup.findById('#id-info-symbols');
this.lblStatSpaces = $markup.findById('#id-info-spaces');
this.lblPageSize = $markup.findById('#id-info-pages-size');
// this.lblEditTime = $markup.find('#id-info-edittime');
// edited info
@ -1323,6 +1354,15 @@ define([
}
}).on('keydown:before', keyDownBefore);
// pdf info
this.lblPageSize = $markup.findById('#id-info-page-size');
this.lblPdfTitle = $markup.findById('#id-lbl-info-title');
this.lblPdfSubject = $markup.findById('#id-lbl-info-subject');
this.lblPdfAuthor = $markup.findById('#id-lbl-info-author');
this.lblPdfVer = $markup.findById('#id-info-pdf-ver');
this.lblPdfTagged = $markup.findById('#id-info-pdf-tagged');
this.lblFastWV = $markup.findById('#id-info-fast-wv');
this.btnApply = new Common.UI.Button({
el: $markup.findById('#fminfo-btn-apply')
});
@ -1399,10 +1439,16 @@ define([
this._ShowHideDocInfo(false);
$('tr.divider.general', this.el)[visible?'show':'hide']();
var pdfProps = (this.api) ? this.api.asc_getPdfProps() : null;
var appname = (this.api) ? this.api.asc_getAppProps() : null;
if (appname) {
$('.pdf-info', this.el).hide();
appname = (appname.asc_getApplication() || '') + (appname.asc_getAppVersion() ? ' ' : '') + (appname.asc_getAppVersion() || '');
this.lblApplication.text(appname);
} else if (pdfProps) {
$('.docx-info', this.el).hide();
appname = pdfProps ? pdfProps.Producer || '' : '';
this.lblApplication.text(appname);
}
this._ShowHideInfoItem(this.lblApplication, !!appname);
@ -1412,7 +1458,8 @@ define([
if (value)
this.lblDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
this._ShowHideInfoItem(this.lblDate, !!value);
}
} else if (pdfProps)
this.updatePdfInfo(pdfProps);
},
updateFileInfo: function() {
@ -1424,14 +1471,6 @@ define([
value;
this.coreProps = props;
// var app = (this.api) ? this.api.asc_getAppProps() : null;
// if (app) {
// value = app.asc_getTotalTime();
// if (value)
// this.lblEditTime.text(value + ' ' + this.txtMinutes);
// }
// this._ShowHideInfoItem(this.lblEditTime, !!value);
if (props) {
var visible = false;
value = props.asc_getModified();
@ -1466,6 +1505,82 @@ define([
this.SetDisabled();
},
updatePdfInfo: function(props) {
if (!this.rendered)
return;
var me = this,
value;
if (props) {
value = props.CreationDate;
if (value) {
value = new Date(value);
this.lblDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
}
this._ShowHideInfoItem(this.lblDate, !!value);
var visible = false;
value = props.ModDate;
if (value) {
value = new Date(value);
this.lblModifyDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
}
visible = this._ShowHideInfoItem(this.lblModifyDate, !!value) || visible;
visible = this._ShowHideInfoItem(this.lblModifyBy, false) || visible;
$('tr.divider.modify', this.el)[visible?'show':'hide']();
if (props.PageWidth && props.PageHeight && (typeof props.PageWidth === 'number') && (typeof props.PageHeight === 'number')) {
var w = props.PageWidth,
h = props.PageHeight;
switch (Common.Utils.Metric.getCurrentMetric()) {
case Common.Utils.Metric.c_MetricUnits.cm:
w = parseFloat((w* 25.4 / 72000.).toFixed(2));
h = parseFloat((h* 25.4 / 72000.).toFixed(2));
break;
case Common.Utils.Metric.c_MetricUnits.pt:
w = parseFloat((w/100.).toFixed(2));
h = parseFloat((h/100.).toFixed(2));
break;
case Common.Utils.Metric.c_MetricUnits.inch:
w = parseFloat((w/7200.).toFixed(2));
h = parseFloat((h/7200.).toFixed(2));
break;
}
this.lblPageSize.text(w + ' ' + Common.Utils.Metric.getCurrentMetricName() + ' x ' + h + ' ' + Common.Utils.Metric.getCurrentMetricName());
this._ShowHideInfoItem(this.lblPageSize, true);
} else
this._ShowHideInfoItem(this.lblPageSize, false);
value = props.Title;
value && this.lblPdfTitle.text(value);
visible = this._ShowHideInfoItem(this.lblPdfTitle, !!value);
value = props.Subject;
value && this.lblPdfSubject.text(value);
visible = this._ShowHideInfoItem(this.lblPdfSubject, !!value) || visible;
$('tr.divider.pdf-title', this.el)[visible?'show':'hide']();
value = props.Author;
value && this.lblPdfAuthor.text(value);
this._ShowHideInfoItem(this.lblPdfAuthor, !!value);
value = props.Version;
value && this.lblPdfVer.text(value);
this._ShowHideInfoItem(this.lblPdfVer, !!value);
value = props.Tagged;
if (value !== undefined)
this.lblPdfTagged.text(value===true ? this.txtYes : this.txtNo);
this._ShowHideInfoItem(this.lblPdfTagged, value !== undefined);
value = props.FastWebView;
if (value !== undefined)
this.lblFastWV.text(value===true ? this.txtYes : this.txtNo);
this._ShowHideInfoItem(this.lblFastWV, value !== undefined);
}
},
_ShowHideInfoItem: function(el, visible) {
el.closest('tr')[visible?'show':'hide']();
return visible;
@ -1618,7 +1733,14 @@ define([
txtAddAuthor: 'Add Author',
txtAddText: 'Add Text',
txtMinutes: 'min',
okButtonText: 'Apply'
okButtonText: 'Apply',
txtPageSize: 'Page Size',
txtPdfVer: 'PDF Version',
txtPdfTagged: 'Tagged PDF',
txtFastWV: 'Fast Web View',
txtYes: 'Yes',
txtNo: 'No'
}, DE.Views.FileMenuPanels.DocumentInfo || {}));
DE.Views.FileMenuPanels.DocumentRights = Common.UI.BaseView.extend(_.extend({

View file

@ -794,9 +794,9 @@ define([
});
if (this._state.beginPreviewStyles) {
this._state.beginPreviewStyles = false;
self.mnuTableTemplatePicker.store.reset(arr);
self.mnuTableTemplatePicker && self.mnuTableTemplatePicker.store.reset(arr);
} else
self.mnuTableTemplatePicker.store.add(arr);
self.mnuTableTemplatePicker && self.mnuTableTemplatePicker.store.add(arr);
!this._state.currentStyleFound && this.selectCurrentTableStyle();
},

View file

@ -1710,6 +1710,12 @@
"DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Title",
"DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Uploaded",
"DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Words",
"DE.Views.FileMenuPanels.DocumentInfo.txtPageSize": "Page Size",
"DE.Views.FileMenuPanels.DocumentInfo.txtPdfVer": "PDF Version",
"DE.Views.FileMenuPanels.DocumentInfo.txtPdfTagged": "Tagged PDF",
"DE.Views.FileMenuPanels.DocumentInfo.txtFastWV": "Fast Web View",
"DE.Views.FileMenuPanels.DocumentInfo.txtYes": "Yes",
"DE.Views.FileMenuPanels.DocumentInfo.txtNo": "No",
"DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Change access rights",
"DE.Views.FileMenuPanels.DocumentRights.txtRights": "Persons who have rights",
"DE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Warning",

View file

@ -224,7 +224,7 @@
"textBefore": "Before",
"textBehind": "Behind Text",
"textBorder": "Border",
"textBringToForeground": "Bring to foreground",
"textBringToForeground": "Bring to Foreground",
"textBullets": "Bullets",
"textBulletsAndNumbers": "Bullets & Numbers",
"textCellMargins": "Cell Margins",

View file

@ -283,10 +283,18 @@ class MainController extends Component {
.then ( result => {
window["flat_desine"] = true;
const {t} = this.props;
let _translate = t('Main.SDK', {returnObjects:true});
for (let item in _translate) {
if (_translate.hasOwnProperty(item)) {
const str = _translate[item];
if (item[item.length-1]===' ' && str[str.length-1]!==' ')
_translate[item] += ' ';
}
}
this.api = new Asc.asc_docs_api({
'id-view' : 'editor_sdk',
'mobile' : true,
'translate': t('Main.SDK', {returnObjects:true})
'translate': _translate
});
Common.Notifications.trigger('engineCreated', this.api);

View file

@ -60,27 +60,3 @@
}
}
// Color Schemes
.color-schemes-menu {
cursor: pointer;
display: block;
// background-color: #fff;
.item-inner {
justify-content: flex-start;
}
.color-schema-block {
display: flex;
}
.color {
min-width: 26px;
min-height: 26px;
margin: 0 2px 0 0;
box-shadow: 0 0 0 1px rgba(0,0,0,.15) inset;
}
.item-title {
margin-left: 20px;
// color: #212121;
}
}

View file

@ -105,28 +105,4 @@
}
}
}
}
// Color Schemes
.color-schemes-menu {
cursor: pointer;
display: block;
// background-color: #fff;
.item-inner {
justify-content: flex-start;
}
.color-schema-block {
display: flex;
}
.color {
min-width: 26px;
min-height: 26px;
margin: 0 2px 0 0;
box-shadow: 0 0 0 1px rgba(0,0,0,.15) inset;
}
.item-title {
margin-left: 20px;
// color: #212121;
}
}

View file

@ -151,7 +151,7 @@
.table-styles .row div:not(:first-child) {
margin: 2px auto 0px;
}
.table-styles li, .table-styles .row div {
.table-styles .skeleton-list li, .table-styles .row div {
padding: 0;
}
.table-styles .row .skeleton-list{

View file

@ -205,7 +205,7 @@ const PageStyle = props => {
onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}}
></Range>
</div>
<div slot='inner-end' style={{minWidth: '60px', textAlign: 'right'}}>
<div className='range-number' slot='inner-end' style={{minWidth: '60px', textAlign: 'right'}}>
{stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
</div>
</ListItem>
@ -229,7 +229,7 @@ const PageStyle = props => {
onRangeChanged={(value) => {props.onOpacity(value)}}
></Range>
</div>
<div slot='inner-end' style={{minWidth: '60px', textAlign: 'right'}}>
<div className='range-number' slot='inner-end' style={{minWidth: '60px', textAlign: 'right'}}>
{stateOpacity + ' %'}
</div>
</ListItem>

View file

@ -188,8 +188,6 @@ define([
},
addNewEffect: function (type, group, groupName, replace, parametr, preview) {
if (this._state.Effect == type && this._state.EffectGroup == group && replace)
parametr = this._state.EffectOption;
var parameter = this.view.setMenuParameters(type, groupName, parametr);
this.api.asc_AddAnimation(group, type, (parameter != undefined)?parameter:0, replace, preview);
},
@ -397,7 +395,6 @@ define([
}
view.listEffects.selectRecord(item);
view.listEffects.fillComboView(item, true, forceFill);
view.btnParameters.setIconCls('toolbar__icon icon ' + item.get('iconCls'));
} else {
store.remove(store.findWhere({isCustom: true})); // remove custom effects
if (this._state.Effect==AscFormat.ANIM_PRESET_MULTIPLE) { // add and select "multiple" item
@ -410,7 +407,6 @@ define([
displayValue: view.textMultiple
}), {at:1}));
view.listEffects.menuPicker.deselectAll();
view.btnParameters.setIconCls('toolbar__icon icon animation-none');
} else { // add custom effect to appropriate group
if (group) {
var items = store.where({group: group.get('id')});
@ -425,11 +421,9 @@ define([
}), {at:index+1});
view.listEffects.selectRecord(item);
view.listEffects.fillComboView(item, true, true);
view.btnParameters.setIconCls('toolbar__icon icon ' + item.get('iconCls'));
} else {
view.listEffects.fieldPicker.deselectAll();
view.listEffects.menuPicker.deselectAll();
view.btnParameters.setIconCls('toolbar__icon icon animation-none');
}
}
}

View file

@ -252,7 +252,7 @@ define([
this.btnParameters = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
caption: this.txtParameters,
iconCls: 'toolbar__icon icon animation-none',
iconCls: 'toolbar__icon icon animation-parameters',
menu: new Common.UI.Menu({items: []}),
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationParam],
dataHint: '1',

View file

@ -385,6 +385,8 @@ define([
},
onAddChartStylesPreview: function(styles){
if (!this.cmbChartStyle) return;
var me = this;
if (styles && styles.length>0){
var stylesStore = this.cmbChartStyle.menuPicker.store;

View file

@ -726,9 +726,9 @@ define([
});
if (this._state.beginPreviewStyles) {
this._state.beginPreviewStyles = false;
self.mnuTableTemplatePicker.store.reset(arr);
self.mnuTableTemplatePicker && self.mnuTableTemplatePicker.store.reset(arr);
} else
self.mnuTableTemplatePicker.store.add(arr);
self.mnuTableTemplatePicker && self.mnuTableTemplatePicker.store.add(arr);
!this._state.currentStyleFound && this.selectCurrentTableStyle();
},

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 909 B

After

Width:  |  Height:  |  Size: 933 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 962 B

After

Width:  |  Height:  |  Size: 975 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 972 B

After

Width:  |  Height:  |  Size: 993 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 956 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1,018 B

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1,012 B

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1,000 B

After

Width:  |  Height:  |  Size: 1,013 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 961 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 978 B

After

Width:  |  Height:  |  Size: 983 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 968 B

After

Width:  |  Height:  |  Size: 958 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,003 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1,023 B

Some files were not shown because too many files have changed in this diff Show more