From f892b965b221165b4806f4ed3776ce8d31914fa2 Sun, 10 Jul 2011 20:40:53 +0200 From: Bram Goffings Date: Sun, 10 Jul 2011 20:40:35 +0200 Subject: [PATCH] seven rtl diff --git a/modules/shortcut/shortcut-rtl.css b/modules/shortcut/shortcut-rtl.css index 4a37927..5dec957 100644 --- a/modules/shortcut/shortcut-rtl.css +++ b/modules/shortcut/shortcut-rtl.css @@ -28,6 +28,7 @@ padding-right: 10px; padding-left: 0; } +div.add-or-remove-shortcuts a:focus span.text, div.add-or-remove-shortcuts a:hover span.text { -moz-border-radius: 5px 0 0 5px; -webkit-border-top-left-radius: 5px; diff --git a/themes/seven/ie7.css b/themes/seven/ie7.css new file mode 100644 index 0000000..48804b2 --- /dev/null +++ b/themes/seven/ie7.css @@ -0,0 +1,21 @@ + +ul.tabs.primary { + padding: 0; +} +ul.primary li, +ul.primary li a, +ul.primary li.active a { + float: none !important; + display: inline; +} +ul.primary li a, +ul.primary li a.active, +ul.primary li a:active, +ul.primary li a:visited, +ul.primary li a:hover, +ul.primary li.active a { + zoom: 1; +} +ul.admin-list li { + position: static; +} diff --git a/themes/seven/page.tpl.php b/themes/seven/page.tpl.php index 85353a7..b9d0ad5 100644 --- a/themes/seven/page.tpl.php +++ b/themes/seven/page.tpl.php @@ -11,7 +11,9 @@
- + +
+
diff --git a/themes/seven/style-rtl.css b/themes/seven/style-rtl.css index 6328193..a272a37 100644 --- a/themes/seven/style-rtl.css +++ b/themes/seven/style-rtl.css @@ -2,11 +2,249 @@ /** * Generic elements. */ +dl dd, +dl dl { + margin-right: 20px; +} ul, .block ul, .item-list ul, .item-list ul { margin: 0.25em 1.5em 0.25em 0; +} +ol { + margin: 0.25em 2em 0.25em 0; +} + +/** + * Skip link. + */ +#skip-link { + right: 50%; + margin-right: -5.25em; +} +#skip-link a, +#skip-link a:link, +#skip-link a:visited { + padding: 1px 10px 2px 10px; +} + +/** + * Branding. + */ +#branding { + padding: 20px 20px 0 20px; +} + +#branding div.block { + float: left; + padding-left: 0; + padding-right: 10px; +} +#branding div.block form div.form-item { + float: right; +} +#branding div.block form input.form-text { + margin-left: 10px; + margin-right: 0; +} + +/** + * Help. + */ +#help div.more-help-link { + text-align: left; +} + +/** + * Page title. + */ +#branding h1.page-title { + float: right; +} + +/** + * Tabs. + */ +ul.primary li, +ul.primary li a, +ul.primary li a.active, +ul.primary li a:active, +ul.primary li a:visited, +ul.primary li a:hover, +ul.primary li.active a { + float: right; +} +ul.primary, +ul.secondary { + float: left; +} +ul.secondary li { + float: none; +} +ul.primary { + padding-top: 0; +} + +/** + * Page layout. + */ +#page { + padding: 20px 0 40px 0; + margin-left: 40px; + margin-right: 40px; +} +#secondary-links ul.links li { + padding: 0 0 10px 10px; +} +ul.links li, +ul.inline li { + padding-left: 1em; + padding-right: 0; +} +ul.admin-list li { + padding: 9px 30px 0 0; + margin-right: 0; + background: url(images/list-item-rtl.png) no-repeat right 11px; +} +ul.admin-list li a { + margin-right: -30px; + margin-left: 0; + padding: 0 30px 4px 0; +} +ul.admin-list.compact li a { + margin-right: 0; +} +ul.admin-list li div.description a { + margin-right: 0; +} + +/** + * Tables. + */ +table th.active a { + padding: 0 0 0 25px; +} +table th.active img { + left: 3px; + right: auto; +} +/** + * Exception for webkit bug with the right border of the last cell + * in some tables, since it's webkit only, we can use :last-child + */ +tr td:last-child { + border-left: 1px solid #bebfb9; + border-right: none; +} + + +/** + * Fieldsets. + */ +fieldset { + padding: 2.5em 0 0 0; +} +fieldset .fieldset-legend { + padding-right: 15px; + right: 0; +} +fieldset .fieldset-wrapper { + padding: 0 15px 13px 13px; +} + +/* Filter */ +.filter-wrapper .form-item, +.filter-wrapper .filter-guidelines, +.filter-wrapper .filter-help { + padding: 2px 0 0 0; +} +ul.tips li { + margin: 0.25em 1.5em 0.25em 0; +} +body div.form-type-radio div.description, +body div.form-type-checkbox div.description { + margin-left: 0; + margin-right: 1.5em; +} +input.form-submit, +a.button { + margin-left: 1em; + margin-right: 0; +} +ul.action-links { + padding: 0 20px 0 20px; +} +ul.action-links li { + float: right; + margin: 0 0 0 1em; +} +ul.action-links a { + padding-right: 15px; + background-position: right center; +} + +/* admin/content and admin/people */ +dl.multiselect, +dl.multiselect dt, +dl.multiselect dd { + margin: 0 0 0 10px; +} + +/* Update options. */ +div.admin-options label, +div.admin-options div.form-item { + margin-left: 10px; + margin-right: 0; + float: right; +} + +/* Maintenance theming */ +body.in-maintenance #sidebar-first { + float: right; +} +body.in-maintenance #content { + float: left; + padding-left: 20px; + padding-right: 0; +} +ol.task-list { + margin-right: 0; +} +ol.task-list li { + padding: 0.5em 20px 0.5em 1em; +} +ol.task-list li.active { + background: transparent url(images/task-item-rtl.png) no-repeat right 50%; + padding: 0.5em 20px 0.5em 1em; +} + +/* Overlay theming */ +.overlay #branding div.breadcrumb { + float: right; +} +.overlay ul.secondary { + margin: -1.4em 0 0.3em 0; +} + +/* Shortcut theming */ +div.add-or-remove-shortcuts { + float: none; + padding-left: 0; + padding-right: 6px; +} + +/* Dashboard */ +#dashboard div.block div.content { + padding: 10px 5px 5px 5px; +} +#dashboard div.block div.content ul.menu { + margin-right: 20px; +} + +/* Recent content block */ +#block-node-recent .more-link { + padding: 0 0 5px 5px; } /* User login block */ @@ -14,11 +252,5 @@ margin-right: 0; } #user-login-form .openid-links .user-link { - margin-left: 0; margin-right: 1.5em; -} - -/* Sortable tables */ -table th.active a { - padding: 0 0 0 25px; } diff --git a/themes/seven/style.css b/themes/seven/style.css index 66303c5..28f7a41 100644 --- a/themes/seven/style.css +++ b/themes/seven/style.css @@ -19,7 +19,7 @@ padding: 0; border: none; height: 1px; - background: #CCCCCC; + background: #cccccc; } legend { font-weight: bold; @@ -57,7 +57,7 @@ } dl dd, dl dl { - margin-left: 20px; + margin-left: 20px; /* LTR */ margin-bottom: 10px; } blockquote { @@ -117,7 +117,7 @@ } ol { list-style-type: decimal; - margin: 0.25em 0 0.25em 2em; + margin: 0.25em 0 0.25em 2em; /* LTR */ } .item-list ul li.collapsed, ul.menu li.collapsed { @@ -149,8 +149,8 @@ #skip-link { margin-top: 0; position: absolute; - left: 50%; - margin-left: -5.25em; + left: 50%; /* LTR */ + margin-left: -5.25em; /* LTR */ width: auto; z-index: 50; } @@ -161,7 +161,7 @@ background: #444; color: #fff; font-size: 0.94em; - padding: 1px 10px 2px 10px; + padding: 1px 10px 2px 10px; /* LTR */ text-decoration: none; -moz-border-radius: 0 0 10px 10px; -webkit-border-top-left-radius: 0; @@ -181,7 +181,7 @@ */ #branding { overflow: hidden; - padding: 20px 20px 0 20px; + padding: 20px 20px 0 20px; /* LTR */ position: relative; background-color: #e0e0d8; } @@ -191,23 +191,23 @@ } #branding div.block { position: relative; - float: right; + float: right; /* LTR */ width: 240px; - padding-left: 10px; + padding-left: 10px; /* LTR */ background: #333; } #branding div.block form label { display: none; } #branding div.block form div.form-item { - float: left; + float: left; /* LTR */ border: 0; margin: 0; padding: 0; } #branding div.block form input.form-text { width: 140px; - margin-right: 10px; + margin-right: 10px; /* LTR */ } #branding div.block form input.form-submit { text-align: center; @@ -225,7 +225,7 @@ margin: 0 0 10px; } #help div.more-help-link { - text-align: right; + text-align: right; /* LTR */ } /** @@ -241,7 +241,7 @@ padding-bottom: 10px; font-size: 1.385em; font-weight: normal; - float: left; + float: left; /* LTR */ } /** @@ -255,15 +255,23 @@ * Tabs. */ ul.primary { - float: right; + float: right; /* LTR */ border-bottom: none; - padding: 0.769em 0 5px 8px; text-transform: uppercase; font-size: 0.923em; + height: 2.60em; + margin: 0; + padding-top: 0; } ul.primary li { - display: inline; + float: left; /* LTR */ list-style: none; + margin: 0 2px; +} +ul.primary li a, +ul.primary li.active a { + display: block; + float: left; /* LTR */ } ul.primary li a, ul.primary li a.active, @@ -274,7 +282,7 @@ background-color: #a6a7a2; color: #000; font-weight: bold; - padding: 6px 20px; + padding: 0 18px 8px; border-width: 1px 1px 0 1px; border-style: solid; border-color: #a6a7a2; @@ -282,6 +290,8 @@ -webkit-border-top-left-radius: 8px; -webkit-border-top-right-radius: 8px; border-radius: 8px 8px 0 0; + height: 2.60em; + line-height: 2.60em; } ul.primary li.active a, ul.primary li.active a.active, @@ -296,22 +306,25 @@ ul.primary li.active a:hover { color: #000; } -ul.secondary { - float: none; +.tabs-secondary { clear: both; +} +ul.secondary { + float: right; /* LTR */ font-size: 0.923em; - text-align: right; - padding: 4px 10px 10px; + padding: 0 3px 5px; line-height: 1.385em; overflow: hidden; background-color: #fff; } ul.secondary li { - padding-left: 10px; + margin: 0 5px; + float: right; /* LTR */ } ul.secondary li a { background-color: #ddd; color: #000; + display: inline-block; } ul.secondary li a, ul.secondary li a:hover, @@ -328,20 +341,23 @@ color: #fff; background: #666; } +#content { + clear: left; +} /** * Page layout. */ #page { - padding: 20px 0 40px 0; - margin-right: 40px; - margin-left: 40px; + padding: 20px 0 40px 0; /* LTR */ + margin-right: 40px; /* LTR */ + margin-left: 40px; /* LTR */ background: #fff; position: relative; color: #333; } #secondary-links ul.links li { - padding: 0 10px 10px 0; + padding: 0 10px 10px 0; /* LTR */ } #secondary-links ul.links li a { font-size: 0.923em; @@ -361,7 +377,7 @@ } ul.links li, ul.inline li { - padding-right: 1em; + padding-right: 1em; /* LTR */ } ul.inline li { display: inline; @@ -372,12 +388,12 @@ } ul.admin-list li { position: relative; - padding-left: 30px; + padding-left: 30px; /* LTR */ padding-top: 9px; border-top: 1px solid #ccc; - margin-left: 0; + margin-left: 0; /* LTR */ margin-bottom: 10px; - background: url(images/list-item.png) no-repeat 0 11px; + background: url(images/list-item.png) no-repeat 0 11px; /* LTR */ list-style-type: none; list-style-image: none; } @@ -402,16 +418,16 @@ border-bottom: none; } ul.admin-list li a { - margin-left: -30px; - padding: 0px 0 4px 30px; + margin-left: -30px; /* LTR */ + padding: 0px 0 4px 30px; /* LTR */ min-height: 0; } ul.admin-list.compact li a { - margin-left: 0; + margin-left: 0; /* LTR */ padding: 0; } ul.admin-list li div.description a { - margin-left: 0px; + margin-left: 0px; /* LTR */ padding: 0px; min-height: inherit; } @@ -473,7 +489,7 @@ table th.active img { position: absolute; top: 3px; - right: 3px; + right: 3px; /* LTR */ } table td.active { background: #e9e9dd; @@ -510,7 +526,7 @@ * in some tables, since it's webkit only, we can use :last-child */ tr td:last-child { - border-right: 1px solid #BEBFB9; + border-right: 1px solid #bebfb9; /* LTR */ } @@ -534,18 +550,18 @@ */ fieldset { border: 1px solid #ccc; - padding: 2.5em 0 0 0; + padding: 2.5em 0 0 0; /* LTR */ position: relative; margin: 1em 0; } fieldset .fieldset-legend { margin-top: 0.5em; - padding-left: 15px; + padding-left: 15px; /* LTR */ position: absolute; text-transform: uppercase; } fieldset .fieldset-wrapper { - padding: 0 13px 13px 15px; + padding: 0 13px 13px 15px; /* LTR */ } fieldset.collapsed { background-color: transparent; @@ -615,7 +631,7 @@ .filter-wrapper .filter-guidelines, .filter-wrapper .filter-help { font-size: 0.923em; - padding: 2px 0 0 0; + padding: 2px 0 0 0; /* LTR */ } ul.tips, div.description, @@ -626,18 +642,18 @@ color: #666; } ul.tips li { - margin: 0.25em 0 0.25em 1.5em; + margin: 0.25em 0 0.25em 1.5em; /* LTR */ } body div.form-type-radio div.description, body div.form-type-checkbox div.description { - margin-left: 1.5em; + margin-left: 1.5em; /* LTR */ } input.form-submit, a.button { cursor: pointer; padding: 4px 17px; margin-bottom: 1em; - margin-right: 1em; + margin-right: 1em; /* LTR */ color: #5a5a5a; text-align: center; font-weight: normal; @@ -645,8 +661,8 @@ font-family: "Lucida Grande", Verdana, sans-serif; border: 1px solid #e4e4e4; border-bottom: 1px solid #b4b4b4; - border-left-color: #D2D2D2; - border-right-color: #D2D2D2; + border-left-color: #d2d2d2; + border-right-color: #d2d2d2; background: url(images/buttons.png) 0 0 repeat-x; -moz-border-radius: 20px; -webkit-border-radius: 20px; @@ -707,16 +723,16 @@ } ul.action-links { margin: 1em 0; - padding: 0 20px 0 20px; + padding: 0 20px 0 20px; /* LTR */ list-style-type: none; overflow: hidden; } ul.action-links li { - float: left; - margin: 0 1em 0 0; + float: left; /* LTR */ + margin: 0 1em 0 0; /* LTR */ } ul.action-links a { - padding-left: 15px; + padding-left: 15px; /* LTR */ background: transparent url(images/add.png) no-repeat 0 center; line-height: 30px; } @@ -772,7 +788,7 @@ dl.multiselect, dl.multiselect dt, dl.multiselect dd { - margin: 0 10px 0 0; + margin: 0 10px 0 0; /* LTR */ } dl.multiselect select, dl.multiselect dd select { @@ -796,8 +812,8 @@ } div.admin-options label, div.admin-options div.form-item { - margin-right: 10px; - float: left; + margin-right: 10px; /* LTR */ + float: left; /* LTR */ } div.admin-options div.form-item { padding: 0; @@ -811,13 +827,13 @@ /* Maintenance theming */ body.in-maintenance #sidebar-first { - float: left; + float: left; /* LTR */ width: 200px; } body.in-maintenance #content { - float: right; + float: right; /* LTR */ width: 550px; - padding-right: 20px; + padding-right: 20px; /* LTR */ } body.in-maintenance #page { overflow: auto; @@ -860,7 +876,7 @@ } ol.task-list li.done { color: #393; - background: transparent url(images/task-check.png) no-repeat 0px 50%; /* LTR */ + background: transparent url(images/task-check.png) no-repeat 0px 50%; color: green; } @@ -879,7 +895,7 @@ padding: 0 20px; } .overlay #branding div.breadcrumb { - float: left; + float: left; /* LTR */ position: relative; z-index: 10; } @@ -894,7 +910,8 @@ } .overlay ul.secondary { background: transparent none; - margin: -2.4em 0 0.3em 0; + margin: -1.4em 0 0.3em 0; /* LTR */ + overflow: visible; } .overlay #content { padding: 0; @@ -905,9 +922,9 @@ /* Shortcut theming */ div.add-or-remove-shortcuts { - float: left; + float: left; /* LTR */ padding-top: 6px; - padding-left: 6px; + padding-left: 6px; /* LTR */ } /* Dashboard */ @@ -920,10 +937,10 @@ padding: 3px 10px; } #dashboard div.block div.content { - padding: 10px 5px 5px 5px; + padding: 10px 5px 5px 5px; /* LTR */ } #dashboard div.block div.content ul.menu { - margin-left: 20px; + margin-left: 20px; /* LTR */ } #dashboard .dashboard-region .block { border: #ccc 1px solid; @@ -960,7 +977,7 @@ border: none; } #block-node-recent .more-link { - padding: 0 5px 5px 0; + padding: 0 5px 5px 0; /* LTR */ } /* User login block */ @@ -988,7 +1005,7 @@ padding: 0.4em 0.6em; } .overlay-disable-message-focused #overlay-dismiss-message { - background-color: #59A0D8; + background-color: #59a0d8; color: #fff; -moz-border-radius: 8px; -webkit-border-radius: 8px; diff --git a/themes/seven/template.php b/themes/seven/template.php index 4582749..83793ec 100644 --- a/themes/seven/template.php +++ b/themes/seven/template.php @@ -17,9 +17,11 @@ */ function seven_preprocess_html(&$vars) { // Add conditional CSS for IE8 and below. - drupal_add_css(path_to_theme() . '/ie.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE), 'preprocess' => FALSE)); + drupal_add_css(path_to_theme() . '/ie.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE), 'weight' => 999, 'preprocess' => FALSE)); + // Add conditional CSS for IE7 and below. + drupal_add_css(path_to_theme() . '/ie7.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 7', '!IE' => FALSE), 'weight' => 999, 'preprocess' => FALSE)); // Add conditional CSS for IE6. - drupal_add_css(path_to_theme() . '/ie6.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lt IE 7', '!IE' => FALSE), 'preprocess' => FALSE)); + drupal_add_css(path_to_theme() . '/ie6.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lt IE 6', '!IE' => FALSE), 'weight' => 999, 'preprocess' => FALSE)); } /**