Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Commit

Permalink
Merge pull request #5835 from adobe/larz/various-tweaks
Browse files Browse the repository at this point in the history
Small cosmetic tweaks.
  • Loading branch information
RaymondLim committed Nov 5, 2013
2 parents e9c7913 + e58a1d5 commit 2f15f5c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/editor/ImageViewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ define(function (require, exports, module) {
$("#img-preview").on("load", function () {
// add dimensions and size
_naturalWidth = this.naturalWidth;
var dimensionString = _naturalWidth + " x " + this.naturalHeight + " " + Strings.UNIT_PIXELS;
var dimensionString = _naturalWidth + " × " + this.naturalHeight + " " + Strings.UNIT_PIXELS;
// get image size
var fileEntry = new NativeFileSystem.FileEntry(fullPath);
fileEntry.getMetadata(
Expand All @@ -110,7 +110,7 @@ define(function (require, exports, module) {
$("#img-data").html(dimensionString + sizeString);
},
function (error) {
$("#img-data").text(dimensionString);
$("#img-data").html(dimensionString);
}
);
$("#image-holder").show();
Expand Down
2 changes: 1 addition & 1 deletion src/extensions/default/QuickView/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ define(function (require, exports, module) {
$previewContainer.find(".image-preview > img").on("load", function () {
$previewContent
.append("<div class='img-size'>" +
this.naturalWidth + " x " + this.naturalHeight + " " + Strings.UNIT_PIXELS +
this.naturalWidth + " &times; " + this.naturalHeight + " " + Strings.UNIT_PIXELS +
"</div>"
);
$previewContainer.show();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
float: left;
padding-left: 20px;
width: 35%;
word-break: break-all;
word-wrap: break-word;
-webkit-hyphens: auto;
hyphens: auto;

Expand Down
6 changes: 1 addition & 5 deletions src/htmlContent/contributors-list.html
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
{{#.}}
<a href="{{html_url}}" title="{{login}} - {{html_url}}">
<img src="{{avatar_url}}" alt="{{login}}" width="30" height="30" />
</a>
{{/.}}
{{#.}}<a href="{{html_url}}" title="{{login}} - {{html_url}}"><img src="{{avatar_url}}" alt="{{login}}" width="30" height="30" /></a>{{/.}}
7 changes: 4 additions & 3 deletions src/styles/brackets.less
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,10 @@ a, img {
left: 5px;
width: 40px;
text-align: center;
background-color: rgba(0,0,0,0.8);
color: white;
border-radius: 4px;
background-color: rgba(0, 0, 0, 0.8);
color: #fff;
border-radius: 3px;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
}
}

Expand Down

0 comments on commit 2f15f5c

Please sign in to comment.