зеркало из https://github.com/mozilla/pjs.git
Fixes for selection bug 19011 and sidebar resize bug 18742. r=ducarroz
This commit is contained in:
Родитель
879684e61d
Коммит
4acdf71acb
|
@ -21,7 +21,6 @@ Rights Reserved.
|
|||
|
||||
<!DOCTYPE window SYSTEM "chrome://addressbook/locale/abCardViewOverlay.dtd">
|
||||
|
||||
|
||||
<overlay xmlns:html="http://www.w3.org/TR/REC-html40"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
@ -30,10 +29,9 @@ Rights Reserved.
|
|||
|
||||
<box id="CardViewBox"
|
||||
align="vertical"
|
||||
flex="100%"
|
||||
style="overflow:auto">
|
||||
flex="100%">
|
||||
|
||||
<html:div hide="true" style="font-size:150%; font-weight:bold; border-bottom:2px solid black" id="CardTitle">*</html:div>
|
||||
<html:div hide="true" id="CardTitle">*</html:div>
|
||||
|
||||
<box align="horizontal" flex="100%">
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ Rights Reserved.
|
|||
<!-- FIX ME - remove document.commandDispatcher.updateCommands() when tree selection calls this automatically -->
|
||||
<tree id="resultsTree"
|
||||
class="abResults"
|
||||
style="width:100%; height:100%"
|
||||
style="width:100%; height:100%; min-width:10px"
|
||||
datasources="rdf:addressdirectory rdf:addresscard"
|
||||
onselect="top.ResultsPaneSelectionChange(); document.commandDispatcher.updateCommands('tree-select');"
|
||||
onblur="goOnEvent(this,'blur')"
|
||||
|
|
|
@ -220,25 +220,25 @@ Rights Reserved.
|
|||
</toolbox>
|
||||
|
||||
<!-- The main address book three pane -->
|
||||
<box align="horizontal" flex="100%">
|
||||
<box align="horizontal" flex="100%" style="min-width:150px">
|
||||
<!-- sidebar with dir tree -->
|
||||
<box id="sidebar-box">
|
||||
<splitter class="sidebar-main-header" collapse="after"
|
||||
onclick="sidebarOpenClosePanel(this)">
|
||||
<html:div class="panel-bar">&addressbook-sidebar-header.label;</html:div>
|
||||
<html:div class="panel-bar" style="min-width:1px">&addressbook-sidebar-header.label;</html:div>
|
||||
</splitter>
|
||||
<html:div style="width:100px; height:100px" flex="1">
|
||||
<html:div style="width:100px; height:100px; min-width:10px" flex="1">
|
||||
<tree id="dirTree"/>
|
||||
</html:div>
|
||||
</box>
|
||||
<splitter id="sidebar-splitter" collapse="before" persist="state"/>
|
||||
|
||||
<box align="vertical" flex="100%">
|
||||
<box align="vertical" flex="100%" style="min-width:100px">
|
||||
|
||||
<!-- results tree -->
|
||||
<box id="results_box" flex="50%" align="vertical">
|
||||
<box id="results_box" flex="50%" style="width:100%" align="vertical">
|
||||
<!-- FIX ME - div is hack to make tree scroll properly -->
|
||||
<html:div flex="1" style="width:100px; height:100px;">
|
||||
<html:div flex="1" style="width:100px; height:100px; min-width:10px">
|
||||
<tree id="resultsTree"/>
|
||||
</html:div>
|
||||
</box>
|
||||
|
|
|
@ -18,16 +18,59 @@ Communications Corporation. Portions created by Netscape are
|
|||
Rights Reserved.
|
||||
*/
|
||||
|
||||
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */
|
||||
@namespace html url("http://www.w3.org/TR/REC-html40"); /* namespace for XUL elements */
|
||||
|
||||
/* CardView styles - used in the Card View Pane*/
|
||||
|
||||
box#CardViewBox {
|
||||
overflow: auto;
|
||||
margin-top: 2px;
|
||||
margin-bottom: 2px;
|
||||
padding-left: 8px;
|
||||
padding-right: 8px;
|
||||
background-color: #EEEEEE;
|
||||
min-width: 1px;
|
||||
user-focus: ignore;
|
||||
}
|
||||
|
||||
html|div#CardTitle {
|
||||
font-size: 150%;
|
||||
font-weight: bold;
|
||||
border-bottom: 2px solid black;
|
||||
}
|
||||
|
||||
box.cardviewgroup {
|
||||
margin-top: 8px;
|
||||
padding-bottom: 5px;
|
||||
min-width: 1px;
|
||||
}
|
||||
|
||||
html|div[class="CardViewHeading"] {
|
||||
padding: 1px;
|
||||
padding-left: 5px;
|
||||
background-color: #99CCCC;
|
||||
color: black;
|
||||
font-weight: bold;
|
||||
min-width: 1px;
|
||||
}
|
||||
|
||||
html|div[class="CardViewText"] {
|
||||
padding-left: 20px;
|
||||
padding-right: 2px;
|
||||
min-width: 1px;
|
||||
}
|
||||
|
||||
|
||||
/* CardEdit styles - used in the Card Edit Dialog */
|
||||
|
||||
box[class="CardEditWidth"] {
|
||||
width : 24.4em;
|
||||
width : 24em;
|
||||
margin-left : 0px;
|
||||
margin-right : 8px;
|
||||
}
|
||||
|
||||
input[class="CardEdit"] {
|
||||
html|input[class="CardEdit"] {
|
||||
width : 25em;
|
||||
height : 1.5em;
|
||||
margin : 0px;
|
||||
|
@ -37,36 +80,6 @@ input[class="CardEdit"] {
|
|||
}
|
||||
|
||||
|
||||
/* CardView styles - used in the Card View Pane*/
|
||||
|
||||
box#CardViewBox {
|
||||
margin-top: 2px;
|
||||
margin-bottom: 2px;
|
||||
padding-left: 8px;
|
||||
padding-right: 8px;
|
||||
background-color: #EEEEEE;
|
||||
user-focus: ignore;
|
||||
}
|
||||
|
||||
box.cardviewgroup {
|
||||
margin-top: 8px;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
|
||||
div[class="CardViewHeading"] {
|
||||
padding: 1px;
|
||||
padding-left: 5px;
|
||||
background-color: #99CCCC;
|
||||
color: black;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
div[class="CardViewText"] {
|
||||
padding-left: 20px;
|
||||
padding-right: 2px;
|
||||
}
|
||||
|
||||
|
||||
/* Custom Trees */
|
||||
|
||||
tree {
|
||||
|
@ -77,12 +90,12 @@ tree:focus {
|
|||
border-left: 1px solid #336699;
|
||||
}
|
||||
|
||||
treeitem[selected="true"] {
|
||||
treeitem[selected="true"] > treerow {
|
||||
color: black;
|
||||
background-color: #CCCCCC;
|
||||
}
|
||||
|
||||
tree:focus treeitem[selected="true"] {
|
||||
tree:focus treeitem[selected="true"] > treerow {
|
||||
color: white;
|
||||
background-color: #336699;
|
||||
}
|
||||
|
@ -140,10 +153,11 @@ tree[class="abResults"] treeitem > treerow > treecell.cardicon {
|
|||
padding-bottom:2px;
|
||||
white-space: nowrap;
|
||||
font-size: smaller;
|
||||
min-width: 20px;
|
||||
}
|
||||
|
||||
#searchtext {
|
||||
min-width: 40px;
|
||||
min-width: 20px;
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
|
|
|
@ -27,14 +27,14 @@ tree:focus {
|
|||
border-left: 1px solid #336699;
|
||||
}
|
||||
|
||||
treeitem[selected="true"] {
|
||||
color: black;
|
||||
background-color: #CCCCCC;
|
||||
treeitem[selected="true"] > treerow {
|
||||
color: black;
|
||||
background-color: #CCCCCC;
|
||||
}
|
||||
|
||||
tree:focus treeitem[selected="true"] {
|
||||
color: white;
|
||||
background-color: #336699;
|
||||
tree:focus treeitem[selected="true"] > treerow {
|
||||
color: white;
|
||||
background-color: #336699;
|
||||
}
|
||||
|
||||
spring.spacer {
|
||||
|
|
|
@ -912,7 +912,7 @@ tree {
|
|||
width: 100%;
|
||||
}
|
||||
|
||||
treeitem[selected="true"] {
|
||||
treeitem[selected="true"] > treerow {
|
||||
color: white;
|
||||
background-color: #336699;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче