From 81bea17aefb26859f825b9293c7c99192874806e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 8 Nov 2011 20:40:44 +0400 Subject: upgrade Dojo to 1.6.1 --- lib/dijit/icons/commonIcons.css | 22 ++++++++++++++++++++-- lib/dijit/icons/commonIcons_rtl.css | 14 ++++++++++++-- lib/dijit/icons/editorIcons.css | 25 +++++++++++++++++++++++-- lib/dijit/icons/editorIcons_rtl.css | 17 +++++++++++++++-- 4 files changed, 70 insertions(+), 8 deletions(-) (limited to 'lib/dijit/icons') diff --git a/lib/dijit/icons/commonIcons.css b/lib/dijit/icons/commonIcons.css index 373752a81..6f2749240 100644 --- a/lib/dijit/icons/commonIcons.css +++ b/lib/dijit/icons/commonIcons.css @@ -1,3 +1,10 @@ +/* Dijit widget common icons*/ + +/*commonIcons.css is located in dijit/icons + +commonIconsRtl.css is TBD. This needs to be reviewed to determine in Rtl is reqd. + +The 16 x 16px icons in these sprites are action and object type images which can be used in the following widgets: accordionContainer, menu, tab, titlepane, tree, and all button widgets and error validation contexts. */ .dijitIconSave, .dijitIconPrint, @@ -34,10 +41,11 @@ .dijitFolderOpened, .dijitIconFolderOpen, .dijitIconError { - background-image: url('images/commonIconsObjActEnabled.png'); + background-image: url('images/commonIconsObjActEnabled.png'); /* Contains both object and action icons in a sprite image for the enabled state. */ width: 16px; height: 16px; } + .dj_ie6 .dijitIconSave, .dj_ie6 .dijitIconPrint, .dj_ie6 .dijitIconCut, @@ -75,6 +83,7 @@ .dj_ie6 .dijitIconError { background-image: url('images/commonIconsObjActEnabled8bit.png'); } + .dijitDisabled .dijitIconSave, .dijitDisabled .dijitIconPrint, .dijitDisabled .dijitIconCut, @@ -110,8 +119,10 @@ .dijitDisabled .dijitFolderOpened, .dijitDisabled .dijitIconFolderOpen, .dijitDisabled .dijitIconError { - background-image: url('images/commonIconsObjActDisabled.png'); + background-image: url('images/commonIconsObjActDisabled.png'); /* Contains both object and action icons as a sprite image for the disabled state. These would be used by buttons and menus. */ } + +/*Action icons*/ .dijitIconSave { background-position: 0px; } .dijitIconPrint { background-position: -16px; } .dijitIconCut { background-position: -32px; } @@ -128,6 +139,9 @@ .dijitIconConfigure { background-position: -208px; } .dijitIconSearch { background-position: -224px; } .dijitIconError { background-position: -496px; } +/* .dijitIconError is also called .dijitContentPaneError icon in the claro/common.css and is applied to HREF url errors that render in a dialog box with the error messsage */ + +/*Object icons*/ .dijitIconApplication { background-position: -240px; } .dijitIconBookmark { background-position: -256px; } .dijitIconChart { background-position: -272px; } @@ -142,5 +156,9 @@ .dijitIconSample { background-position: -416px; } .dijitIconTable { background-position: -432px; } .dijitIconUsers { background-position: -448px; } + + +/*Tree folder icons*/ .dijitIconFolderClosed, .dijitFolderClosed { background-position: -464px; } .dijitIconFolderOpen, .dijitFolderOpened { background-position: -480px; } + diff --git a/lib/dijit/icons/commonIcons_rtl.css b/lib/dijit/icons/commonIcons_rtl.css index 347f3b792..4d4c26f2d 100644 --- a/lib/dijit/icons/commonIcons_rtl.css +++ b/lib/dijit/icons/commonIcons_rtl.css @@ -1,3 +1,8 @@ +/* Dijit widget common icons*/ + +/*commonIcons_rtl.css is located in dijit/icons + +The 16 x 16px icons in these sprites are action and object type images which can be used in the following widgets: accordionContainer, menu, tab, titlepane, tree, and all button widgets and error validation contexts. */ .dijitRtl .dijitIconSave, .dijitRtl .dijitIconPrint, @@ -34,10 +39,11 @@ .dijitRtl .dijitFolderOpened, .dijitRtl .dijitIconFolderOpen, .dijitRtl .dijitIconError, .dijitRtl .dijitContentPaneError { - background-image: url('images/commonIconsObjActEnabled_rtl.png'); + background-image: url('images/commonIconsObjActEnabled_rtl.png'); /* Contains both object and action icons in a sprite image for the enabled state. */ width: 16px; height: 16px; } + .dj_ie6 .dijitRtl .dijitIconSave, .dj_ie6 .dijitRtl .dijitIconPrint, .dj_ie6 .dijitRtl .dijitIconCut, @@ -75,6 +81,7 @@ .dj_ie6 .dijitRtl .dijitIconError, .dj_ie6 .dijitRtl .dijitContentPaneError { background-image: url('images/commonIconsObjActEnabled8bit_rtl.png'); } + .dijitRtl .dijitDisabled .dijitIconSave, .dijitRtl .dijitDisabled .dijitIconPrint, .dijitRtl .dijitDisabled .dijitIconCut, @@ -110,8 +117,11 @@ .dijitRtl .dijitDisabled .dijitFolderOpened, .dijitRtl .dijitDisabled .dijitIconFolderOpen, .dijitRtl .dijitDisabled .dijitIconError, .dijitRtl .dijitDisabled .dijitContentPaneError { - background-image: url('images/commonIconsObjActDisabled_rtl.png'); + background-image: url('images/commonIconsObjActDisabled_rtl.png'); /* Contains both object and action icons as a sprite image for the disabled state. These would be used by buttons and menus. */ } + + +/*For Claro and future themes.*/ .dijitRtl .dijitContentPaneLoading { background:url('images/loadingAnimation_rtl.gif') no-repeat; } diff --git a/lib/dijit/icons/editorIcons.css b/lib/dijit/icons/editorIcons.css index 90ee97e20..8c667ac7d 100644 --- a/lib/dijit/icons/editorIcons.css +++ b/lib/dijit/icons/editorIcons.css @@ -1,14 +1,24 @@ +/* Dijit Editor icons*/ + +/*editorIcons.css is located in dijit/images + +editorIcons.css contains references to the dijit editor widget icons. There are 46 icons used to map to the related editor funtionality in the editor's toolbar. + +*/ + .dijitEditorIcon { - background-image: url('images/editorIconsEnabled.png'); + background-image: url('images/editorIconsEnabled.png'); /* editor icons sprite image for the enabled state */ background-repeat: no-repeat; width: 18px; height: 18px; text-align: center; } .dijitDisabled .dijitEditorIcon { - background-image: url('images/editorIconsDisabled.png'); + background-image: url('images/editorIconsDisabled.png'); /* editor icons sprite image for the disabled state */ } + + .dijitEditorIconSep { background-position: 0px; } .dijitEditorIconSave { background-position: -18px; } .dijitEditorIconPrint { background-position: -36px; } @@ -55,3 +65,14 @@ .dijitEditorIconRemoveFormat { background-position: -774px; } .dijitEditorIconFullScreen { background-position: -792px; } .dijitEditorIconWikiword { background-position: -810px; } +/* .dijitEditorIconToggleDir { background-position: -540px; ;} - 03172010: This icon was not in dijit.editor but is in dojox.editor. */ + +/* no longer in the editor toolbar: .dijitEditorIconToggleDir { background-position: -540px; padding: 0; margin: 0; color:#555555; + font-family:verdana,arial,sans-serif; font-weight: 800; font-size: 70%; */ + + + + + + + diff --git a/lib/dijit/icons/editorIcons_rtl.css b/lib/dijit/icons/editorIcons_rtl.css index 8dcdd7370..4d8cb7198 100644 --- a/lib/dijit/icons/editorIcons_rtl.css +++ b/lib/dijit/icons/editorIcons_rtl.css @@ -1,10 +1,23 @@ +/* Dijit Editor RTL icons*/ +/*editorIcons_rtl.css is located in dijit/images + +editorIcons_rtl.css contains references to the dijit editor widget icons. There are 46 icons used to map to the related editor funtionality in the editor's toolbar. + +*/ + + +/* Editor */ .dijitEditorRtl .dijitEditorIcon { - background-image: url('images/editorIconsEnabled_rtl.png'); + background-image: url('images/editorIconsEnabled_rtl.png'); /* editor icons sprite image for the enabled right to left state */ } .dijitEditorRtlDisabled .dijitEditorIcon { - background-image: url('images/editorIconsDisabled_rtl.png'); + background-image: url('images/editorIconsDisabled_rtl.png'); /* editor icons sprite image for the disabled right to left state */ } + +/* Toolbar */ .dijitToolbarRtl .dijitToolbarSeparator { background-image: url('images/editorIconsEnabled_rtl.png'); } + +/* took this information above from editorRtl.css - good or bad? */ \ No newline at end of file -- cgit v1.2.3