Fixes #3845 added ie7 css view and tested all current hacks for ie7

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 9a236508f60f124ccd80412aeccf377f145745e7..3b9448c71772b68a9a9c44c81832c3e199e4df2f 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1553,6 +1553,7 @@ function elgg_views_boot() {
        elgg_register_simplecache_view('css/elgg');
        elgg_register_simplecache_view('css/ie');
        elgg_register_simplecache_view('css/ie6');
+       elgg_register_simplecache_view('css/ie7');
        elgg_register_simplecache_view('js/elgg');
 
        elgg_register_js('jquery', '/vendors/jquery/jquery-1.6.2.min.js', 'head');

diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
index 5750c05c0bfe16f797926fc14776ce0d9d9a8e22..03373da2b866fcc486f4a9f1f962a1615573f8ec 100644 (file)
--- a/mod/embed/views/default/embed/css.php
+++ b/mod/embed/views/default/embed/css.php
@@ -8,7 +8,7 @@
 .embed-wrapper {
        width: 730px;
        min-height: 400px;
-       margin: 10px;
+       margin: 15px;
 }
 .embed-wrapper h2 {
        color: #333333;

diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index af4a1882a6345e48b29be0b2a5e3ad58fe21fb78..627cae55cc2e2d97e7d3d937458c1aa4a5ffb429 100644 (file)
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -98,8 +98,4 @@
        position: relative;
 
        display: inline-block;
-       
-       /* Inline-block: IE 6, 7 */
-       zoom: 1;
-       *display: inline;
 }

diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 9386fa27b03377a07b914d8362e7323b366b5ab4..bee1312ec551b945e0567b1a378a2ce2b2827282 100644 (file)
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -98,7 +98,7 @@
 .elgg-breadcrumbs > li {
        display: inline-block;
 }
-.elgg-breadcrumbs > li:after{
+.elgg-breadcrumbs > li:after {
        content: "\003E";
        padding: 0 4px;
        font-weight: normal;
@@ -412,7 +412,7 @@
 .elgg-menu-footer > li,
 .elgg-menu-footer > li > a {
        display: inline-block;
-       color:#999;
+       color: #999;
 }
 
 .elgg-menu-footer > li:after {

diff --git a/views/default/css/ie.php b/views/default/css/ie.php
index c5edefd4c9920bed4fb02565abcd587e68b34732..d20bb4d59746b0df5539acc8cbb4b95b1f88620f 100644 (file)
--- a/views/default/css/ie.php
+++ b/views/default/css/ie.php
@@ -1,121 +1,4 @@
 /**
- * CSS for Internet Explorer for versions > ie6
+ * CSS for IE8 and above
  */
 
-* {zoom: 1;} /* trigger hasLayout in IE */
-
-/* site menu drop-down for IE7 */
-.elgg-page-header {
-    z-index: 1;
-}
-
-.navigation li a:hover ul {display:block; position:absolute; top:21px; left:0;}
-.navigation li a:hover ul li a {display:block;}
-.navigation li.navigation-more ul li a {width:150px;background-color: #dedede;}
-
-.clearfix { display: block; }
-.hidden.clearfix { display: none; }
-#elgg-page-contents {overflow: hidden;} /* remove horizontal scroll on riverdash */
-#breadcrumbs {top:-2px; margin-bottom: 5px;}
-
-/* entity list views */
-.entity-metadata {max-width: 300px;}
-.entity-edit {float:right;}
-.access_level {float:left;}
-.elgg-image-block .entity-metadata {
-       min-width:400px;
-       text-align: right;
-}
-
-/* profile */
-.elgg-tabs.profile .profile_name {margin-left: -260px;}
-#profile_content .river_comment_form.hidden .input-text { width:510px; }
-
-/* notifications */
-.friends-picker-navigation {margin:0;padding:0;}
-.friends-picker-container h3 {margin:0;padding:0;line-height: 1em;}
-
-/* private messages */
-#elgg-topbar-contents a.privatemessages.new span { 
-       display:block;
-       padding:1px;
-       position:relative;
-       text-align:center;
-       float:left;
-       top:-1px;
-       right:auto;
-}
-#elgg-topbar-contents a.privatemessages.new  {padding:0 0 0 20px;}
-#elgg-topbar-contents a.privatemessages:hover {background-position:left 2px;}
-#elgg-topbar-contents a.privatemessages.new:hover {background-position: left 2px;}
-
-/* riverdashboard mod rules */
-#riverdashboard_updates {clear:both;}
-#riverdashboard_updates a.update_link {margin:0 0 9px 0;}
-.riverdashboard_filtermenu {margin:10px 0 0 0;}
-.river_comment_form.hidden .input-text {
-       width:530px;
-       float:left;
-}
-.river_link_divider {
-       width:10px;
-       text-align: center;
-}
-
-/* shared access */
-.shared_access_collection h2.shared_access_name {margin-top:-15px;}
-
-/* dropdown login */
-*:first-child+html #login-dropdown #signin-button {
-       line-height:10px;
-}
-*:first-child+html #login-dropdown #signin-button a.signin span {
-       background-position:-150px -54px;
-}
-*:first-child+html #login-dropdown #signin-button a.signin.menu-open span {
-       background-position:-150px -74px;
-}
-
-/* Gallery */
-.elgg-gallery-fluid > li {
-       float: left;
-       margin: 2px;
-}
-
-
-/* navigation */
-.elgg-breadcrumbs > li {
-       display: inline;
-}
-
-.elgg-breadcrumbs > li > a {
-       display: inline;
-       padding-right: 4px;
-       margin-right: 4px;
-       border-right: 1px solid #bababa;
-}
-
-.elgg-menu-title > li {
-       display: block;
-}
-
-.elgg-menu-title > li > a {
-       display: block;
-}
-
-.elgg-menu-footer > li > a {
-       display: inline;
-}
-
-.elgg-menu-river > li {
-       display: inline;
-}
-
-li:hover > .elgg-menu-site-more {
-       display: none;
-}
-
-/* admin */
-.elgg-menu-footer li {
-       display: inline;
-}
\ No newline at end of file

diff --git a/views/default/css/ie6.php b/views/default/css/ie6.php
index f8ed208f6ddf9607482b12cab1f31dc22eae733d..cf49d33f20b8a7aaeed019899e644cb0dd6e5e09 100644 (file)
--- a/views/default/css/ie6.php
+++ b/views/default/css/ie6.php
@@ -1,15 +1,11 @@
 /**
- * elgg_layout css for Internet Explorer6
- * @uses $vars['wwwroot'] The site URL
-*/
+ * CSS for IE6
+ */
 
 * {zoom: 1;} /* trigger hasLayout in IE */
 
 /* main nav drop-down */
 #elgg-header {z-index:1;}
-.navigation li a:hover ul {display:block; position:absolute; top:21px; left:0;}
-.navigation li a:hover ul li a {display:block;}
-.navigation li.navigation-more ul li a {width:150px;background-color: #dedede;}
 
 /* @todo check this one */
 .elgg-button-delete a { background-position-y: 2px; }

diff --git a/views/default/css/ie7.php b/views/default/css/ie7.php
new file mode 100644 (file)
index 0000000..91d2382
--- /dev/null
+++ b/views/default/css/ie7.php
@@ -0,0 +1,49 @@
+/**
+ * CSS for IE7
+ */
+
+/* trigger hasLayout in IE */
+* {
+       zoom: 1;
+}
+
+/* site menu drop-down z-index fix for IE7 */
+.elgg-page-header {
+    z-index: 1;
+}
+
+/* inline-block fixes */
+.elgg-gallery > li,
+.elgg-button,
+.elgg-icon,
+.elgg-menu-hz > li,
+.elgg-menu-hz > li:after,
+.elgg-menu-hz > li > a,
+.elgg-menu-hz > li > span,
+.elgg-breadcrumbs > li,
+.elgg-menu-footer > li > a,
+.elgg-menu-footer li {
+       display: inline;
+}
+
+/* IE7 does not support :after */
+.elgg-breadcrumbs > li > a {
+       display: inline;
+       padding-right: 4px;
+       margin-right: 4px;
+       border-right: 1px solid #bababa;
+}
+.elgg-menu-footer li,
+.elgg-menu-user li {
+       padding-left: 4px;
+       padding-right: 4px;
+}
+
+/* longtext menu would not display horizontally without this */
+.elgg-menu-longtext {
+       width: 100%;
+}
+.elgg-menu-longtext li {
+       width: 100px;
+       float: right;
+}

diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index 8776f07a72eab45fa6765c1e568cb0a3fab3ab30..e968e95ce9c20b395542b3aebe8a3f6f18435273 100644 (file)
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -48,11 +48,15 @@ $release = get_version(true);
 
 <?php
        $ie_url = elgg_get_simplecache_url('css', 'ie');
+       $ie7_url = elgg_get_simplecache_url('css', 'ie7');
        $ie6_url = elgg_get_simplecache_url('css', 'ie6');
 ?>
-       <!--[if gt IE 6]>
+       <!--[if gt IE 7]>
                <link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" />
        <![endif]-->
+       <!--[if IE 7]>
+               <link rel="stylesheet" type="text/css" href="<?php echo $ie7_url; ?>" />
+       <![endif]-->
        <!--[if IE 6]>
                <link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" />
        <![endif]-->