summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreffulgentsia2011-03-04 18:21:20 (GMT)
committer effulgentsia2011-03-04 18:21:20 (GMT)
commit8c2e6186817dbb7dca6a585ad1691f1a8615ca03 (patch)
treeca4393bb99de2e903517f1fec31d247157e26e6e
parent660c523b0eb0768034f336171af321873fc52cce (diff)
parent83e7d446cd9831d3bc62534d85f19a34713474e9 (diff)
Merge remote branch 'origin/master'
-rw-r--r--css/views-admin.ctools.css12
-rw-r--r--css/views-admin.seven.css11
-rw-r--r--css/views-admin.theme.css15
-rw-r--r--plugins/views_plugin_display_page.inc4
4 files changed, 34 insertions, 8 deletions
diff --git a/css/views-admin.ctools.css b/css/views-admin.ctools.css
index 4a9137c..1ce7aed 100644
--- a/css/views-admin.ctools.css
+++ b/css/views-admin.ctools.css
@@ -137,6 +137,10 @@
padding-top: 4px;
}
+.ctools-twisty:focus {
+ outline: medium none;
+}
+
.views-display-top .ctools-button {
font-size: 12px;
position: absolute;
@@ -242,6 +246,14 @@
/* @end */
+/* @group Dependent */
+
+.dependent-options {
+ margin-left: 18px; /* LTR */
+}
+
+/* @end */
+
/* @group Export */
.ctools-export-ui-fourth-row input {
diff --git a/css/views-admin.seven.css b/css/views-admin.seven.css
index 93959cc..9d350ed 100644
--- a/css/views-admin.seven.css
+++ b/css/views-admin.seven.css
@@ -97,6 +97,17 @@ fieldset fieldset {
padding-top: 0;
}
+/* @group Dependent options
+ *
+ * Dependent options are identified in CTools dependent.js
+ */
+
+.dependent-options {
+ margin-left: 18px;
+}
+
+/* @end */
+
/* @end */
/* @group Lists */
diff --git a/css/views-admin.theme.css b/css/views-admin.theme.css
index 8da3d2c..7760e63 100644
--- a/css/views-admin.theme.css
+++ b/css/views-admin.theme.css
@@ -905,12 +905,6 @@ div.views-filterable-options .form-type-checkbox .description {
margin-top: 18px;
}
-#views-live-preview a,
-#views-live-preview a:link,
-#views-live-preview a:visited {
- color: #000000;
-}
-
#views-live-preview .preview-section {
border: 1px dashed #DEDEDE;
margin: 0 -5px;
@@ -991,3 +985,12 @@ div.views-filterable-options .form-type-checkbox .description {
}
/* @end */
+
+/* @group Drupal
+ *
+ * Overrides to Drupal system CSS
+ */
+div.messages {
+ margin-bottom: 18px;
+}
+
diff --git a/plugins/views_plugin_display_page.inc b/plugins/views_plugin_display_page.inc
index f14598e..f80864a 100644
--- a/plugins/views_plugin_display_page.inc
+++ b/plugins/views_plugin_display_page.inc
@@ -517,13 +517,13 @@ class views_plugin_display_page extends views_plugin_display {
$menu = $this->get_option('menu');
if (!empty($menu['type']) && $menu['type'] != 'none' && empty($menu['title'])) {
- $errors[] = t('Display @display is set to use a menu but the menu title is not set.', array('@display' => $this->display->display_title));
+ $errors[] = t('Display @display is set to use a menu but the menu link text is not set.', array('@display' => $this->display->display_title));
}
if ($menu['type'] == 'default tab') {
$tab_options = $this->get_option('tab_options');
if (!empty($tab_options['type']) && $tab_options['type'] != 'none' && empty($tab_options['title'])) {
- $errors[] = t('Display @display is set to use a parent menu but the parent menu title is not set.', array('@display' => $this->display->display_title));
+ $errors[] = t('Display @display is set to use a parent menu but the parent menu link text is not set.', array('@display' => $this->display->display_title));
}
}