diff --git a/core/modules/views_ui/css/views_ui.admin.css b/core/modules/views_ui/css/views_ui.admin.css index 3d1db05..f0aa168 100644 --- a/core/modules/views_ui/css/views_ui.admin.css +++ b/core/modules/views_ui/css/views_ui.admin.css @@ -127,7 +127,7 @@ left: 0; /* LTR */ margin: 0; position: absolute; - top: 23px; + top: 40px; z-index: 50; } [dir="rtl"] .views-displays .tabs .action-list { diff --git a/core/modules/views_ui/css/views_ui.admin.theme.css b/core/modules/views_ui/css/views_ui.admin.theme.css index 30616f0..fa1a39e 100644 --- a/core/modules/views_ui/css/views_ui.admin.theme.css +++ b/core/modules/views_ui/css/views_ui.admin.theme.css @@ -289,14 +289,8 @@ td.group-title { padding-left: 10px; padding-right: 0; } -.views-displays { - border: 1px solid #ccc; - padding-bottom: 36px; -} .views-display-top { - background-color: #e1e2dc; - border-bottom: 1px solid #ccc; - padding: 8px 8px 3px; + border-bottom: 1px solid #A6A6A6; position: relative; } .views-display-top .tabs { @@ -323,16 +317,11 @@ td.group-title { margin-right: 0.3em; } .form-edit .form-actions { - background-color: #e1e2dc; - border-right: 1px solid #ccc; - border-bottom: 1px solid #ccc; - border-left: 1px solid #ccc; margin-top: 0; - padding: 8px 12px; + padding-top: 8px; } .views-displays .tabs.secondary { margin-right: 200px; /* LTR */ - border: 0; } [dir="rtl"] .views-displays .tabs.secondary { margin-left: 200px; @@ -342,15 +331,12 @@ td.group-title { .views-displays .tabs.secondary li.is-active { background: transparent; border: 0; - padding: 0; + padding: 7px 13px 5px; width: auto; } .views-displays .tabs li.add ul.action-list li { margin: 0; } -.views-displays .tabs.secondary li { - margin: 0 5px 5px 6px; /* LTR */ -} [dir="rtl"] .views-displays .tabs.secondary li { margin-left: 5px; margin-right: 6px; @@ -360,18 +346,11 @@ td.group-title { } .views-displays .tabs li.tabs__tab:hover { border: 0; - padding-left: 0; /* LTR */ -} -[dir="rtl"] .views-displays .tabs li.tabs__tab:hover { - padding-right: 0; + padding: 7px 13px 5px; } .views-displays .tabs.secondary a { - border: 1px solid #cbcbcb; - border-radius: 7px; display: inline-block; - font-size: small; - line-height: 1.3333; - padding: 3px 7px; + padding: 7px 13px 5px; } /* Display a red border if the display doesn't validate. */ @@ -384,26 +363,16 @@ td.group-title { outline: none; text-decoration: underline; } -.views-displays .tabs.secondary li a { - background-color: #fff; -} -.views-displays .tabs li a:hover, -.views-displays .tabs li.is-active a, -.views-displays .tabs li.is-active a.is-active { - background-color: #555; - color: #fff; -} .views-displays .tabs .open > a { - background-color: #f1f1f1; - border-bottom: 1px solid transparent; position: relative; } .views-displays .tabs .open > a:hover { - color: #0074bd; - background-color: #f1f1f1; + color: #fff; + background-color: #40b6ff; } .views-displays .tabs .action-list li { - background-color: #f1f1f1; + background-color: #ffffff; + border-radius: 2px; border-color: #cbcbcb; border-style: solid; border-width: 0 1px; @@ -428,10 +397,11 @@ td.group-title { box-shadow: none; } .views-displays .tabs .action-list li:hover { - background-color: #ddd; + background-color: #40b6ff; + color: #ffffff; } .edit-display-settings { - margin: 12px 12px 0 12px + padding-top: 15px; } .edit-display-settings-top.views-ui-display-tab-bucket { border: 1px solid #f3f3f3; @@ -441,28 +411,17 @@ td.group-title { padding-bottom: 4px; position: relative; } -.views-display-column { - border: 1px solid #f3f3f3; -} .views-display-column + .views-display-column { margin-top: 0; } .view-preview-form .form-item-view-args, .view-preview-form .form-actions { margin-top: 5px; + display: block; } .view-preview-form .arguments-preview { font-size: 1em; } -.view-preview-form .arguments-preview, -.view-preview-form .form-item-view-args { - margin-left: 10px; /* LTR */ -} -[dir="rtl"] .view-preview-form .arguments-preview, -[dir="rtl"] .view-preview-form .form-item-view-args { - margin-left: 0; - margin-right: 10px; -} .view-preview-form .form-item-view-args label { float: left; /* LTR */ font-weight: normal; @@ -477,7 +436,7 @@ td.group-title { .form-item-live-preview, .form-item-view-args, .preview-submit-wrapper { - display: inline-block; + display: inline; } .form-item-live-preview, .view-preview-form .form-actions { @@ -491,10 +450,11 @@ td.group-title { /* These are the individual "buckets," or boxes, inside the display settings area */ .views-ui-display-tab-bucket { - border-bottom: 1px solid #f3f3f3; + background: #f3f5ee; line-height: 20px; margin: 0; padding-top: 4px; + margin-bottom: 8px; position: relative; } .views-ui-display-tab-bucket:last-of-type { @@ -692,28 +652,15 @@ td.group-title { margin-left: 0; margin-right: 18px; } -.views-preview-wrapper { - border: 1px solid #ccc; -} -.view-preview-form { - position: relative; -} .view-preview-form__title { - background-color: #e1e2dc; - border-bottom: 1px solid #ccc; - margin-top: 0; - padding: 8px 12px; + display: inline; } -.view-preview-form .form-item-live-preview { - position: absolute; - right: 12px; - top: 3px; - margin-top: 2px; - margin-left: 2px; /* LTR */ +#edit-displays-live-preview{ + margin: 25px 0 20px 14px; } [dir="rtl"] .view-preview-form .form-item-live-preview { right: auto; - left: 12px; + right: 95px; margin-left: 0; margin-right: 2px; } @@ -797,14 +744,16 @@ td.group-title { [dir="rtl"].js .dropbutton-wrapper.dropbutton-multiple.open .dropbutton-action:last-child a { border-radius: 0 0 1.1em 0; } +.views-display-top { + padding-top: 5px; +} .views-display-top .dropbutton-wrapper { position: absolute; - right: 12px; /* LTR */ - top: 7px; + padding-top: 12px; + right: 0; /* LTR */ } [dir="rtl"] .views-display-top .dropbutton-wrapper { left: 12px; - right: auto; } .views-display-top .dropbutton-wrapper .dropbutton-widget .dropbutton-action a { width: auto; diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php index 7066476..8a18d69 100644 --- a/core/modules/views_ui/src/ViewEditForm.php +++ b/core/modules/views_ui/src/ViewEditForm.php @@ -126,7 +126,8 @@ public function form(array $form, FormStateInterface $form_state) { if ($view->isLocked()) { $username = [ '#theme' => 'username', - '#account' => $this->entityManager->getStorage('user')->load($view->lock->owner), + '#account' => $this->entityManager->getStorage('user') + ->load($view->lock->owner), ]; $lock_message_substitutions = [ '@user' => \Drupal::service('renderer')->render($username), @@ -153,7 +154,6 @@ public function form(array $form, FormStateInterface $form_state) { } $form['displays'] = [ - '#prefix' => '

' . $this->t('Displays') . '

', '#type' => 'container', '#attributes' => [ 'class' => [ @@ -212,26 +212,6 @@ public function form(array $form, FormStateInterface $form_state) { /** * {@inheritdoc} */ - protected function actions(array $form, FormStateInterface $form_state) { - $actions = parent::actions($form, $form_state); - unset($actions['delete']); - - $actions['cancel'] = [ - '#type' => 'submit', - '#value' => $this->t('Cancel'), - '#submit' => ['::cancel'], - '#limit_validation_errors' => [], - ]; - if ($this->entity->isLocked()) { - $actions['submit']['#access'] = FALSE; - $actions['cancel']['#access'] = FALSE; - } - return $actions; - } - - /** - * {@inheritdoc} - */ public function validateForm(array &$form, FormStateInterface $form_state) { parent::validateForm($form, $form_state); @@ -355,15 +335,18 @@ public function getDisplayTab($view) { // page. if (empty($display)) { // @TODO: Improved UX for the case where a plugin is missing. - $build['#markup'] = $this->t("Error: Display @display refers to a plugin named '@plugin', but that plugin is not available.", ['@display' => $display->display['id'], '@plugin' => $display->display['display_plugin']]); - } + $build['#markup'] = $this->t("Error: Display @display refers to a plugin named '@plugin', but that plugin is not available.", array( + '@display' => $display->display['id'], + '@plugin' => $display->display['display_plugin'] + )); } // Build the content of the edit page. else { $build['details'] = $this->getDisplayDetails($view, $display->display); } // In AJAX context, ViewUI::rebuildCurrentTab() returns this outside of form // context, so hook_form_views_ui_edit_form_alter() is insufficient. - \Drupal::moduleHandler()->alter('views_ui_display_tab', $build, $view, $display_id); + \Drupal::moduleHandler() + ->alter('views_ui_display_tab', $build, $view, $display_id); return $build; } @@ -386,12 +369,18 @@ public function getDisplayDetails($view, $display) { // The master display cannot be duplicated. $is_default = $display['id'] == 'default'; // @todo: Figure out why getOption doesn't work here. - $is_enabled = $view->getExecutable()->displayHandlers->get($display['id'])->isEnabled(); + $is_enabled = $view->getExecutable()->displayHandlers->get($display['id']) + ->isEnabled(); if ($display['id'] != 'default') { $build['top']['#theme_wrappers'] = ['container']; $build['top']['#attributes']['id'] = 'edit-display-settings-top'; - $build['top']['#attributes']['class'] = ['views-ui-display-tab-actions', 'edit-display-settings-top', 'views-ui-display-tab-bucket', 'clearfix']; + $build['top']['#attributes']['class'] = [ + 'views-ui-display-tab-actions', + 'edit-display-settings-top', + 'views-ui-display-tab-bucket', + 'clearfix' + ]; // The Delete, Duplicate and Undo Delete buttons. $build['top']['actions'] = [ @@ -408,7 +397,10 @@ public function getDisplayDetails($view, $display) { '#type' => 'submit', '#value' => $this->t('Enable @display_title', ['@display_title' => $display_title]), '#limit_validation_errors' => [], - '#submit' => ['::submitDisplayEnable', '::submitDelayDestination'], + '#submit' => [ + '::submitDisplayEnable', + '::submitDelayDestination' + ], '#prefix' => '
  • ', "#suffix" => '
    • ', ]; @@ -441,7 +433,10 @@ public function getDisplayDetails($view, $display) { '#type' => 'submit', '#value' => $this->t('Duplicate @display_title', ['@display_title' => $display_title]), '#limit_validation_errors' => [], - '#submit' => ['::submitDisplayDuplicate', '::submitDelayDestination'], + '#submit' => [ + '::submitDisplayDuplicate', + '::submitDelayDestination' + ], '#prefix' => '
  • ', "#suffix" => '
    • ', ]; @@ -451,7 +446,10 @@ public function getDisplayDetails($view, $display) { '#type' => 'submit', '#value' => $this->t('Delete @display_title', ['@display_title' => $display_title]), '#limit_validation_errors' => [], - '#submit' => ['::submitDisplayDelete', '::submitDelayDestination'], + '#submit' => [ + '::submitDisplayDelete', + '::submitDelayDestination' + ], '#prefix' => '
  • ', "#suffix" => '
    • ', ]; @@ -465,7 +463,10 @@ public function getDisplayDetails($view, $display) { '#type' => 'submit', '#value' => $this->t('Duplicate as @type', ['@type' => $label]), '#limit_validation_errors' => [], - '#submit' => ['::submitDuplicateDisplayAsType', '::submitDelayDestination'], + '#submit' => [ + '::submitDuplicateDisplayAsType', + '::submitDelayDestination' + ], '#prefix' => '
  • ', '#suffix' => '
    • ', ]; @@ -476,7 +477,10 @@ public function getDisplayDetails($view, $display) { '#type' => 'submit', '#value' => $this->t('Undo delete of @display_title', ['@display_title' => $display_title]), '#limit_validation_errors' => [], - '#submit' => ['::submitDisplayUndoDelete', '::submitDelayDestination'], + '#submit' => [ + '::submitDisplayUndoDelete', + '::submitDelayDestination' + ], '#prefix' => '
  • ', "#suffix" => '
    • ', ]; @@ -486,7 +490,10 @@ public function getDisplayDetails($view, $display) { '#type' => 'submit', '#value' => $this->t('Disable @display_title', ['@display_title' => $display_title]), '#limit_validation_errors' => [], - '#submit' => ['::submitDisplayDisable', '::submitDelayDestination'], + '#submit' => [ + '::submitDisplayDisable', + '::submitDelayDestination' + ], '#prefix' => '
  • ', "#suffix" => '
    • ', ]; @@ -893,12 +900,14 @@ public function buildOptionForm(ViewUI $view, $id, $option, $display) { $option_build['#description'] = $option['title']; - $option_build['#link'] = $view->getExecutable()->displayHandlers->get($display['id'])->optionLink($option['value'], $id, '', empty($option['desc']) ? '' : $option['desc']); + $option_build['#link'] = $view->getExecutable()->displayHandlers->get($display['id']) + ->optionLink($option['value'], $id, '', empty($option['desc']) ? '' : $option['desc']); $option_build['#links'] = []; if (!empty($option['links']) && is_array($option['links'])) { foreach ($option['links'] as $link_id => $link_value) { - $option_build['#settings_links'][] = $view->getExecutable()->displayHandlers->get($display['id'])->optionLink($option['setting'], $link_id, 'views-button-configure', $link_value); + $option_build['#settings_links'][] = $view->getExecutable()->displayHandlers->get($display['id']) + ->optionLink($option['setting'], $link_id, 'views-button-configure', $link_value); } } @@ -908,8 +917,12 @@ public function buildOptionForm(ViewUI $view, $id, $option, $display) { } else { $display_id = $display['id']; - if (!$view->getExecutable()->displayHandlers->get($display['id'])->isDefaultDisplay()) { - if ($view->getExecutable()->displayHandlers->get($display['id'])->defaultableSections($id)) { + if (!$view->getExecutable()->displayHandlers->get($display['id']) + ->isDefaultDisplay() + ) { + if ($view->getExecutable()->displayHandlers->get($display['id']) + ->defaultableSections($id) + ) { $option_build['#overridden'] = TRUE; } } @@ -938,7 +951,12 @@ public function getFormBucket(ViewUI $view, $type, $display) { $build['#name'] = $type; $build['#title'] = $types[$type]['title']; - $rearrange_url = Url::fromRoute('views_ui.form_rearrange', ['js' => 'nojs', 'view' => $view->id(), 'display_id' => $display['id'], 'type' => $type]); + $rearrange_url = Url::fromRoute('views_ui.form_rearrange', [ + 'js' => 'nojs', + 'view' => $view->id(), + 'display_id' => $display['id'], + 'type' => $type + ]); $class = 'icon compact rearrange'; // Different types now have different rearrange forms, so we use this switch @@ -947,7 +965,11 @@ public function getFormBucket(ViewUI $view, $type, $display) { case 'filter': // The rearrange form for filters contains the and/or UI, so override // the used path. - $rearrange_url = Url::fromRoute('views_ui.form_rearrange_filter', ['js' => 'nojs', 'view' => $view->id(), 'display_id' => $display['id']]); + $rearrange_url = Url::fromRoute('views_ui.form_rearrange_filter', [ + 'js' => 'nojs', + 'view' => $view->id(), + 'display_id' => $display['id'] + ]); // TODO: Add another class to have another symbol for filter rearrange. $class = 'icon compact rearrange'; break; @@ -987,8 +1009,19 @@ public function getFormBucket(ViewUI $view, $type, $display) { $actions['add'] = [ 'title' => $add_text, - 'url' => Url::fromRoute('views_ui.form_add_handler', ['js' => 'nojs', 'view' => $view->id(), 'display_id' => $display['id'], 'type' => $type]), - 'attributes' => ['class' => ['icon compact add', 'views-ajax-link'], 'id' => 'views-add-' . $type], + 'url' => Url::fromRoute('views_ui.form_add_handler', [ + 'js' => 'nojs', + 'view' => $view->id(), + 'display_id' => $display['id'], + 'type' => $type + ]), + 'attributes' => [ + 'class' => [ + 'icon compact add', + 'views-ajax-link' + ], + 'id' => 'views-add-' . $type + ], ]; if ($count_handlers > 0) { // Create the rearrange text variable for the rearrange action. @@ -997,7 +1030,13 @@ public function getFormBucket(ViewUI $view, $type, $display) { $actions['rearrange'] = [ 'title' => $rearrange_text, 'url' => $rearrange_url, - 'attributes' => ['class' => [$class, 'views-ajax-link'], 'id' => 'views-rearrange-' . $type], + 'attributes' => [ + 'class' => [ + $class, + 'views-ajax-link' + ], + 'id' => 'views-rearrange-' . $type + ], ]; } diff --git a/core/modules/views_ui/src/ViewPreviewForm.php b/core/modules/views_ui/src/ViewPreviewForm.php index 2cc2533..2cfc103 100644 --- a/core/modules/views_ui/src/ViewPreviewForm.php +++ b/core/modules/views_ui/src/ViewPreviewForm.php @@ -41,7 +41,7 @@ public function form(array $form, FormStateInterface $form_state) { // Add the arguments textfield $form['controls']['view_args'] = [ '#type' => 'textfield', - '#title' => $this->t('Preview with contextual filters:'), + '#title' => $this->t('Use contextual filters:'), '#description' => $this->t('Separate contextual filter values with a "/". For example, %example.', ['%example' => '40/12/10']), '#id' => 'preview-args', ]; diff --git a/core/themes/seven/css/components/tabs.css b/core/themes/seven/css/components/tabs.css index 5aab30b..bcc2988 100644 --- a/core/themes/seven/css/components/tabs.css +++ b/core/themes/seven/css/components/tabs.css @@ -276,6 +276,9 @@ li.tabs__tab a { border-right: 2px solid #004f80; padding-right: 15px; } +.views-displays .tabs.secondary li.is-active { + border-bottom: 2px solid #004f80; +} /* This is required to win over specificity of [dir="rtl"] .tabs.secondary .tabs__tab.is-active */ [dir="rtl"] .views-displays .tabs.secondary li.is-active { border: 0 none; diff --git a/core/themes/seven/css/components/views-ui.css b/core/themes/seven/css/components/views-ui.css index d212dd0..6f0b0fd 100644 --- a/core/themes/seven/css/components/views-ui.css +++ b/core/themes/seven/css/components/views-ui.css @@ -101,21 +101,10 @@ details.fieldset-no-legend { padding: 0; } -.views-displays ul.secondary li a, -.views-displays ul.secondary li.is-active a, -.views-displays ul.secondary li.is-active a.is-active { - padding: 2px 7px 3px; -} - .views-displays ul.secondary li a { color: #0074bd; } -.views-displays ul.secondary li.is-active a, -.views-displays ul.secondary li.is-active a.is-active { - border: 1px solid transparent; -} - .views-admin .links li { padding-right: 0; /* LTR */ } @@ -179,17 +168,7 @@ details.fieldset-no-legend { } .views-displays .secondary a:hover > .icon.add { - background-position: center -25px; -} - -.views-displays .secondary .open > a { - border-radius: 7px 7px 0 0; -} - -.views-displays .secondary .open > a:hover, -.views-displays .secondary .open > a:focus { - background-color: #f1f1f1; - color: #008BCB; + background-position: center 3px; } .views-displays .secondary .action-list li:first-child { diff --git a/core/themes/seven/js/nav-tabs.js b/core/themes/seven/js/nav-tabs.js index 82d31cd..a38c6f2 100644 --- a/core/themes/seven/js/nav-tabs.js +++ b/core/themes/seven/js/nav-tabs.js @@ -45,4 +45,4 @@ } } }; -})(jQuery, Drupal); \ No newline at end of file +})(jQuery, Drupal); diff --git a/core/themes/stable/css/views_ui/views_ui.admin.css b/core/themes/stable/css/views_ui/views_ui.admin.css index 3d1db05..f0aa168 100644 --- a/core/themes/stable/css/views_ui/views_ui.admin.css +++ b/core/themes/stable/css/views_ui/views_ui.admin.css @@ -127,7 +127,7 @@ left: 0; /* LTR */ margin: 0; position: absolute; - top: 23px; + top: 40px; z-index: 50; } [dir="rtl"] .views-displays .tabs .action-list { diff --git a/core/themes/stable/css/views_ui/views_ui.admin.theme.css b/core/themes/stable/css/views_ui/views_ui.admin.theme.css index b843586..afc4ab1 100644 --- a/core/themes/stable/css/views_ui/views_ui.admin.theme.css +++ b/core/themes/stable/css/views_ui/views_ui.admin.theme.css @@ -289,14 +289,8 @@ td.group-title { padding-left: 10px; padding-right: 0; } -.views-displays { - border: 1px solid #ccc; - padding-bottom: 36px; -} .views-display-top { - background-color: #e1e2dc; - border-bottom: 1px solid #ccc; - padding: 8px 8px 3px; + border-bottom: 1px solid #A6A6A6; position: relative; } .views-display-top .tabs { @@ -323,16 +317,11 @@ td.group-title { margin-right: 0.3em; } .form-edit .form-actions { - background-color: #e1e2dc; - border-right: 1px solid #ccc; - border-bottom: 1px solid #ccc; - border-left: 1px solid #ccc; margin-top: 0; - padding: 8px 12px; + padding-top: 8px; } .views-displays .tabs.secondary { margin-right: 200px; /* LTR */ - border: 0; } [dir="rtl"] .views-displays .tabs.secondary { margin-left: 200px; @@ -342,15 +331,12 @@ td.group-title { .views-displays .tabs.secondary li.is-active { background: transparent; border: 0; - padding: 0; + padding: 7px 13px 5px; width: auto; } .views-displays .tabs li.add ul.action-list li { margin: 0; } -.views-displays .tabs.secondary li { - margin: 0 5px 5px 6px; /* LTR */ -} [dir="rtl"] .views-displays .tabs.secondary li { margin-left: 5px; margin-right: 6px; @@ -360,18 +346,11 @@ td.group-title { } .views-displays .tabs li.tabs__tab:hover { border: 0; - padding-left: 0; /* LTR */ -} -[dir="rtl"] .views-displays .tabs li.tabs__tab:hover { - padding-right: 0; + padding: 7px 13px 5px; } .views-displays .tabs.secondary a { - border: 1px solid #cbcbcb; - border-radius: 7px; display: inline-block; - font-size: small; - line-height: 1.3333; - padding: 3px 7px; + padding: 7px 13px 5px; } /* Display a red border if the display doesn't validate. */ @@ -384,26 +363,21 @@ td.group-title { outline: none; text-decoration: underline; } -.views-displays .tabs.secondary li a { - background-color: #fff; -} .views-displays .tabs li a:hover, .views-displays .tabs li.is-active a, .views-displays .tabs li.is-active a.is-active { - background-color: #555; - color: #fff; + /* border-bottom: 3px solid #004f80; */ } .views-displays .tabs .open > a { - background-color: #f1f1f1; - border-bottom: 1px solid transparent; position: relative; } .views-displays .tabs .open > a:hover { - color: #0074bd; - background-color: #f1f1f1; + color: #fff; + background-color: #40b6ff; } .views-displays .tabs .action-list li { - background-color: #f1f1f1; + background-color: #ffffff; + border-radius: 2px; border-color: #cbcbcb; border-style: solid; border-width: 0 1px; @@ -428,10 +402,12 @@ td.group-title { box-shadow: none; } .views-displays .tabs .action-list li:hover { - background-color: #ddd; + background-color: #40b6ff; + color: #ffffff; } + .edit-display-settings { - margin: 12px 12px 0 12px + padding-top: 15px; } .edit-display-settings-top.views-ui-display-tab-bucket { border: 1px solid #f3f3f3; @@ -441,28 +417,17 @@ td.group-title { padding-bottom: 4px; position: relative; } -.views-display-column { - border: 1px solid #f3f3f3; -} .views-display-column + .views-display-column { margin-top: 0; } .view-preview-form .form-item-view-args, .view-preview-form .form-actions { margin-top: 5px; + display: block; } .view-preview-form .arguments-preview { font-size: 1em; } -.view-preview-form .arguments-preview, -.view-preview-form .form-item-view-args { - margin-left: 10px; /* LTR */ -} -[dir="rtl"] .view-preview-form .arguments-preview, -[dir="rtl"] .view-preview-form .form-item-view-args { - margin-left: 0; - margin-right: 10px; -} .view-preview-form .form-item-view-args label { float: left; /* LTR */ font-weight: normal; @@ -477,7 +442,7 @@ td.group-title { .form-item-live-preview, .form-item-view-args, .preview-submit-wrapper { - display: inline-block; + display: inline; } .form-item-live-preview, .view-preview-form .form-actions { @@ -491,10 +456,11 @@ td.group-title { /* These are the individual "buckets," or boxes, inside the display settings area */ .views-ui-display-tab-bucket { - border-bottom: 1px solid #f3f3f3; + background: #f3f5ee; line-height: 20px; margin: 0; padding-top: 4px; + margin-bottom: 8px; position: relative; } .views-ui-display-tab-bucket:last-of-type { @@ -692,28 +658,15 @@ td.group-title { margin-left: 0; margin-right: 18px; } -.views-preview-wrapper { - border: 1px solid #ccc; -} -.view-preview-form { - position: relative; -} .view-preview-form__title { - background-color: #e1e2dc; - border-bottom: 1px solid #ccc; - margin-top: 0; - padding: 8px 12px; + display: inline; } -.view-preview-form .form-item-live-preview { - position: absolute; - right: 12px; - top: 3px; - margin-top: 2px; - margin-left: 2px; /* LTR */ +#edit-displays-live-preview{ + margin: 25px 0 20px 14px; } [dir="rtl"] .view-preview-form .form-item-live-preview { right: auto; - left: 12px; + right: 95px; margin-left: 0; margin-right: 2px; } @@ -797,14 +750,16 @@ td.group-title { [dir="rtl"].js .dropbutton-wrapper.dropbutton-multiple.open .dropbutton-action:last-child a { border-radius: 0 0 1.1em 0; } +.views-display-top { + padding-top: 5px; +} .views-display-top .dropbutton-wrapper { position: absolute; - right: 12px; /* LTR */ - top: 7px; + padding-top: 12px; + right: 0; /* LTR */ } [dir="rtl"] .views-display-top .dropbutton-wrapper { left: 12px; - right: auto; } .views-display-top .dropbutton-wrapper .dropbutton-widget .dropbutton-action a { width: auto;