Changeset 21654
- Timestamp:
- 09/02/09 21:33:38 (4 years ago)
- Files:
-
- plugins/diemPlugin/trunk/dmCorePlugin/web/css/editMode.css (modified) (2 diffs)
- plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditPlugins.js (modified) (1 diff)
- plugins/diemPlugin/trunk/dmCorePlugin/web/lib/jquery-ui/css/jquery-ui-1.7.2.custom.css (modified) (2 diffs)
- plugins/diemPlugin/trunk/dmCorePlugin/web/lib/jquery-ui/css/jquery-ui-dialog.1.7.2.css (modified) (1 diff)
- plugins/diemPlugin/trunk/dmFrontPlugin/config/dm/assets.yml (modified) (1 diff)
- plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmFilter/dmFrontAssetFilter.php (modified) (3 diffs)
- plugins/diemPlugin/trunk/dmFrontPlugin/web/css/dm_reset.css (modified) (2 diffs)
- plugins/diemPlugin/trunk/dmFrontPlugin/web/css/main.css (deleted)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
plugins/diemPlugin/trunk/dmCorePlugin/web/css/editMode.css
r21612 r21654 1 .ui-widget { 2 font-size: 11px; 3 } 4 5 .ui-widget-header { 1 .dm .ui-widget-header { 6 2 background: url(../images/default_bg.png) center center repeat-x; 7 3 border-color: #bbb; … … 47 43 } 48 44 49 50 div.ui-dialog {51 -moz-box-shadow: 0 0 10px #000;52 }53 54 div.ui-dialog.dm .ui-dialog-content {55 overflow: hidden;56 padding: 5px;57 }58 59 div.ui-dialog .ui-dialog-titlebar {60 padding: 3px 3px 1px 12px;61 }62 63 45 ul.ui-tabs-nav > li.dm_error { 64 46 background-image: url(../images/default_bg_red.png); plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditPlugins.js
r21489 r21654 157 157 } 158 158 159 // prevent the dialog from being too high (make sure the titlebar 160 // is accessible) 159 // prevent the dialog from being too high (make sure the titlebar is accessible) 161 160 pTop = Math.max(pTop, minTop); 162 161 this.uiDialog.css({ plugins/diemPlugin/trunk/dmCorePlugin/web/lib/jquery-ui/css/jquery-ui-1.7.2.custom.css
r21653 r21654 33 33 /* Component containers 34 34 ----------------------------------*/ 35 .dm .ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1 .1em; }35 .dm .ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 11px; } 36 36 .dm .ui-widget input, .dm .ui-widget select, .dm .ui-widget textarea, .dm .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } 37 37 .dm .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } … … 271 271 .dm .ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; } 272 272 .dm .ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; } 273 .dm .ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; }273 .dm .ui-corner-all, .dm.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; } 274 274 275 275 /* Overlays */ plugins/diemPlugin/trunk/dmCorePlugin/web/lib/jquery-ui/css/jquery-ui-dialog.1.7.2.css
r21653 r21654 1 1 /* Dialog 2 2 ----------------------------------*/ 3 .dm.ui-dialog { position: relative; padding: .2em; width: 300px; }4 .dm.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative; }3 .dm.ui-dialog { position: relative; padding: .2em; width: 300px; background: #fff; -moz-box-shadow: 0 0 10px #000; } 4 .dm.ui-dialog .ui-dialog-titlebar { padding: 3px 3px 1px 12px; position: relative; } 5 5 .dm.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; } 6 6 .dm.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } 7 7 .dm.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } 8 .dm.ui-dialog .ui-dialog-titlebar-close:hover, .dm .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }9 .dm.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }8 .dm.ui-dialog .ui-dialog-titlebar-close:hover, .dm.ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } 9 .dm.ui-dialog .ui-dialog-content { border: 0; overflow: hidden; padding: 5px; background: none; zoom: 1; } 10 10 .dm.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } 11 11 .dm.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; } plugins/diemPlugin/trunk/dmFrontPlugin/config/dm/assets.yml
r21652 r21654 19 19 front: 20 20 dm_reset: dm_reset 21 main: main22 21 toolBar: toolBar 23 22 pageBar: pageBar plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmFilter/dmFrontAssetFilter.php
r21652 r21654 66 66 'lib.markitup', 67 67 'lib.markitupSet', 68 'front.dm_reset', 68 69 'core.util', 69 70 'core.editMode', … … 76 77 'core.mediaBar', 77 78 'core.form', 78 'front.dm_reset',79 'front.main',80 79 'front.toolBar', 81 80 'front.zone', … … 88 87 { 89 88 $cssArray = array( 90 'core.util', 91 'front.main' 89 'core.util' 92 90 ); 93 91 } plugins/diemPlugin/trunk/dmFrontPlugin/web/css/dm_reset.css
r21653 r21654 1 .dm { 2 font-family: arial,helvetica,verdana,sans-serif; 3 font-size: 12px; 4 } 5 6 .dm a, a.dm { 7 cursor: pointer; 8 } 9 10 .dm, 1 11 .dm form, 2 12 .dm ul, 3 13 .dm ol, 4 14 .dm li, 15 .dm span, 5 16 .dm a, 6 17 .dm a:link, … … 10 21 border: 0; 11 22 padding: 0; 12 background-color: none;23 background-color: transparent; 13 24 text-decoration: none; 14 25 font-weight: normal; 15 color: inherit; 26 color: inherit; 27 line-height: normal; 28 text-align: left; 16 29 } 17 30