From 477d1f7b39ef5b925c8aa37fc5abd3602b3e8c1a Mon Sep 17 00:00:00 2001 From: Dries Buytaert <dries@buytaert.net> Date: Mon, 27 Sep 2010 01:12:45 +0000 Subject: [PATCH] - Patch #162047 by sun, Gurpartap Singh: .container-inline class overridden by system.theme.css; also not working with .form-actions. --- modules/system/system.theme.css | 20 +++++++++++++------- themes/garland/style-rtl.css | 2 +- themes/garland/style.css | 18 ++++-------------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/modules/system/system.theme.css b/modules/system/system.theme.css index 27be0528bfa6..eb37db267eb5 100644 --- a/modules/system/system.theme.css +++ b/modules/system/system.theme.css @@ -69,7 +69,8 @@ td.active { /** * Markup generated by Form API. */ -.form-item { +.form-item, +.form-actions { margin-top: 1em; margin-bottom: 1em; } @@ -82,18 +83,14 @@ tr.even .form-item { .form-item .description { font-size: 0.85em; } -.form-item label { +label { display: block; font-weight: bold; } -.form-item label.option { +label.option { display: inline; font-weight: normal; } -.form-checkboxes, -.form-radios { - margin: 1em 0; -} .form-checkboxes .form-item, .form-radios .form-item { margin-top: 0.4em; @@ -117,6 +114,15 @@ input.form-radio { border: 2px solid red; } +/** + * Inline items. + */ +.container-inline .form-actions, +.container-inline.form-actions { + margin-top: 0; + margin-bottom: 0; +} + /** * Markup generated by theme_more_link(). */ diff --git a/themes/garland/style-rtl.css b/themes/garland/style-rtl.css index df6e03c7b56b..0093cf462912 100644 --- a/themes/garland/style-rtl.css +++ b/themes/garland/style-rtl.css @@ -77,7 +77,7 @@ dl dd { .form-button, .form-submit { - margin: 2em 0 1em 0.5em; + margin: 0 0 0 0.5em; } .region-header h2 { diff --git a/themes/garland/style.css b/themes/garland/style.css index e8e1750633d9..4434a2d2bedf 100644 --- a/themes/garland/style.css +++ b/themes/garland/style.css @@ -301,22 +301,12 @@ span.form-required { margin-bottom: 2em; } +.form-actions { + margin: 2em 0 1em; +} .form-button, .form-submit { - margin: 2em 0.5em 1em 0; /* LTR */ -} - -#dblog-form-overview .form-submit, -.confirmation .form-submit, -.search-form .form-submit, -.poll .form-submit, -fieldset .form-button, -fieldset .form-submit, -.sidebar .form-button, -.sidebar .form-submit, -table .form-button, -table .form-submit { - margin: 0; + margin: 0 0.5em 0 0; /* LTR */ } /** -- GitLab