Commit a604c526 authored by dead_arm's avatar dead_arm Committed by tim.plunkett

Issue #1779720 by dead_arm: Clean up the fieldset replacement for CTools collapsible-div.

parent 02752cc7
......@@ -51,18 +51,11 @@
.views-display-tab .fieldset-legend {
left: auto;
right: -5px;
}
/* @end */
/* @group Attachment details actions
*
* Display the "Delete" and "Duplicate" buttons to the right.
*/
.views-display-tab .fieldset-wrapper > .views-ui-display-tab-bucket .actions {
left: 0;
right: auto;
.views-display-columns fieldset .fieldset-legend {
padding-left: inherit;
padding-right: 0;
}
/* @end */
......@@ -72,14 +65,11 @@
.views-display-columns > * {
float: right;
margin-left: 0;
margin-right: 1%;
padding-left: 0;
padding-right: 1%;
margin-right: 2%;;
}
.views-display-columns > *:first-child {
margin-right: 0;
padding-right: 0;
}
/* @end */
......
......@@ -6,7 +6,16 @@
/* @group Lists */
.views-display-top .secondary .action-list {
padding-left: inherit;
padding-right: 0;
}
/* @end */
/* @group Collapsible */
.views-display-columns fieldset .fieldset-legend {
padding: 0 2px 4px 0;
}
/* @end */
......@@ -210,6 +210,38 @@
margin-top: 12px;
}
.views-display-column .fieldset-wrapper {
margin-top: 0;
}
.views-display-column fieldset legend {
background: none;
border: none;
font-family: inherit;
font-size: 13px;
line-height: inherit;
position: relative;
text-indent: 0;
text-shadow: none;
top: 3px;
}
.views-display-columns fieldset {
position: inherit;
}
.views-display-columns fieldset .fieldset-legend {
padding: 0 0 4px 2px; /* LTR */
}
.views-display-columns a.fieldset-title {
color: #0071B3;
}
.views-display-columns a.fieldset-title:hover {
color: #018FE2;
}
.views-ui-display-tab-actions .ctools-button input {
color: #0071B3;
}
......
......@@ -155,6 +155,11 @@
.views-display-tab .fieldset-wrapper > .views-ui-display-tab-bucket .actions {
opacity: 1.0;
}
.js .views-ui-display-tab-bucket:first-of-type {
border-top: none;
}
/* @end */
/* @group Attachment details new section button */
......@@ -180,7 +185,6 @@
/* @group Attachment details collapsible fieldset */
.views-display-tab .fieldset-legend {
left: -5px; /* LTR */
position: relative;
}
......@@ -188,16 +192,31 @@
position: relative;
}
/* @end */
.views-display-columns fieldset {
border: none;
margin: 0;
padding: 0;
}
/* @group Attachment details actions
*
* Display the "Delete" and "Duplicate" buttons to the right.
*/
.views-display-tab .fieldset-wrapper > .views-ui-display-tab-bucket .actions {
position: absolute;
right: 0; /* LTR */
top: -5px;
.views-display-columns fieldset .fieldset-legend {
padding-left: 0; /* LTR */
}
.views-display-columns .fieldset-legend {
margin-top: 0;
padding: 6px 0;
}
.views-display-columns .fieldset-wrapper {
padding: 0;
}
.views-display-column {
box-sizing: border-box;
}
.js .views-display-column fieldset.collapsed {
height: auto;
}
/* @end */
......@@ -206,14 +225,12 @@
.views-display-columns > * {
float: left; /* LTR */
margin-left: 1%; /* LTR */
padding-left: 1%; /* LTR */
margin-left: 2%; /* LTR */
width: 32%;
}
.views-display-columns > *:first-child {
margin-left: 0; /* LTR */
padding-left: 0; /* LTR */
}
/* @end */
......
......@@ -44,22 +44,10 @@ fieldset.fieldset-no-legend {
padding-right: 0;
}
.views-display-tab fieldset {
padding: 0 12px;
}
.views-display-tab .fieldset-wrapper {
padding: 10px 12px 12px;
}
.views-display-tab fieldset.box-padding .fieldset-wrapper {
padding: 0;
}
.views-display-tab legend + .fieldset-wrapper {
padding-top: 2.5em;
}
.views-admin .form-item label.option,
#views-ui-preview-form .form-item label.option {
font-size: 1em;
......
......@@ -531,6 +531,10 @@ ul#views-display-menu-tabs li.add ul.action-list li{
/* @end */
/* @group Attachment details */
#edit-display-settings {
margin: 12px 12px 0 12px
}
#edit-display-settings-title {
font-size: 14px;
......@@ -539,10 +543,15 @@ ul#views-display-menu-tabs li.add ul.action-list li{
}
#edit-display-settings-top {
border: 1px solid #F3F3F3;
line-height: 20px;
margin: 0;
padding-top: 4px;
padding-bottom: 4px;
position: relative;
}
#edit-display-settings-content {
#edit-displays-settings-settings-content {
margin-top: 12px;
}
......@@ -557,10 +566,18 @@ ul#views-display-menu-tabs li.add ul.action-list li{
* The columns that contain the option buckets e.g. Format and Basic Settings
*/
.views-display-column {
border: 1px solid #F3F3F3;
}
.views-display-column + .views-display-column {
margin-top: 0;
}
.views-display-column fieldset.collapsible legend {
font-size: 13px;
}
/* @end */
/* @group Auto preview
......@@ -611,12 +628,16 @@ ul#views-display-menu-tabs li.add ul.action-list li{
*/
.views-ui-display-tab-bucket {
border: 1px solid #f3f3f3;
border-bottom: 1px solid #f3f3f3;
line-height: 20px;
margin: 0;
padding-top: 4px;
}
.views-ui-display-tab-bucket:last-of-type {
border-bottom: none;
}
.views-ui-display-tab-bucket + .views-ui-display-tab-bucket {
border-top: medium none;
}
......
......@@ -1036,12 +1036,9 @@ function views_ui_edit_form($form, &$form_state, $view, $display_id = NULL) {
$form_state['display_id'] = $display_id;
// The part of the page where editing will take place.
// This element is the collapsible fieldset for the display edit elements.
$form['displays']['settings'] = array(
'#type' => 'fieldset',
'#type' => 'container',
'#id' => 'edit-display-settings',
'#collapsible' => TRUE,
'#collapsed' => FALSE,
);
$display_title = views_ui_get_display_label($view, $display_id, FALSE);
......@@ -1608,12 +1605,16 @@ function views_ui_get_display_tab_details($view, $display) {
// The third column buckets are wrapped in a fieldset.
$build['columns']['third'] = array(
'#type' => 'fieldset',
'#title' => '<h3>' . t('Advanced') . '</h3>',
'#attributes' => array(
'class' => array('views-display-column', 'third'),
),
'#title' => t('Advanced'),
'#collapsible' => TRUE,
'#collapsed' => TRUE,
'#theme_wrappers' => array('fieldset', 'container'),
'#attributes' => array(
'class' => array(
'views-display-column',
'third',
),
),
);
// Collapse the fieldset by default.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment