Skip to content

Commit

Permalink
Merge pull request #7582 from jdalsem/remove-ie8
Browse files Browse the repository at this point in the history
Remove ie8 css/js
  • Loading branch information
ewinslow committed Dec 2, 2014
2 parents e34b6e8 + 99afd87 commit fb0e5dd
Show file tree
Hide file tree
Showing 11 changed files with 6 additions and 232 deletions.
2 changes: 0 additions & 2 deletions docs/guides/themes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ Here is a list of the existing CSS views:
* css/elements/modules: Lots of content in Elgg is displayed in boxes with a title and a content body. We called these modules. There are a few kinds: info, aside, featured, dropdown, popup, widget. Widget styles are included in this file too, since they are a subset of modules.
* css/elements/navigation: This file determines what all your menus will look like.
* css/elements/typography: This file determines what the content and headings of your site will look like.
* css/ie6: Custom rules for ie6 and below.
* css/ie7: Custom rules for ie7 and below.
* css/rtl: Custom rules for users viewing your site in a right-to-left language.
* css/admin: A completely separate theme for the admin area (usually not overridden).
* css/elgg: Compiles all the core css/elements/\* files into one file (DO NOT OVERRIDE).
Expand Down
2 changes: 0 additions & 2 deletions engine/lib/views.php
Original file line number Diff line number Diff line change
Expand Up @@ -1581,8 +1581,6 @@ function elgg_views_boot() {
global $CONFIG;

elgg_register_simplecache_view('css/ie');
elgg_register_simplecache_view('css/ie7');
elgg_register_simplecache_view('css/ie8');

elgg_register_simplecache_view('js/text.js');

Expand Down
80 changes: 0 additions & 80 deletions mod/aalborg_theme/views/default/css/ie7.php

This file was deleted.

12 changes: 0 additions & 12 deletions mod/aalborg_theme/views/default/css/maintenance.php
Original file line number Diff line number Diff line change
Expand Up @@ -227,18 +227,6 @@
background-color: #5097CF;
}

/* ***************************************
IE workarounds
*************************************** */
.ie7 .elgg-module-maintenance > .elgg-head,
.ie7 .elgg-module-maintenance > .elgg-foot {
width: 530px;
}
.ie7 input[type=text],
.ie7 input[type=password] {
width: 94%;
}

/* ***************************************
RESPONSIVE
*************************************** */
Expand Down
6 changes: 0 additions & 6 deletions mod/groups/views/default/groups/js.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,4 @@
*/
?>

// this adds a class to support IE8 and older
elgg.register_hook_handler('init', 'system', function() {
// jQuery uses 0-based indexing
$('#groups-tools').children('li:even').addClass('odd');
});

elgg.ui.registerTogglableMenuItems('feature', 'unfeature');
4 changes: 0 additions & 4 deletions views/default/css/elements/core.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@
width: auto;
word-wrap: break-word;
overflow: hidden;

/* IE 6, 7 */
zoom:1;
*overflow:visible;
}

<?php
Expand Down
79 changes: 3 additions & 76 deletions views/default/css/ie7.php
Original file line number Diff line number Diff line change
@@ -1,77 +1,4 @@
<?php
elgg_deprecated_notice("The core view css/ie7 is no longer used and should not be used.", "1.10");
?>
/* <style> /**/

/**
* 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,
.elgg-menu-general > li > a,
.elgg-pagination li,
.elgg-menu-general 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,
.elgg-menu-general 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;
}

.elgg-avatar {
display: inline;
}

.elgg-body-walledgarden .elgg-col-1of2 {
width: 255px;
}

.elgg-module-walledgarden > .elgg-head,
.elgg-module-walledgarden > .elgg-foot {
width: 530px;
}

input, textarea {
width: 98%;
}

.elgg-tag a {
/* IE7 had a weird wrapping issue for tags */
word-wrap: normal;
}
24 changes: 3 additions & 21 deletions views/default/css/ie8.php
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
<?php
elgg_deprecated_notice("The core view css/ie8 is no longer used and should not be used.", "1.10");
?>
/* <style> /**/

/**
* CSS for IE8 and above
*/

/* ie8 does not like shrink wrapping this div with inline-block */
.elgg-avatar {
display: block;
}

/* ie8 adds space to the top of .elgg-gallery which causes jumpiness if this is display: block; */
.elgg-gallery .elgg-avatar > a > img {
display: inline-block;
}
.elgg-gallery .elgg-avatar > .elgg-icon-hover-menu {
bottom: 4px;
}
/* Maintain the aspect ratio of images. */
.elgg-output img {
width: auto;
}
13 changes: 0 additions & 13 deletions views/default/css/maintenance.php
Original file line number Diff line number Diff line change
Expand Up @@ -223,16 +223,3 @@
.elgg-state-notice {
background-color: #4690D6;
}

/* ***************************************
IE workarounds
*************************************** */
.ie7 .elgg-module-maintenance > .elgg-head,
.ie7 .elgg-module-maintenance > .elgg-foot {
width: 530px;
}
.ie7 input[type=text],
.ie7 input[type=password] {
width: 94%;
}

8 changes: 0 additions & 8 deletions views/default/page/elements/head.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@

$html5shiv_url = elgg_normalize_url('vendors/html5shiv.js');
$ie_url = elgg_get_simplecache_url('css', 'ie');
$ie8_url = elgg_get_simplecache_url('css', 'ie8');
$ie7_url = elgg_get_simplecache_url('css', 'ie7');

?>

Expand All @@ -53,12 +51,6 @@
<!--[if gt IE 8]>
<link rel="stylesheet" href="<?php echo $ie_url; ?>" />
<![endif]-->
<!--[if IE 8]>
<link rel="stylesheet" href="<?php echo $ie8_url; ?>" />
<![endif]-->
<!--[if IE 7]>
<link rel="stylesheet" href="<?php echo $ie7_url; ?>" />
<![endif]-->

<script><?php echo $elgg_init; ?></script>
<?php
Expand Down
8 changes: 0 additions & 8 deletions views/default/page/maintenance.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,6 @@
$content
</div>
</div>
<!--[if IE 7]>
<script>
var div = document.getElementById("elgg-maintenance-page-wrapper");
div.className = div.className + " ie7";
</script>
<![endif]-->
__BODY;

echo elgg_view("page/elements/html", array('head' => $head, 'body' => $body));
Expand Down

0 comments on commit fb0e5dd

Please sign in to comment.