diff --git a/core/modules/block/css/block.admin.css b/core/modules/block/css/block.admin.css index d9f32a2..3354afe 100644 --- a/core/modules/block/css/block.admin.css +++ b/core/modules/block/css/block.admin.css @@ -1,3 +1,4 @@ +/* Block demo mode */ .block-region { background-color: #ff6; margin-top: 4px; @@ -21,88 +22,10 @@ a.block-demo-backlink:visited { a.block-demo-backlink:hover { text-decoration: underline; } - -.layout-region { - box-sizing: border-box; -} -.block-list-secondary { - border: 1px solid #bfbfbf; - border-bottom-width: 0; -} -.block-list { - padding: 0 0.75em; - margin: 0; -} -.block-list li { - list-style: none; - padding: 0.1em 0; -} -.block-list a:before { - content: '+ '; -} -.block-list-secondary .form-type-search { - padding: 0 1em; -} +/* Configure block form - Block description */ .block-form .form-item-settings-admin-label label { display: inline; } .block-form .form-item-settings-admin-label label:after { content: ':'; -} - -/* Wide screens */ -@media -screen and (min-width: 780px), -(orientation: landscape) and (min-device-height: 780px) { - - .block-list-primary { - float: left; /* LTR */ - width: 75%; - padding-right: 2em; - } - [dir="rtl"] .block-list-primary { - float: right; - padding-left: 2em; - padding-right: 0; - } - - .block-list-secondary { - float: right; /* LTR */ - width: 25%; - } - [dir="rtl"] .block-list-secondary { - float: left; - } - - /* @todo File an issue to add a standard class to all text-like inputs */ - .block-list-secondary .form-autocomplete, - .block-list-secondary .form-text, - .block-list-secondary .form-tel, - .block-list-secondary .form-email, - .block-list-secondary .form-url, - .block-list-secondary .form-search, - .block-list-secondary .form-number, - .block-list-secondary .form-color, - .block-list-secondary textarea { - box-sizing: border-box; - width: 100%; - max-width: 100%; - } -} - -/** - * The vertical toolbar mode gets triggered for narrow screens, which throws off - * the intent of media queries written for the viewport width. When the vertical - * toolbar is on, we need to suppress layout for the original media width + the - * toolbar width (240px). In this case, 240px + 780px. - */ -@media -screen and (max-width: 1020px) { - - .toolbar-vertical.toolbar-tray-open .block-list-primary, - .toolbar-vertical.toolbar-tray-open .block-list-secondary { - float: none; - width: auto; - padding-right: 0; - } -} +} \ No newline at end of file diff --git a/core/modules/block/src/Controller/BlockListController.php b/core/modules/block/src/Controller/BlockListController.php index b446799..8533f8f 100644 --- a/core/modules/block/src/Controller/BlockListController.php +++ b/core/modules/block/src/Controller/BlockListController.php @@ -129,14 +129,14 @@ public function layout($theme) { $build['filter'] = array( '#type' => 'search', - '#title' =>$this->t('Filter'), + '#title' => $this->t('Filter'), '#title_display' => 'invisible', '#size' => 30, - '#placeholder' =>$this->t('Filter by block name'), + '#placeholder' => $this->t('Filter by block name'), '#attributes' => [ 'class' => ['block-filter-text'], 'data-element' => '.block-add-table', - 'title' =>$this->t('Enter a part of the block name to filter by.'), + 'title' => $this->t('Enter a part of the block name to filter by.'), ], ); @@ -144,7 +144,7 @@ public function layout($theme) { '#type' => 'table', '#header' => $headers, '#rows' => $rows, - '#empty' =>$this->t('No blocks available.'), + '#empty' => $this->t('No blocks available.'), '#attributes' => [ 'class' => ['block-add-table'], ], diff --git a/core/modules/block/src/Tests/Views/DisplayBlockTest.php b/core/modules/block/src/Tests/Views/DisplayBlockTest.php index 585f02d..31ed059 100644 --- a/core/modules/block/src/Tests/Views/DisplayBlockTest.php +++ b/core/modules/block/src/Tests/Views/DisplayBlockTest.php @@ -58,7 +58,7 @@ public function testBlockCategory() { $edit['block[style][row_plugin]'] = 'fields'; $this->drupalPostForm('admin/structure/views/add', $edit, t('Save and edit')); - $pattern = '//tr[.//td/div[text()=:text] and .//td[text()=:category] and .//td/div/div/ul/li/a[contains(@href, :href)]]'; + $pattern = '//tr[.//td[text()=:category] and .//td/div/div/ul/li/a[contains(@href, :href)]]'; // Test that the block was given a default category corresponding to its // base table.