Mirrors/brackets
1
0
Fork 0
mirror of https://github.com/adobe/brackets.git synced 2024-11-20 18:02:54 +01:00
Code Issues Releases Activity

Squashed from larz/panel-consistency for @larz0

Browse Source
This commit is contained in:
Peter Flynn 2013-09-10 00:03:54 -07:00
parent 7440fbd406
commit 0c624a0bf9
7 changed files with 57 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/htmlContent/problems-panel-table.html
View File

@ -1,8 +1,8 @@
<table class="table table-striped table-condensed row-highlight">
<table class="bottom-panel-table table table-striped table-condensed row-highlight">
<tbody>
{{#reportList}}
<tr>
<td class="line" data-character="{{pos.ch}}">{{friendlyLine}}</td>
<td class="line-number" data-character="{{pos.ch}}">{{friendlyLine}}</td>
<td>{{message}}</td>
<td>{{codeSnippet}}</td>
</tr>

8
src/htmlContent/search-replace-results.html
View File

@ -1,11 +1,11 @@
<table class="table table-striped table-condensed row-highlight">
<table class="bottom-panel-table table table-striped table-condensed row-highlight">
<tbody>
{{#searchResults}}
<tr class="replace-row" data-match="{{index}}">
<td class="checkbox-column"><input type="checkbox" class="check-one" checked="true" /></td>
<td class="line-column">{{line}}</td>
<td>{{pre}}<span class="highlight">{{highlight}}</span>{{post}}</td>
<td class="line-number">{{line}}</td>
<td class="line-text">{{pre}}<span class="highlight">{{highlight}}</span>{{post}}</td>
</tr>
{{/searchResults}}
</tbody>
</table>
</table>

2
src/htmlContent/search-results.html
View File

@ -1,4 +1,4 @@
<table class="table table-striped table-condensed row-highlight">
<table class="bottom-panel-table table table-striped table-condensed row-highlight">
<tbody>
{{#searchList}}
<tr class="file-section" data-file="{{file}}">

2
src/language/CodeInspection.js
View File

@ -205,7 +205,7 @@ define(function (require, exports, module) {
$selectedRow = $(e.currentTarget);
$selectedRow.addClass("selected");
var lineTd = $selectedRow.find("td.line");
var lineTd = $selectedRow.find(".line-number");
var line = parseInt(lineTd.text(), 10) - 1; // convert friendlyLine back to pos.line
var character = lineTd.data("character");

2
src/nls/root/strings.js
View File

@ -150,8 +150,6 @@ define({
"FIND_IN_FILES_MORE_THAN" : "Over ",
"FIND_IN_FILES_PAGING" : "{0}&mdash;{1}",
"FIND_IN_FILES_FILE_PATH" : "<span class='dialog-filename'>{0}</span> {2} <span class='dialog-path'>{1}</span>", // We shoudl use normal dashes on Windows instead of em dash eventually
"FIND_IN_FILES_LINE" : "line: {0}",
"ERROR_FETCHING_UPDATE_INFO_TITLE" : "Error getting update info",
"ERROR_FETCHING_UPDATE_INFO_MSG" : "There was a problem getting the latest update information from the server. Please make sure you are connected to the internet and try again.",

2
src/search/FindReplace.js
View File

@ -388,7 +388,7 @@ define(function (require, exports, module) {
index: results.length, // add indexes to array
from: from,
to: to,
line: StringUtils.format(Strings.FIND_IN_FILES_LINE, from.line + 1),
line: from.line + 1,
pre: line.slice(0, from.ch),
highlight: line.slice(from.ch, multiLine ? undefined : to.ch),
post: multiLine ? "\u2026" : line.slice(to.ch)

108
src/styles/brackets.less
View File

@ -263,6 +263,10 @@ a, img {
border-width: 1px;
border-color: @tc-gray-panel-border;
.check-all {
margin: 7px 15px 7px 7px;
}
.toolbar {
background-color: @tc-gray-panel-top-bar;
border-bottom: @tc-gray-panel-top-bar-shadow;
@ -279,7 +283,10 @@ a, img {
.close {
position: absolute;
right: 10px;
top: 6px;
// vertically centers close button
top: 50%;
margin-top: -10px;
}
}
@ -287,14 +294,8 @@ a, img {
height: 170px;
overflow: auto;
td {
font-size: 12px;
padding-left: @base-padding;
padding-right: @base-padding;
}
.highlight {
background: #fff;
background: @bc-white;
border-radius: 2px;
}
@ -305,6 +306,44 @@ a, img {
}
}
.bottom-panel-table {
td {
font-size: 12px;
padding-left: 15px;
padding-right: 0;
vertical-align: baseline;
}
.file-section > td {
padding-left: 5px;
}
.line-number {
color: @tc-light-weight-quiet-text;
font-family: SourceCodePro;
font-size: 11px;
padding: 4px 0 0 15px;
text-align: right;
white-space: nowrap;
width: 5px;
}
.dialog-filename {
font-size: 13px;
font-weight: @font-weight-semibold;
}
.dialog-path {
font-size: 11px;
font-weight: normal;
}
.line-text {
width: 100%;
}
}
#update-notification {
.sprite-icon(0, 0, 24px, 24px, "images/updateSprites.svg");
}
@ -731,6 +770,7 @@ a, img {
.sane-box-model;
padding-right: 20px;
width: 100%;
line-height: 25px;
.flex-box;
.contracting-col {
@ -790,58 +830,6 @@ a, img {
}
}
#search-results {
td {
padding-left: 3px;
vertical-align: baseline;
}
.dialog-filename {
font-size: 13px;
font-weight: @font-weight-semibold;
}
.dialog-path {
font-size: 11px;
font-weight: normal;
}
.line-number {
color: @tc-light-weight-quiet-text;
font-family: SourceCodePro;
font-size: 11px;
padding: 0 10px 0 14px;
text-align: right;
white-space: nowrap;
}
.line-text {
width: 100%;
}
}
/* Find-Replace All UI */
#replace-all-results {
.check-all {
margin: 0px 22px 0px 6px;
}
.title {
> div {
line-height: 1.8em;
}
}
table {
td.checkbox-column {
width: 20px;
text-align: center;
}
td.line-column {
width: 100px;
}
}
}
/* Modal bar for Find/Quick Open */
.modal-bar.modal-bar-hide {