GRAILS-11998 Align with latest changes to HTML5 Boilerplate. Remove c…

…onditional comments and IE6/7 hacks. Ref h5bp/html5-boilerplate#1050, h5bp/html5-boilerplate#1187 and h5bp/html5-boilerplate#1290
rlovtangen · Feb 18, 2015 · 23e4d62 · 23e4d62
1 parent f8acce6
commit 23e4d62
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 37 deletions.
diff --git a/profiles/web/skeleton/grails-app/assets/stylesheets/main.css b/profiles/web/skeleton/grails-app/assets/stylesheets/main.css
@@ -28,10 +28,6 @@ html.no-cssgradients {
 	background-color: #aaa;
 }
 
-.ie6 html {
-	height: 100%;
-}
-
 html * {
 	margin: 0;
 }
@@ -51,19 +47,6 @@ body {
 	background-color: #abbf78;
 }
 
-/* replace with .no-boxshadow body if you have modernizr available */
-.ie6 body,
-.ie7 body,
-.ie8 body {
-	border-color: #255b17;
-	border-style: solid;
-	border-width: 0 1px;
-}
-
-.ie6 body {
-	height: 100%;
-}
-
 a:link, a:visited, a:hover {
 	color: #48802c;
 }
@@ -297,11 +280,6 @@ ul.one-to-many {
 	vertical-align: top;
 }
 
-.ie6 ul.one-to-many, .ie7 ul.one-to-many {
-	display: inline;
-	zoom: 1;
-}
-
 ul.one-to-many li.add {
 	list-style-type: none;
 }
@@ -573,11 +551,6 @@ th:hover, tr:hover {
 	text-indent: 25px;
 }
 
-.ie6 .buttons input.delete, .ie6 .buttons input.edit, .ie6 .buttons input.save,
-.ie7 .buttons input.delete, .ie7 .buttons input.edit, .ie7 .buttons input.save {
-	padding-left: 36px;
-}
-
 .buttons .delete {
 	background-image: url(../images/skin/database_delete.png);
 }

diff --git a/profiles/web/skeleton/grails-app/views/index.gsp b/profiles/web/skeleton/grails-app/views/index.gsp
@@ -19,10 +19,6 @@
 				border-radius: 0.6em;
 			}
 
-			.ie6 #status {
-				display: inline; /* float double margin fix http://www.positioniseverything.net/explorer/doubled-margin.html */
-			}
-
 			#status ul {
 				font-size: 0.9em;
 				list-style-type: none;

diff --git a/profiles/web/skeleton/grails-app/views/layouts/main.gsp b/profiles/web/skeleton/grails-app/views/layouts/main.gsp
@@ -1,12 +1,8 @@
 <!DOCTYPE html>
-<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"> <![endif]-->
-<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"> <![endif]-->
-<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"> <![endif]-->
-<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"> <![endif]-->
-<!--[if (gt IE 9)|!(IE)]><!--> <html lang="en" class="no-js"><!--<![endif]-->
+<html lang="en" class="no-js">
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<title><g:layoutTitle default="Grails"/></title>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
   		<asset:stylesheet src="application.css"/>