Skip to content
This repository was archived by the owner on Jan 14, 2025. It is now read-only.

Commit 26cf099

Browse files
committed
GRAILS-11998 Align with latest changes to HTML5 Boilerplate. Remove conditional comments and IE6/7 hacks. Ref h5bp/html5-boilerplate#1050, h5bp/html5-boilerplate#1187 and h5bp/html5-boilerplate#1290
1 parent 2ff83e7 commit 26cf099

File tree

3 files changed

+2
-37
lines changed

3 files changed

+2
-37
lines changed

skeleton/grails-app/assets/stylesheets/main.css

-27
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ html.no-cssgradients {
2828
background-color: #aaa;
2929
}
3030

31-
.ie6 html {
32-
height: 100%;
33-
}
34-
3531
html * {
3632
margin: 0;
3733
}
@@ -51,19 +47,6 @@ body {
5147
background-color: #abbf78;
5248
}
5349

54-
/* replace with .no-boxshadow body if you have modernizr available */
55-
.ie6 body,
56-
.ie7 body,
57-
.ie8 body {
58-
border-color: #255b17;
59-
border-style: solid;
60-
border-width: 0 1px;
61-
}
62-
63-
.ie6 body {
64-
height: 100%;
65-
}
66-
6750
a:link, a:visited, a:hover {
6851
color: #48802c;
6952
}
@@ -297,11 +280,6 @@ ul.one-to-many {
297280
vertical-align: top;
298281
}
299282

300-
.ie6 ul.one-to-many, .ie7 ul.one-to-many {
301-
display: inline;
302-
zoom: 1;
303-
}
304-
305283
ul.one-to-many li.add {
306284
list-style-type: none;
307285
}
@@ -573,11 +551,6 @@ th:hover, tr:hover {
573551
text-indent: 25px;
574552
}
575553

576-
.ie6 .buttons input.delete, .ie6 .buttons input.edit, .ie6 .buttons input.save,
577-
.ie7 .buttons input.delete, .ie7 .buttons input.edit, .ie7 .buttons input.save {
578-
padding-left: 36px;
579-
}
580-
581554
.buttons .delete {
582555
background-image: url(../images/skin/database_delete.png);
583556
}

skeleton/grails-app/views/index.gsp

-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919
border-radius: 0.6em;
2020
}
2121
22-
.ie6 #status {
23-
display: inline; /* float double margin fix http://www.positioniseverything.net/explorer/doubled-margin.html */
24-
}
25-
2622
#status ul {
2723
font-size: 0.9em;
2824
list-style-type: none;

skeleton/grails-app/views/layouts/main.gsp

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<!DOCTYPE html>
2-
<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"> <![endif]-->
3-
<!--[if IE 7 ]> <html lang="en" class="no-js ie7"> <![endif]-->
4-
<!--[if IE 8 ]> <html lang="en" class="no-js ie8"> <![endif]-->
5-
<!--[if IE 9 ]> <html lang="en" class="no-js ie9"> <![endif]-->
6-
<!--[if (gt IE 9)|!(IE)]><!--> <html lang="en" class="no-js"><!--<![endif]-->
2+
<html lang="en" class="no-js">
73
<head>
84
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
9-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
106
<title><g:layoutTitle default="Grails"/></title>
117
<meta name="viewport" content="width=device-width, initial-scale=1.0">
128
<asset:stylesheet src="application.css"/>

0 commit comments

Comments
 (0)