Merge branch 'master' into bbmaster
This commit is contained in:
commit
59a56b1f49
2 changed files with 78 additions and 4 deletions
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2010 Helmut Merz helmutm@cy55.de
|
||||
# Copyright (c) 2011 Helmut Merz helmutm@cy55.de
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
|
@ -18,8 +18,6 @@
|
|||
|
||||
"""
|
||||
View controller for the Lobo skin.
|
||||
|
||||
$Id$
|
||||
"""
|
||||
|
||||
from cybertools.browser.controller import Controller as BaseController
|
||||
|
@ -40,7 +38,7 @@ class Controller(BaseController):
|
|||
presentationMode = self.request.get('liquid.viewmode') == 'presentation'
|
||||
params = [('blue/blue8.css', 'all', 20, False),
|
||||
('print.css', 'print', 25, False),
|
||||
('blue/blueprint/ie.css', 'all', 30, True),
|
||||
('blue/ie.css', 'all', 30, True),
|
||||
('custom.css', 'all', 100, False)]
|
||||
#if presentationMode:
|
||||
# params.append(('presentation.css', 'all', 30, False))
|
||||
|
|
76
browser/blue/ie.css
Normal file
76
browser/blue/ie.css
Normal file
|
@ -0,0 +1,76 @@
|
|||
/* --------------------------------------------------------------
|
||||
|
||||
ie.css
|
||||
|
||||
Contains every hack for Internet Explorer,
|
||||
so that our core files stay sweet and nimble.
|
||||
|
||||
-------------------------------------------------------------- */
|
||||
|
||||
/* Make sure the layout is centered in IE5 */
|
||||
body { text-align: center; }
|
||||
.container { text-align: left; }
|
||||
|
||||
/* Fixes IE margin bugs */
|
||||
* html .column, * html .span-1, * html .span-2,
|
||||
* html .span-3, * html .span-4, * html .span-5,
|
||||
* html .span-6, * html .span-7, * html .span-8,
|
||||
* html .span-9, * html .span-10, * html .span-11,
|
||||
* html .span-12, * html .span-13, * html .span-14,
|
||||
* html .span-15, * html .span-16, * html .span-17,
|
||||
* html .span-18, * html .span-19, * html .span-20,
|
||||
* html .span-21, * html .span-22, * html .span-23,
|
||||
* html .span-24 { display:inline; overflow-x: hidden; }
|
||||
|
||||
|
||||
/* Elements
|
||||
-------------------------------------------------------------- */
|
||||
|
||||
/* Fixes incorrect styling of legend in IE6. */
|
||||
* html legend { margin:0px -8px 16px 0; padding:0; }
|
||||
|
||||
/* Fixes wrong line-height on sup/sub in IE. */
|
||||
sup { vertical-align:text-top; }
|
||||
sub { vertical-align:text-bottom; }
|
||||
|
||||
/* Fixes IE7 missing wrapping of code elements. */
|
||||
html>body p code { *white-space: normal; }
|
||||
|
||||
/* IE 6&7 has problems with setting proper <hr> margins. */
|
||||
hr { margin:-8px auto 11px; }
|
||||
|
||||
/* Explicitly set interpolation, allowing dynamically resized images to not look horrible */
|
||||
img { -ms-interpolation-mode:bicubic; }
|
||||
|
||||
/* Clearing
|
||||
-------------------------------------------------------------- */
|
||||
|
||||
/* Makes clearfix actually work in IE */
|
||||
.clearfix, .container { display:inline-block; }
|
||||
* html .clearfix,
|
||||
* html .container { height:1%; }
|
||||
|
||||
|
||||
/* Forms
|
||||
-------------------------------------------------------------- */
|
||||
|
||||
/* Fixes padding on fieldset */
|
||||
fieldset { padding-top:0; }
|
||||
|
||||
/* Makes classic textareas in IE 6 resemble other browsers */
|
||||
textarea { overflow:auto; }
|
||||
|
||||
/* Fixes rule that IE 6 ignores */
|
||||
input.text, input.title, textarea { background-color:#fff; border:1px solid #bbb; }
|
||||
input.text:focus, input.title:focus { border-color:#666; }
|
||||
input.text, input.title, textarea, select { margin:0.5em 0; }
|
||||
input.checkbox, input.radio { position:relative; top:.25em; }
|
||||
|
||||
/* Fixes alignment of inline form elements */
|
||||
form.inline div, form.inline p { vertical-align:middle; }
|
||||
form.inline label { position:relative;top:-0.25em; }
|
||||
form.inline input.checkbox, form.inline input.radio,
|
||||
form.inline input.button, form.inline button {
|
||||
margin:0.5em 0;
|
||||
}
|
||||
button, input.button { position:relative;top:0.25em; }
|
Loading…
Add table
Reference in a new issue