diff --git a/core/modules/dashboard/dashboard-rtl.admin.css b/core/modules/dashboard/dashboard-rtl.admin.css new file mode 100644 index 0000000..220d8e7 --- /dev/null +++ b/core/modules/dashboard/dashboard-rtl.admin.css @@ -0,0 +1,15 @@ +/** + * @file + * Right-to-left specific stylesheet for the Dashboard module. + */ + +#dashboard .disabled-blocks .block, #dashboard .block-placeholder { + margin: 3px 0 3px 3px; + padding: 6px 8px 6px 4px; +} +#dashboard .canvas-content a.button { + margin: 0 10px 0 0; +} +#dashboard .ui-sortable .block h2 { + padding: 0 19px; +} diff --git a/core/modules/dashboard/dashboard-rtl.base.css b/core/modules/dashboard/dashboard-rtl.base.css new file mode 100644 index 0000000..17eb733 --- /dev/null +++ b/core/modules/dashboard/dashboard-rtl.base.css @@ -0,0 +1,24 @@ +/** + * @file + * Right-to-left specific stylesheet for the Dashboard module. + */ + +#dashboard .dashboard-region { + float: right; +} +#dashboard .disabled-blocks .block, #dashboard .block-placeholder { + float: right; +} +#dashboard .ui-sortable .block h2 { + background-position: right -39px; +} +#dashboard.customize-inactive .disabled-blocks .block:hover h2 { + background-position: right -39px; +} +#dashboard.customize-inactive .dashboard-region .ui-sortable .block:hover h2 { + background-position: right -36px; +} +#dashboard #dashboard_main { + margin-left: 1%; + margin-right: 0; +} diff --git a/core/modules/dashboard/dashboard-rtl.css b/core/modules/dashboard/dashboard-rtl.css deleted file mode 100644 index 8d3d0ed..0000000 --- a/core/modules/dashboard/dashboard-rtl.css +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @file - * Right-to-left specific stylesheet for the Dashboard module. - */ - -#dashboard div.dashboard-region { - float: right; -} -#dashboard #disabled-blocks .block, #dashboard .block-placeholder { - float: right; - margin: 3px 0 3px 3px; - padding: 6px 8px 6px 4px; -} -#dashboard .canvas-content a.button { - margin: 0 10px 0 0; -} -#dashboard .ui-sortable .block h2 { - background-position: right -39px; - padding: 0 19px; -} -#dashboard.customize-inactive #disabled-blocks .block:hover h2 { - background-position: right -39px; -} -#dashboard.customize-inactive .dashboard-region .ui-sortable .block:hover h2 { - background-position: right -36px; -} -#dashboard div#dashboard_main { - margin-left: 1%; - margin-right: 0; -} diff --git a/core/modules/dashboard/dashboard.admin.css b/core/modules/dashboard/dashboard.admin.css new file mode 100644 index 0000000..3438430 --- /dev/null +++ b/core/modules/dashboard/dashboard.admin.css @@ -0,0 +1,83 @@ +/** + * @file + * Stylesheet for the Dashboard module. + */ + +#dashboard #dashboard_main { + width: 65%; +} +#dashboard #dashboard_sidebar { + width: 33%; +} +#dashboard .block { + margin-bottom: 20px; +} +#dashboard .dashboard-region .block-placeholder { + display: block; + height: 1.6em; + margin: 0 0 20px 0; + padding: 0; + width: 100%; +} +#dashboard .disabled-blocks .block, +#dashboard .block-placeholder { + background: #E2E1DC; + -moz-border-radius: 4px; + border-radius: 4px; +} +#dashboard .dashboard-add-other-blocks { + margin: 10px 0 0 0; +} +#dashboard .ui-sortable { + border: 2px dashed #CCC; + padding: 10px; +} +#dashboard .canvas-content { + padding: 10px; +} +#dashboard .canvas-content a.button { + color: #5A5A5A; + text-decoration: none; +} +#dashboard .region { + margin: 5px; +} +#dashboard .disabled-blocks { + padding: 5px 0; +} +#dashboard .disabled-blocks .ui-sortable { + background-color: #777; + border: 0; + padding: 0; +} +#dashboard .disabled-blocks .region { + background-color: #E0E0D8; + border: #CCC 1px solid; + padding: 10px; +} +#dashboard .disabled-blocks h2 { + font-weight: normal; +} +#dashboard .disabled-blocks .block { + background: #444; + color: #FFF; +} +#dashboard.customize-inactive .disabled-blocks .block:hover { + background: #0074BD; +} +#dashboard .disabled-blocks .block-placeholder { + height: 1.6em; + width: 30px; +} +#dashboard .ui-sortable .block h2 { + background: transparent url(../../misc/draggable.png) no-repeat 0 -39px; + padding: 0 17px; +} +#dashboard.customize-inactive .disabled-blocks .block:hover h2 { + background: #0074BD url(../../misc/draggable.png) no-repeat 0 -39px; + color: #FFF; +} +#dashboard.customize-inactive .dashboard-region .ui-sortable .block:hover h2 { + background: #0074BD url(../../misc/draggable.png) no-repeat 3px -36px; + color: #FFF; +} diff --git a/core/modules/dashboard/dashboard.base.css b/core/modules/dashboard/dashboard.base.css new file mode 100644 index 0000000..345cb5e --- /dev/null +++ b/core/modules/dashboard/dashboard.base.css @@ -0,0 +1,39 @@ +/** + * @file + * Stylesheet for the Dashboard module. + */ + +#dashboard .dashboard-region { + float: left; + min-height: 1px; +} +#dashboard #dashboard_main { + margin-right: 1%; /* LTR */ +} +#dashboard .dashboard-region .block { + clear: both; +} +#dashboard .block h2 { + float: none; +} +#dashboard .disabled-blocks .block, +#dashboard .block-placeholder { + float: left; /* LTR */ + margin: 3px 3px 3px 0; /* LTR */ + padding: 6px 4px 6px 8px; /* LTR */ +} +#dashboard .canvas-content a.button { + margin: 0 0 0 10px; /* LTR */ +} +#dashboard .disabled-blocks h2 { + display: inline; + white-space: nowrap; +} +#dashboard .disabled-blocks .block .content, +#dashboard .ui-sortable-helper .content { + display: none; +} +#dashboard .ui-sortable .block { + cursor: move; + min-height: 1px; +} diff --git a/core/modules/dashboard/dashboard.css b/core/modules/dashboard/dashboard.css deleted file mode 100644 index 0570f7e..0000000 --- a/core/modules/dashboard/dashboard.css +++ /dev/null @@ -1,108 +0,0 @@ -/** - * @file - * Stylesheet for the Dashboard module. - */ - -#dashboard div.dashboard-region { - float: left; - min-height: 1px; -} -#dashboard div#dashboard_main { - margin-right: 1%; /* LTR */ - width: 65%; -} -#dashboard div#dashboard_sidebar { - width: 33%; -} -#dashboard div.block { - margin-bottom: 20px; -} -#dashboard .dashboard-region .block { - clear: both; -} -#dashboard .dashboard-region .block-placeholder { - display: block; - height: 1.6em; - margin: 0 0 20px 0; - padding: 0; - width: 100%; -} -#dashboard div.block h2 { - float: none; -} -#dashboard #disabled-blocks .block, -#dashboard .block-placeholder { - background: #E2E1DC; - -moz-border-radius: 4px; - border-radius: 4px; - float: left; /* LTR */ - margin: 3px 3px 3px 0; /* LTR */ - padding: 6px 4px 6px 8px; /* LTR */ -} -#dashboard .dashboard-add-other-blocks { - margin: 10px 0 0 0; -} -#dashboard .ui-sortable { - border: 2px dashed #CCC; - padding: 10px; -} -#dashboard .canvas-content { - padding: 10px; -} -#dashboard .canvas-content a.button { - color: #5A5A5A; - margin: 0 0 0 10px; /* LTR */ - text-decoration: none; -} -#dashboard .region { - margin: 5px; -} -#dashboard #disabled-blocks { - padding: 5px 0; -} -#dashboard #disabled-blocks .ui-sortable { - background-color: #777; - border: 0; - padding: 0; -} -#dashboard #disabled-blocks .region { - background-color: #E0E0D8; - border: #CCC 1px solid; - padding: 10px; -} -#dashboard #disabled-blocks h2 { - display: inline; - font-weight: normal; - white-space: nowrap; -} -#dashboard #disabled-blocks .block { - background: #444; - color: #FFF; -} -#dashboard.customize-inactive #disabled-blocks .block:hover { - background: #0074BD; -} -#dashboard #disabled-blocks .block-placeholder { - height: 1.6em; - width: 30px; -} -#dashboard #disabled-blocks .block .content, -#dashboard .ui-sortable-helper .content { - display: none; -} -#dashboard .ui-sortable .block { - cursor: move; - min-height: 1px; -} -#dashboard .ui-sortable .block h2 { - background: transparent url(../../misc/draggable.png) no-repeat 0px -39px; - padding: 0 17px; -} -#dashboard.customize-inactive #disabled-blocks .block:hover h2 { - background: #0074BD url(../../misc/draggable.png) no-repeat 0px -39px; - color: #FFF; -} -#dashboard.customize-inactive .dashboard-region .ui-sortable .block:hover h2 { - background: #0074BD url(../../misc/draggable.png) no-repeat 3px -36px; - color: #FFF; -} diff --git a/core/modules/dashboard/dashboard.js b/core/modules/dashboard/dashboard.js index ca2a3b5..6e967c0 100644 --- a/core/modules/dashboard/dashboard.js +++ b/core/modules/dashboard/dashboard.js @@ -72,13 +72,13 @@ Drupal.behaviors.dashboard = { $('div.customize .canvas-content').append('' + Drupal.t('Done') + ''); // Initialize drag-and-drop. - var regions = $('#dashboard div.region'); + var regions = $('#dashboard .region'); regions.sortable({ connectWith: regions, cursor: 'move', cursorAt: {top:0}, dropOnEmpty: true, - items: '> div.block, > div.disabled-block', + items: '> .block, > .disabled-block', placeholder: 'block-placeholder clearfix', tolerance: 'pointer', start: Drupal.behaviors.dashboard.start, @@ -122,7 +122,7 @@ Drupal.behaviors.dashboard = { var item = $(ui.item); // If the block is in disabled state, remove width. - if ($(this).closest('#disabled-blocks').length) { + if ($(this).closest('.disabled-blocks').length) { item.css('width', ''); } else { diff --git a/core/modules/dashboard/dashboard.module b/core/modules/dashboard/dashboard.module index 1891db5..46b7823 100644 --- a/core/modules/dashboard/dashboard.module +++ b/core/modules/dashboard/dashboard.module @@ -600,7 +600,8 @@ function dashboard_update() { */ function theme_dashboard($variables) { extract($variables); - drupal_add_css(drupal_get_path('module', 'dashboard') . '/dashboard.css'); + drupal_add_css(drupal_get_path('module', 'dashboard') . '/dashboard.base.css'); + drupal_add_css(drupal_get_path('module', 'dashboard') . '/dashboard.admin.css'); return '
' . $element['#children'] . '
'; } diff --git a/core/modules/dashboard/dashboard.theme.css b/core/modules/dashboard/dashboard.theme.css new file mode 100644 index 0000000..e69de29