Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
cfe43359
Commit
cfe43359
authored
Mar 25, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Изменения в верстке правой панели ParagraphSettings по просьбе отд. проектирования.
parent
78532171
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
24 additions
and
15 deletions
+24
-15
apps/documenteditor/main/app/template/ParagraphSettings.template
...cumenteditor/main/app/template/ParagraphSettings.template
+6
-3
apps/documenteditor/main/app/view/ParagraphSettings.js
apps/documenteditor/main/app/view/ParagraphSettings.js
+1
-1
apps/documenteditor/main/locale/en.json
apps/documenteditor/main/locale/en.json
+1
-1
apps/presentationeditor/main/app/template/ParagraphSettings.template
...tationeditor/main/app/template/ParagraphSettings.template
+6
-3
apps/presentationeditor/main/app/view/ParagraphSettings.js
apps/presentationeditor/main/app/view/ParagraphSettings.js
+1
-1
apps/presentationeditor/main/locale/en.json
apps/presentationeditor/main/locale/en.json
+1
-1
apps/spreadsheeteditor/main/app/template/ParagraphSettings.template
...dsheeteditor/main/app/template/ParagraphSettings.template
+6
-3
apps/spreadsheeteditor/main/app/view/ParagraphSettings.js
apps/spreadsheeteditor/main/app/view/ParagraphSettings.js
+1
-1
apps/spreadsheeteditor/main/locale/en.json
apps/spreadsheeteditor/main/locale/en.json
+1
-1
No files found.
apps/documenteditor/main/app/template/ParagraphSettings.template
View file @
cfe43359
<table cols="2">
<tr>
<td colspan=2>
<label class="header"><%= scope.str
ParagraphSpacing
%></label>
<label class="header"><%= scope.str
LineHeight
%></label>
</td>
</tr>
<tr>
<td class="padding-small" width="50%">
<label class="input-label"><%= scope.textAt %></label>
<div id="paragraph-combo-line-rule" style="width: 85px;"></div>
</td>
<td class="padding-small" width="50%">
<label class="input-label"><%= scope.textAt %></label>
<div id="paragraph-spin-line-height"></div>
</td>
</tr>
<tr>
<td colspan=2>
<label class="header"><%= scope.strParagraphSpacing %></label>
</td>
</tr>
<tr>
<td class="padding-small" width="50%">
<label class="input-label"><%= scope.strSpacingBefore %></label>
...
...
apps/documenteditor/main/app/view/ParagraphSettings.js
View file @
cfe43359
...
...
@@ -464,7 +464,7 @@ define([
}
},
strParagraphSpacing
:
'
Spacing
'
,
strParagraphSpacing
:
'
Paragraph
Spacing
'
,
strSomeParagraphSpace
:
'
Don
\'
t add interval between paragraphs of the same style
'
,
strLineHeight
:
'
Line Spacing
'
,
strSpacingBefore
:
'
Before
'
,
...
...
apps/documenteditor/main/locale/en.json
View file @
cfe43359
...
...
@@ -1090,7 +1090,7 @@
"DE.Views.PageSizeDialog.textTitle"
:
"Page Size"
,
"DE.Views.PageSizeDialog.textWidth"
:
"Width"
,
"DE.Views.ParagraphSettings.strLineHeight"
:
"Line Spacing"
,
"DE.Views.ParagraphSettings.strParagraphSpacing"
:
"Spacing"
,
"DE.Views.ParagraphSettings.strParagraphSpacing"
:
"
Paragraph
Spacing"
,
"DE.Views.ParagraphSettings.strSomeParagraphSpace"
:
"Don't add interval between paragraphs of the same style"
,
"DE.Views.ParagraphSettings.strSpacingAfter"
:
"After"
,
"DE.Views.ParagraphSettings.strSpacingBefore"
:
"Before"
,
...
...
apps/presentationeditor/main/app/template/ParagraphSettings.template
View file @
cfe43359
<table cols="2">
<tr>
<td colspan=2>
<label class="header"><%= scope.str
ParagraphSpacing
%></label>
<label class="header"><%= scope.str
LineHeight
%></label>
</td>
</tr>
<tr>
<td class="padding-small" width="50%">
<label class="input-label"><%= scope.textAt %></label>
<div id="paragraph-combo-line-rule" style="width: 85px;"></div>
</td>
<td class="padding-small" width="50%">
<label class="input-label"><%= scope.textAt %></label>
<div id="paragraph-spin-line-height"></div>
</td>
</tr>
<tr>
<td colspan=2>
<label class="header"><%= scope.strParagraphSpacing %></label>
</td>
</tr>
<tr>
<td class="padding-small" width="50%">
<label class="input-label"><%= scope.strSpacingBefore %></label>
...
...
apps/presentationeditor/main/app/view/ParagraphSettings.js
View file @
cfe43359
...
...
@@ -334,7 +334,7 @@ define([
}
},
strParagraphSpacing
:
'
Spacing
'
,
strParagraphSpacing
:
'
Paragraph
Spacing
'
,
strLineHeight
:
'
Line Spacing
'
,
strSpacingBefore
:
'
Before
'
,
strSpacingAfter
:
'
After
'
,
...
...
apps/presentationeditor/main/locale/en.json
View file @
cfe43359
...
...
@@ -418,7 +418,7 @@
"PE.Views.LeftMenu.tipSupport"
:
"Feedback & Support"
,
"PE.Views.LeftMenu.tipTitles"
:
"Titles"
,
"PE.Views.ParagraphSettings.strLineHeight"
:
"Line Spacing"
,
"PE.Views.ParagraphSettings.strParagraphSpacing"
:
"Spacing"
,
"PE.Views.ParagraphSettings.strParagraphSpacing"
:
"
Paragraph
Spacing"
,
"PE.Views.ParagraphSettings.strSpacingAfter"
:
"After"
,
"PE.Views.ParagraphSettings.strSpacingBefore"
:
"Before"
,
"PE.Views.ParagraphSettings.textAdvanced"
:
"Show advanced settings"
,
...
...
apps/spreadsheeteditor/main/app/template/ParagraphSettings.template
View file @
cfe43359
<table cols="2">
<tr>
<td colspan=2>
<label class="header"><%= scope.str
ParagraphSpacing
%></label>
<label class="header"><%= scope.str
LineHeight
%></label>
</td>
</tr>
<tr>
<td class="padding-small" width="50%">
<label class="input-label"><%= scope.textAt %></label>
<div id="paragraph-combo-line-rule" style="width: 85px;"></div>
</td>
<td class="padding-small" width="50%">
<label class="input-label"><%= scope.textAt %></label>
<div id="paragraph-spin-line-height"></div>
</td>
</tr>
<tr>
<td colspan=2>
<label class="header"><%= scope.strParagraphSpacing %></label>
</td>
</tr>
<tr>
<td class="padding-small" width="50%">
<label class="input-label"><%= scope.strSpacingBefore %></label>
...
...
apps/spreadsheeteditor/main/app/view/ParagraphSettings.js
View file @
cfe43359
...
...
@@ -342,7 +342,7 @@ define([
}
},
strParagraphSpacing
:
'
Spacing
'
,
strParagraphSpacing
:
'
Paragraph
Spacing
'
,
strLineHeight
:
'
Line Spacing
'
,
strSpacingBefore
:
'
Before
'
,
strSpacingAfter
:
'
After
'
,
...
...
apps/spreadsheeteditor/main/locale/en.json
View file @
cfe43359
...
...
@@ -631,7 +631,7 @@
"SSE.Views.NameManagerDlg.tipIsLocked"
:
"This element is being edited by another user."
,
"SSE.Views.NameManagerDlg.txtTitle"
:
"Name Manager"
,
"SSE.Views.ParagraphSettings.strLineHeight"
:
"Line Spacing"
,
"SSE.Views.ParagraphSettings.strParagraphSpacing"
:
"Spacing"
,
"SSE.Views.ParagraphSettings.strParagraphSpacing"
:
"
Paragraph
Spacing"
,
"SSE.Views.ParagraphSettings.strSpacingAfter"
:
"After"
,
"SSE.Views.ParagraphSettings.strSpacingBefore"
:
"Before"
,
"SSE.Views.ParagraphSettings.textAdvanced"
:
"Show advanced settings"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment