From 26cf0995016512aba6073f189d4843ce1d2ef7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ronny=20L=C3=B8vtangen?= Date: Wed, 18 Feb 2015 21:16:32 +0100 Subject: [PATCH] GRAILS-11998 Align with latest changes to HTML5 Boilerplate. Remove conditional comments and IE6/7 hacks. Ref https://github.com/h5bp/html5-boilerplate/issues/1050, https://github.com/h5bp/html5-boilerplate/issues/1187 and https://github.com/h5bp/html5-boilerplate/issues/1290 --- .../grails-app/assets/stylesheets/main.css | 27 ------------------- skeleton/grails-app/views/index.gsp | 4 --- skeleton/grails-app/views/layouts/main.gsp | 8 ++---- 3 files changed, 2 insertions(+), 37 deletions(-) diff --git a/skeleton/grails-app/assets/stylesheets/main.css b/skeleton/grails-app/assets/stylesheets/main.css index a55945d..6711f42 100644 --- a/skeleton/grails-app/assets/stylesheets/main.css +++ b/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/skeleton/grails-app/views/index.gsp b/skeleton/grails-app/views/index.gsp index fa496b1..d652895 100644 --- a/skeleton/grails-app/views/index.gsp +++ b/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/skeleton/grails-app/views/layouts/main.gsp b/skeleton/grails-app/views/layouts/main.gsp index 437ea48..3a205a7 100644 --- a/skeleton/grails-app/views/layouts/main.gsp +++ b/skeleton/grails-app/views/layouts/main.gsp @@ -1,12 +1,8 @@ - - - - - + - + <g:layoutTitle default="Grails"/>