Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Tweak sizing

  • Loading branch information...
commit 3484866ddc2471566fc02f756a63b00fd043124c 1 parent f02cbc1
@birtles birtles authored
View
10 editor/public/css/editor.css
@@ -321,19 +321,21 @@ svg#canvas {
div.tool-box .panelContents {
vertical-align: middle;
display: inline-block;
+ margin-left: 3px;
}
div.tool-box #picker {
height: 88%;
- max-width: 45%;
+ max-width: 45%; /* XXX Remove */
}
div.tool-box #widths {
margin-top: -2%; /* Little tweak to improve appearance on iOS Safari */
- height: 88%;
- max-width: 30%;
+ height: 75%;
+ /* XXX Remove and set height to 70% */
+ max-width: 45%;
}
div.tool-box #play {
height: 88%;
- max-width: 20%;
+ max-width: 20%; /* XXX Remove */
}
}
View
12 editor/public/index.html.php
@@ -29,13 +29,11 @@
<body>
<div class="container" id="container">
<div class="controlPanel tool-box">
- <div class="inner-border">
- <iframe src="img/tool-picker.svg" class="panelContents"
- id="picker"></iframe>
- <iframe src="img/width-picker.svg" class="panelContents"
- id="widths"></iframe>
- <iframe src="img/play.svg" class="panelContents" id="play"></iframe>
- </div>
+ <div class="inner-border"><iframe src="img/tool-picker.svg"
+ class="panelContents"
+ id="picker"></iframe><iframe src="img/width-picker.svg"
+ class="panelContents" id="widths"></iframe><iframe
+ src="img/play.svg" class="panelContents" id="play"></iframe></div>
</div>
<div class="canvas-container">
<div class="controlPanel film-strip">
View
4 editor/public/js/editor-ui.js.php
@@ -982,7 +982,7 @@ function() { EditorUI.continueLongPress(callback); },
var usedWidth = desiredWidth;
if (portrait) {
var picker = document.getElementById("picker");
- desiredWidth += availWidth * 0.4;
+ desiredWidth += availWidth * 0.45;
}
// Thirdly, if the desired space is less than the available space, do some
@@ -1012,7 +1012,7 @@ function() { EditorUI.continueLongPress(callback); },
// In portrait mode, the desired size of the picker is simply the remaining
// space
var remainingWidth = availWidth - usedWidth;
- picker.style.width = remainingWidth + 'px';
+ picker.style.width = remainingWidth - 1 + 'px';
} else {
var ratio = EditorUI.getAspectRatio(picker);
picker.style.width = parseFloat(picker.style.height) * ratio + 'px';
Please sign in to comment.
Something went wrong with that request. Please try again.