зеркало из https://github.com/mozilla/pjs.git
Add close button to sidebar.
b=33420; r=morse; sr=alecf
This commit is contained in:
Родитель
87662e1cd4
Коммит
4ef2931105
|
@ -1,143 +0,0 @@
|
|||
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
|
||||
|
||||
#sidebar-box
|
||||
{
|
||||
border-left : 1px solid #9D9D9D;
|
||||
border-right : 1px solid #000000;
|
||||
background-color : #9D9D9D;
|
||||
border-bottom : 1px solid #000000;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#sidebar-splitter > .splitter-internal-box {
|
||||
border-top: 1px solid ThreeDHighlight;
|
||||
}
|
||||
|
||||
#sidebar-splitter[state="collapsed"] {
|
||||
border-left: 1px solid ThreeDShadow;
|
||||
}
|
||||
|
||||
#sidebar-splitter[state="collapsed"] > .splitter-internal-box {
|
||||
border-left: 1px solid ThreeDHighlight;
|
||||
}
|
||||
|
||||
.text-panel-loading
|
||||
{
|
||||
margin : 5px 0px;
|
||||
}
|
||||
|
||||
.image-panel-loading
|
||||
{
|
||||
margin : 5px;
|
||||
list-style-image : url("resource:/res/rdf/loading.gif");
|
||||
}
|
||||
|
||||
.sidebarheader-main
|
||||
{
|
||||
border-left : 1px solid #FFFFFF;
|
||||
border-top : 1px solid #FFFFFF;
|
||||
border-right : 1px solid #9D9D9D;
|
||||
border-bottom : 1px solid #9D9D9D;
|
||||
background-color : #DDDDDD;
|
||||
padding : 3px 5px 3px 6px;
|
||||
background-image : url("chrome://communicator/skin/smallheader-bg.gif");
|
||||
color : black;
|
||||
}
|
||||
|
||||
.sidebar-header-text
|
||||
{
|
||||
font-weight : bold;
|
||||
}
|
||||
|
||||
.sidebar-header-grippy
|
||||
{ /* This image still has to be added to the tree (8/8/00). I'll do it after german's approval */
|
||||
list-style-image : url("chrome://global/skin/grippy-short-vert-after.gif");
|
||||
background-color : #DDDDDD;
|
||||
max-width : 32px;
|
||||
height : 4px;
|
||||
}
|
||||
|
||||
#sidebar-title-box[state="collapsed"] > .sidebar-header-grippy {
|
||||
/* This image still has to be added to the tree (8/8/00). I'll do it after german's approval */
|
||||
list-style-image : url("chrome://global/skin/grippy-short-vert-before.gif");
|
||||
}
|
||||
|
||||
#sidebar-panel-picker {
|
||||
-moz-box-direction: reverse;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
#sidebar-panel-picker > .toolbarbutton-box > .toolbarbutton-dropmarker
|
||||
{
|
||||
padding-left : 4px;
|
||||
list-style-image : url("chrome://global/skin/menu-arrow.gif");
|
||||
}
|
||||
|
||||
/**
|
||||
* texttab folder lookalike e.g. for sidebar panel headers
|
||||
* MAC-TODO: reimplement "Modern" tabs which look like OS8.x/9.x tabs.
|
||||
*/
|
||||
.box-texttab
|
||||
{
|
||||
-moz-binding : url("chrome://communicator/skin/sidebar/sidebarSplitterBindings.xml#panelheader");
|
||||
background-color : #DDDDDD;
|
||||
border-left : 1px solid #FFFFFF;
|
||||
border-top : 1px solid #FFFFFF;
|
||||
border-right : 1px solid #9D9D9D;
|
||||
border-bottom : 1px solid #9D9D9D;
|
||||
}
|
||||
|
||||
.box-texttab[last-panel="true"], .box-texttab[selected="true"]
|
||||
{
|
||||
margin-bottom : 0px;
|
||||
}
|
||||
|
||||
.panelheader-box-1
|
||||
{
|
||||
border : 1px solid #DDDDDD;
|
||||
padding : 3px 5px 3px 6px;
|
||||
}
|
||||
|
||||
.box-texttab:hover
|
||||
{
|
||||
border-right : 1px solid #000000;
|
||||
border-bottom : 1px solid #000000;
|
||||
}
|
||||
|
||||
.box-texttab:hover > .panelheader-box-1
|
||||
{
|
||||
border-right : 1px solid #9D9D9D;
|
||||
border-bottom : 1px solid #9D9D9D;
|
||||
}
|
||||
|
||||
.box-texttab:hover:active
|
||||
{
|
||||
border-left : 1px solid #000000;
|
||||
border-top : 1px solid #000000;
|
||||
border-right : 1px solid #FFFFFF;
|
||||
border-bottom : 1px solid #FFFFFF;
|
||||
}
|
||||
|
||||
.box-texttab:hover:active > .panelheader-box-1
|
||||
{
|
||||
border-left : 1px solid #9D9D9D;
|
||||
border-top : 1px solid #9D9D9D;
|
||||
border-right : 1px solid #DDDDDD;
|
||||
border-bottom : 1px solid #DDDDDD;
|
||||
}
|
||||
|
||||
.sidebar-iframe-no-panels, .loadarea
|
||||
{
|
||||
background-color : #FFFFFF;
|
||||
}
|
||||
|
||||
.iframe-panel
|
||||
{
|
||||
border-left : 1px solid #FFFFFF;
|
||||
border-right : 1px solid #9D9D9D;
|
||||
border-bottom : 1px solid #9D9D9D;
|
||||
/* border-top : 1px solid #FFFFFF; DO NOT UNCOMMENT!!! THERE IS A BUG WHERE,
|
||||
FOR SOME REASON, BORDER-TOP CAUSES CERTAIN APPS
|
||||
(E.G. MAIL) TO CRASH!!! Related to Bug #45336, #45925 (7/21/00) */
|
||||
}
|
|
@ -1,181 +0,0 @@
|
|||
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
|
||||
|
||||
#sidebar-splitter
|
||||
{
|
||||
border-bottom : 1px solid ThreeDShadow;
|
||||
}
|
||||
|
||||
#sidebar-splitter > .splitter-internal-box {
|
||||
border-top: 1px solid ThreeDHighlight;
|
||||
}
|
||||
|
||||
#sidebar-splitter[state="collapsed"] {
|
||||
border-left: 1px solid ThreeDShadow;
|
||||
}
|
||||
|
||||
#sidebar-splitter[state="collapsed"] > .splitter-internal-box {
|
||||
border-left: 1px solid ThreeDHighlight;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#sidebar-box
|
||||
{
|
||||
border-left : 1px solid ThreeDShadow;
|
||||
border-right : 1px solid ThreeDHighlight;
|
||||
background-color : AppWorkspace;
|
||||
}
|
||||
|
||||
.text-panel-loading
|
||||
{
|
||||
margin : 5px 0px;
|
||||
}
|
||||
|
||||
.image-panel-loading
|
||||
{
|
||||
margin : 5px;
|
||||
list-style-image : url("chrome://global/skin/loading.gif");
|
||||
}
|
||||
|
||||
.sidebarheader-main
|
||||
{
|
||||
border : 1px outset InactiveCaption;
|
||||
background-color : InactiveCaption;
|
||||
color : InactiveCaptionText;
|
||||
padding : 1px 2px 1px 6px;
|
||||
}
|
||||
|
||||
#sidebar-panel-picker {
|
||||
-moz-box-direction: reverse;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
#sidebar-panel-picker > .toolbarbutton-box > .toolbarbutton-dropmarker
|
||||
{
|
||||
padding-left : 4px;
|
||||
list-style-image : url("chrome://global/skin/menu-arrow-hover.gif");
|
||||
}
|
||||
|
||||
.sidebar-header-text
|
||||
{
|
||||
font-weight : bold;
|
||||
}
|
||||
|
||||
.sidebar-header-grippy
|
||||
{
|
||||
/* This image still has to be added to the tree (8/8/00). I'll do it after german's approval */
|
||||
list-style-image : url("chrome://global/skin/grippy-short-vert-after.gif");
|
||||
background-color : -moz-Dialog;
|
||||
max-width : 32px;
|
||||
height : 4px;
|
||||
}
|
||||
|
||||
#sidebar-title-box[state="collapsed"] > .sidebar-header-grippy
|
||||
{
|
||||
/* This image still has to be added to the tree (8/8/00). I'll do it after german's approval */
|
||||
list-style-image : url("chrome://global/skin/grippy-short-vert-before.gif");
|
||||
}
|
||||
|
||||
/**
|
||||
* texttab folder lookalike e.g. for sidebar panel headers
|
||||
*/
|
||||
.box-texttab
|
||||
{
|
||||
-moz-binding : url("chrome://communicator/skin/sidebar/sidebarBindings.xml#panelheader");
|
||||
background-color : ThreeDFace;
|
||||
color : ButtonText;
|
||||
cursor : pointer;
|
||||
}
|
||||
|
||||
.box-texttab,
|
||||
.box-texttab[selected="true"],
|
||||
.box-texttab[selected="true"]:hover,
|
||||
.box-texttab[selected="true"]:hover:active
|
||||
{
|
||||
border-left : 1px solid ThreeDHighlight;
|
||||
border-top : 1px solid ThreeDHighlight;
|
||||
border-right : 1px solid ThreeDShadow;
|
||||
border-bottom : 1px solid ThreeDShadow;
|
||||
}
|
||||
|
||||
.panelheader-box-1,
|
||||
.box-texttab[selected="true"]:hover > .panelheader-box-1
|
||||
{
|
||||
border : 1px solid transparent;
|
||||
padding : 2px 1px 2px 0px;
|
||||
}
|
||||
|
||||
.panelheader-grippy-icon
|
||||
{
|
||||
margin : 2px 7px 0px 7px;
|
||||
list-style-image : url("chrome://global/skin/tbg-twisty-collapsed.gif");
|
||||
}
|
||||
|
||||
.panelheader-texture
|
||||
{
|
||||
margin : 1px 0px 1px 0px;
|
||||
background-image : url("chrome://global/skin/toolbargrippy-texture.gif");
|
||||
background-position : 50% 0%;
|
||||
background-repeat : repeat-y;
|
||||
width : 12px;
|
||||
}
|
||||
|
||||
.box-texttab:hover
|
||||
{
|
||||
border-right : 1px solid ThreeDDarkShadow;
|
||||
border-bottom : 1px solid ThreeDDarkShadow;
|
||||
}
|
||||
|
||||
.box-texttab:hover > .panelheader-box-1
|
||||
{
|
||||
border-right : 1px solid ThreeDShadow;
|
||||
border-bottom : 1px solid ThreeDShadow;
|
||||
}
|
||||
|
||||
.box-texttab:hover:active
|
||||
{
|
||||
border : 1px solid ThreeDShadow;
|
||||
}
|
||||
|
||||
.box-texttab:hover:active > .panelheader-box-1
|
||||
{
|
||||
border : 1px solid transparent;
|
||||
}
|
||||
|
||||
.box-texttab[selected="true"],
|
||||
.box-texttab[selected="true"]:hover
|
||||
{
|
||||
font-weight : bold;
|
||||
cursor : default;
|
||||
}
|
||||
|
||||
.box-texttab[last-panel="true"],
|
||||
.box-texttab[selected="true"]
|
||||
{
|
||||
margin-bottom : 0px;
|
||||
}
|
||||
|
||||
.panelheader-grippy-icon[selected="true"]
|
||||
{
|
||||
margin : 2px 5px 0px 5px;
|
||||
list-style-image : url("chrome://global/skin/toolbargrippy-twisty.gif");
|
||||
}
|
||||
|
||||
.sidebar-iframe-no-panels, .loadarea
|
||||
{
|
||||
background-color : -moz-field;
|
||||
}
|
||||
|
||||
.iframe-panel
|
||||
{
|
||||
border-left : 1px solid ThreeDHighlight;
|
||||
border-bottom : 1px solid ThreeDShadow;
|
||||
border-right : 1px solid ThreeDShadow;
|
||||
}
|
||||
|
||||
.panelheader-text
|
||||
{
|
||||
margin : 0px 0px 0px 0px !important;
|
||||
}
|
||||
|
|
@ -395,3 +395,20 @@ button.plain:hover:active {
|
|||
border : none;
|
||||
padding : 0px;
|
||||
}
|
||||
|
||||
/* ::::: close button ::::: */
|
||||
|
||||
.close-button {
|
||||
border: none;
|
||||
list-style-image: url("chrome://global/skin/close.png");
|
||||
}
|
||||
|
||||
.close-button:hover > .toolbarbutton-box {
|
||||
border: 1px solid transparent;
|
||||
}
|
||||
|
||||
.close-button:hover:active,
|
||||
.close-button:hover:active > .toolbarbutton-box {
|
||||
border: none;
|
||||
list-style-image: url("chrome://global/skin/close-act.png");
|
||||
}
|
||||
|
|
|
@ -162,3 +162,20 @@ button.plain:hover:active > .button-box {
|
|||
padding: 0px;
|
||||
}
|
||||
|
||||
/* ::::: close button ::::: */
|
||||
|
||||
.close-button {
|
||||
border: none;
|
||||
list-style-image: url("chrome://global/skin/close.png");
|
||||
}
|
||||
|
||||
.close-button:hover > .toolbarbutton-box {
|
||||
border: 1px solid transparent;
|
||||
}
|
||||
|
||||
.close-button:hover:active,
|
||||
.close-button:hover:active > .toolbarbutton-box {
|
||||
border: none;
|
||||
list-style-image: url("chrome://global/skin/close-act.png");
|
||||
}
|
||||
|
||||
|
|
|
@ -61,6 +61,7 @@ classic.jar:
|
|||
skin/classic/communicator/sidebar/sidebar-close.gif (communicator/sidebar/sidebar-close.gif)
|
||||
skin/classic/communicator/sidebar/sidebar-open-hover.gif (communicator/sidebar/sidebar-open-hover.gif)
|
||||
skin/classic/communicator/sidebar/sidebar-open.gif (communicator/sidebar/sidebar-open.gif)
|
||||
skin/classic/communicator/sidebar/down-arrow.gif (communicator/sidebar/down-arrow.gif)
|
||||
skin/classic/communicator/xpinstall/xpinstall.css (communicator/xpinstall/xpinstall.css)
|
||||
skin/classic/communicator/content-large.gif (communicator/content-large.gif)
|
||||
skin/classic/communicator/content-small.gif (communicator/content-small.gif)
|
||||
|
@ -236,6 +237,8 @@ classic.jar:
|
|||
skin/classic/global/check-radio-disabled.gif (global/check-radio-disabled.gif)
|
||||
skin/classic/global/check-radio.gif (global/check-radio.gif)
|
||||
skin/classic/global/closebox.gif (global/closebox.gif)
|
||||
skin/classic/global/close.png (global/close.png)
|
||||
skin/classic/global/close-act.png (global/close-act.png)
|
||||
skin/classic/global/columnselect.gif (global/columnselect.gif)
|
||||
skin/classic/global/console-error-caret.gif (global/console-error-caret.gif)
|
||||
skin/classic/global/console-error-dash.gif (global/console-error-dash.gif)
|
||||
|
|
Двоичные данные
themes/modern/communicator/sidebar/sbpicker-arrow.gif
Двоичные данные
themes/modern/communicator/sidebar/sbpicker-arrow.gif
Двоичный файл не отображается.
До Ширина: | Высота: | Размер: 53 B После Ширина: | Высота: | Размер: 0 B |
|
@ -73,14 +73,10 @@
|
|||
padding: 2px;
|
||||
}
|
||||
|
||||
#sidebar-panel-picker {
|
||||
-moz-box-direction: reverse;
|
||||
}
|
||||
|
||||
#sidebar-panel-picker > .toolbarbutton-box > .toolbarbutton-dropmarker {
|
||||
list-style-image: url("chrome://communicator/skin/sidebar/sbpicker-arrow.gif");
|
||||
padding-right: 0px;
|
||||
padding-left: 4px;
|
||||
padding-right: 2px;
|
||||
padding-left: 2px;
|
||||
}
|
||||
|
||||
/* ::::: loading info ::::: */
|
||||
|
@ -118,7 +114,7 @@ box[loadstate="stopped"] > box > box > .image-panel-loading {
|
|||
.sidebar-tab-text-box {
|
||||
padding: 5px 0px 0px 0px;
|
||||
}
|
||||
|
||||
|
||||
.sidebar-tab-mid-1 {
|
||||
min-width: 90px;
|
||||
}
|
||||
|
@ -327,4 +323,5 @@ box[loadstate="stopped"] > box > box > .image-panel-loading {
|
|||
|
||||
.box-texttab[first-panel-after-selected="true"] {
|
||||
border-top: 1px solid #D6E0EA;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -435,3 +435,19 @@ button.plain > .button-internal-box > .button.icon:hover:active
|
|||
.exit-dialog {
|
||||
font: menu;
|
||||
}
|
||||
|
||||
/* ::::: close button ::::: */
|
||||
|
||||
.close-button {
|
||||
padding: 4px 2px 4px 2px;
|
||||
border: none;
|
||||
list-style-image: url("chrome://global/skin/button/close.gif");
|
||||
}
|
||||
|
||||
.close-button:hover {
|
||||
list-style-image: url("chrome://global/skin/button/close-hov.gif");
|
||||
}
|
||||
|
||||
.close-button:hover:active {
|
||||
list-style-image: url("chrome://global/skin/button/close-act.gif");
|
||||
}
|
||||
|
|
|
@ -388,6 +388,9 @@ modern.jar:
|
|||
skin/modern/global/button/tbmenu-arrow.gif (global/button/tbmenu-arrow.gif)
|
||||
skin/modern/global/button/tbmenu-arrow-act.gif (global/button/tbmenu-arrow-act.gif)
|
||||
skin/modern/global/button/tbmenu-arrow-dis.gif (global/button/tbmenu-arrow-dis.gif)
|
||||
skin/modern/global/button/close.gif (global/button/close.gif)
|
||||
skin/modern/global/button/close-hov.gif (global/button/close-hov.gif)
|
||||
skin/modern/global/button/close-act.gif (global/button/close-act.gif)
|
||||
skin/modern/global/checkbox/cbox-act-check.gif (global/checkbox/cbox-act-check.gif)
|
||||
skin/modern/global/checkbox/cbox-act.gif (global/checkbox/cbox-act.gif)
|
||||
skin/modern/global/checkbox/cbox-check.gif (global/checkbox/cbox-check.gif)
|
||||
|
|
|
@ -41,4 +41,5 @@
|
|||
<!ENTITY sidebar.sbDirectory.label "Sidebar Directory...">
|
||||
|
||||
<!ENTITY sidebar.pagenotfound.label "This tab is not available right now.">
|
||||
<!ENTITY sidebar.close.tooltip "Close">
|
||||
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
|
||||
<?xml-stylesheet href="chrome://communicator/content/sidebar/sidebarOverlay.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://global/skin/button.css" type="text/css"?>
|
||||
<?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
|
||||
|
||||
<!DOCTYPE window [
|
||||
|
@ -64,7 +65,7 @@
|
|||
<toolbarbutton type="menu" id="sidebar-panel-picker" menubuttontype="sidebar-panels"
|
||||
onpopupshowing="SidebarBuildPickerPopup();"
|
||||
label="&sidebar.picker.label;" >
|
||||
<menupopup id="sidebar-panel-picker-popup" popupanchor="topright"
|
||||
<menupopup id="sidebar-panel-picker-popup" popupanchor="bottomleft"
|
||||
datasources="rdf:null"
|
||||
ref="urn:sidebar:current-panel-list"
|
||||
oncommand="SidebarTogglePanel(event.target);" >
|
||||
|
@ -98,6 +99,8 @@
|
|||
<menuseparator />
|
||||
</menupopup>
|
||||
</toolbarbutton>
|
||||
<toolbarbutton class="close-button" oncommand="SidebarShowHide();"
|
||||
tooltiptext="&sidebar.close.tooltip;"/>
|
||||
</sidebarheader>
|
||||
|
||||
<vbox id="sidebar-panels"
|
||||
|
@ -125,7 +128,8 @@
|
|||
<action>
|
||||
<hbox uri="?panel" class="box-texttab texttab-sidebar"
|
||||
oncommand="SidebarSelectPanel(this,false,false)"
|
||||
hidden="true" label="?title" exclude="?exclude" context="sidebarPopup" />
|
||||
hidden="true" label="?title" exclude="?exclude"
|
||||
context="sidebarPopup"/>
|
||||
<vbox uri="?panel" flex="1*" hidden="true"
|
||||
loadstate="never loaded">
|
||||
<vbox flex="1" class="iframe-panel loadarea">
|
||||
|
|
Загрузка…
Ссылка в новой задаче