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
59f93b6b
Commit
59f93b6b
authored
Jul 08, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Align controls in texture-fill settings.
parent
aeccc51d
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
12 deletions
+12
-12
apps/documenteditor/main/app/template/ShapeSettings.template
apps/documenteditor/main/app/template/ShapeSettings.template
+2
-2
apps/presentationeditor/main/app/template/ShapeSettings.template
...esentationeditor/main/app/template/ShapeSettings.template
+2
-2
apps/presentationeditor/main/app/template/SlideSettings.template
...esentationeditor/main/app/template/SlideSettings.template
+2
-2
apps/presentationeditor/main/app/template/TextArtSettings.template
...entationeditor/main/app/template/TextArtSettings.template
+2
-2
apps/spreadsheeteditor/main/app/template/ShapeSettings.template
...preadsheeteditor/main/app/template/ShapeSettings.template
+2
-2
apps/spreadsheeteditor/main/app/template/TextArtSettings.template
...eadsheeteditor/main/app/template/TextArtSettings.template
+2
-2
No files found.
apps/documenteditor/main/app/template/ShapeSettings.template
View file @
59f93b6b
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<button type="button" class="btn btn-text-default" id="shape-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
<button type="button" class="btn btn-text-default" id="shape-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
</td>
</td>
<td class="padding-small" width="50%">
<td class="padding-small" width="50%">
<button type="button" class="btn btn-text-default" id="shape-button-from-url" style="width:90px;"><%= scope.textFromUrl %></button>
<button type="button" class="btn btn-text-default" id="shape-button-from-url" style="width:90px;
float:right;
"><%= scope.textFromUrl %></button>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
<div id="shape-combo-fill-type" style="width: 90px;"></div>
<div id="shape-combo-fill-type" style="width: 90px;"></div>
</td>
</td>
<td rowspan="2">
<td rowspan="2">
<div style="width: 90px; height: 80px; padding: 14px 20px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;">
<div style="width: 90px; height: 80px; padding: 14px 20px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;
float:right;
">
<div id="shape-texture-img" style="width: 50px;height: 50px;"></div>
<div id="shape-texture-img" style="width: 50px;height: 50px;"></div>
</div>
</div>
</td>
</td>
...
...
apps/presentationeditor/main/app/template/ShapeSettings.template
View file @
59f93b6b
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<button type="button" class="btn btn-text-default" id="shape-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
<button type="button" class="btn btn-text-default" id="shape-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
</td>
</td>
<td class="padding-small" width="50%">
<td class="padding-small" width="50%">
<button type="button" class="btn btn-text-default" id="shape-button-from-url" style="width:90px;"><%= scope.textFromUrl %></button>
<button type="button" class="btn btn-text-default" id="shape-button-from-url" style="width:90px;
float:right;
"><%= scope.textFromUrl %></button>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
<div id="shape-combo-fill-type" style="width: 90px;"></div>
<div id="shape-combo-fill-type" style="width: 90px;"></div>
</td>
</td>
<td rowspan="2">
<td rowspan="2">
<div style="width: 90px; height: 80px; padding: 14px 20px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;">
<div style="width: 90px; height: 80px; padding: 14px 20px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;
float:right;
">
<div id="shape-texture-img" style="width: 50px;height: 50px;"></div>
<div id="shape-texture-img" style="width: 50px;height: 50px;"></div>
</div>
</div>
</td>
</td>
...
...
apps/presentationeditor/main/app/template/SlideSettings.template
View file @
59f93b6b
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<button type="button" class="btn btn-text-default" id="slide-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
<button type="button" class="btn btn-text-default" id="slide-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
</td>
</td>
<td class="padding-small" width="50%">
<td class="padding-small" width="50%">
<button type="button" class="btn btn-text-default" id="slide-button-from-url" style="width:90px;"><%= scope.textFromUrl %></button>
<button type="button" class="btn btn-text-default" id="slide-button-from-url" style="width:90px;
float:right;
"><%= scope.textFromUrl %></button>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
<div id="slide-combo-fill-type" style="width: 90px;"></div>
<div id="slide-combo-fill-type" style="width: 90px;"></div>
</td>
</td>
<td rowspan="2">
<td rowspan="2">
<div style="width: 90px; height: 80px; padding: 14px 20px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;">
<div style="width: 90px; height: 80px; padding: 14px 20px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;
float:right;
">
<div id="slide-texture-img" style="width: 50px;height: 50px;"></div>
<div id="slide-texture-img" style="width: 50px;height: 50px;"></div>
</div>
</div>
</td>
</td>
...
...
apps/presentationeditor/main/app/template/TextArtSettings.template
View file @
59f93b6b
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
<button type="button" class="btn btn-text-default" id="textart-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
<button type="button" class="btn btn-text-default" id="textart-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
</td>
</td>
<td class="padding-small" width="50%">
<td class="padding-small" width="50%">
<button type="button" class="btn btn-text-default" id="textart-button-from-url" style="width:90px;"><%= scope.textFromUrl %></button>
<button type="button" class="btn btn-text-default" id="textart-button-from-url" style="width:90px;
float:right;
"><%= scope.textFromUrl %></button>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
<div id="textart-combo-fill-type" style="width: 90px;"></div>
<div id="textart-combo-fill-type" style="width: 90px;"></div>
</td>
</td>
<td rowspan="2">
<td rowspan="2">
<div style="width: 90px; height: 80px; padding: 14px 20px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;">
<div style="width: 90px; height: 80px; padding: 14px 20px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;
float:right;
">
<div id="textart-texture-img" style="width: 50px;height: 50px;"></div>
<div id="textart-texture-img" style="width: 50px;height: 50px;"></div>
</div>
</div>
</td>
</td>
...
...
apps/spreadsheeteditor/main/app/template/ShapeSettings.template
View file @
59f93b6b
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<button type="button" class="btn btn-text-default" id="shape-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
<button type="button" class="btn btn-text-default" id="shape-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
</td>
</td>
<td class="padding-small" width="50%">
<td class="padding-small" width="50%">
<button type="button" class="btn btn-text-default" id="shape-button-from-url" style="width:90px;"><%= scope.textFromUrl %></button>
<button type="button" class="btn btn-text-default" id="shape-button-from-url" style="width:90px;
float:right;
"><%= scope.textFromUrl %></button>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
<div id="shape-combo-fill-type" style="width: 90px;"></div>
<div id="shape-combo-fill-type" style="width: 90px;"></div>
</td>
</td>
<td rowspan="2">
<td rowspan="2">
<div style="width: 90px; height: 80px; padding: 14px 20px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;">
<div style="width: 90px; height: 80px; padding: 14px 20px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;
float:right;
">
<div id="shape-texture-img" style="width: 50px;height: 50px;"></div>
<div id="shape-texture-img" style="width: 50px;height: 50px;"></div>
</div>
</div>
</td>
</td>
...
...
apps/spreadsheeteditor/main/app/template/TextArtSettings.template
View file @
59f93b6b
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
<button type="button" class="btn btn-text-default" id="textart-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
<button type="button" class="btn btn-text-default" id="textart-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
</td>
</td>
<td class="padding-small" width="50%">
<td class="padding-small" width="50%">
<button type="button" class="btn btn-text-default" id="textart-button-from-url" style="width:90px;"><%= scope.textFromUrl %></button>
<button type="button" class="btn btn-text-default" id="textart-button-from-url" style="width:90px;
float:right;
"><%= scope.textFromUrl %></button>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
<div id="textart-combo-fill-type" style="width: 90px;"></div>
<div id="textart-combo-fill-type" style="width: 90px;"></div>
</td>
</td>
<td rowspan="2">
<td rowspan="2">
<div style="width: 90px; height: 80px; padding: 14px 20px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;">
<div style="width: 90px; height: 80px; padding: 14px 20px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;
float:right;
">
<div id="textart-texture-img" style="width: 50px;height: 50px;"></div>
<div id="textart-texture-img" style="width: 50px;height: 50px;"></div>
</div>
</div>
</td>
</td>
...
...
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