Browse files

Moved IE hacks to IE stylesheet

  • Loading branch information...
1 parent 6320ce1 commit 4ce6310f03bb4795e6a034d4b0c9b12040e3ba7d @jdlich committed Oct 26, 2011
View
19 cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/services/includes/top.jsp
@@ -16,6 +16,10 @@
<link rel="stylesheet" href="<c:url value="/css/services/cas.css" />" type="text/css" media="screen" />
+ <!--[if IE]>
+ <link rel="stylesheet" href="<c:url value="/css/services/ieFix.css" />" type="text/css" media="screen" />
+ <![endif]-->
+
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"></script>
<script type="text/javascript" src="<c:url value="/js/cas.js" />"></script>
@@ -51,21 +55,6 @@
#allowedAttributes {height:150px;}
}
</style>
-
- <!--[if IE]>
- <style type="text/css">
- * html button {padding:0; width:0; overflow:visible;}
- * html .fieldset-inner {padding:1em;}
- * html fieldset {position:relative; padding:0; margin:4em 0 0;}
-
- * html legend {margin:0; padding:0; position:relative; top:-0.5em; margin-bottom:-0.5em;}
- td.td7 {width:85px; padding-right:22px !important;}
- div.tableWrapper {xoverflow-y:scroll;}
- * html td.td7 {width:102px; padding-right:5px !important; text-align:left !important;}
- * html table#scrollTable {margin-right:-17px;}
- * html div.tableWrapper {width:auto; height:250px;}
- </style>
- <![endif]-->
</head>
<body id="${pageTitle}-body">
View
26 cas-server-webapp/src/main/webapp/css/services/cas.css
@@ -105,11 +105,6 @@ form {
background: transparent;
color: #eee;
}
-/* Hide from IE5Mac only \*/
-#nav-main a span {
- float: none;
-}
-/* End hack */
#nav-main a:hover {
background: #eee;
}
@@ -188,27 +183,6 @@ form {
margin: 0;
font: normal 1em/1.2 Verdana,Arial,Helvetica,sans-serif;
}
-#footer #nav-campus-sites li:before {} /* content: " | " */
-#footer #nav-campus-sites li:first-child:before {}
-/* All IE browsers */
-* html #footer {
- height: 1px;
-}
-* html #footer #nav-campus-sites {
- padding: 0 0.4em 0 0;
- margin: 0;
-}
-/* Win IE browsers - hide from Mac IE\*/
-* html #footer #nav-campus-sites {
- height: 1px; }
-* html #footer #nav-campus-sites li {
- display: block;
- float: left;
-}
-/* End hide from Mac IE 5 */
-* html #footer #nav-campus-sites li:first-child {
- border-left: 0px none;
-}
/*
_______________________________
View
16 cas-server-webapp/src/main/webapp/css/services/ieFix.css
@@ -35,4 +35,18 @@ input.check {width:13px; height:13px;}
span a {display:inline-block;}
label.top {margin-left:0;}
label.ieFix {margin-top:.5em;}
-fieldset fieldset {padding-bottom:0;}
+fieldset fieldset {padding-bottom:0;}
+
+* html button {padding:0; width:0; overflow:visible;}
+* html .fieldset-inner {padding:1em;}
+* html fieldset {position:relative; padding:0; margin:4em 0 0;}
+
+* html legend {margin:0; padding:0; position:relative; top:-0.5em; margin-bottom:-0.5em;}
+ td.td7 {width:85px; padding-right:22px !important;}
+ div.tableWrapper {xoverflow-y:scroll;}
+ * html td.td7 {width:102px; padding-right:5px !important; text-align:left !important;}
+ * html table#scrollTable {margin-right:-17px;}
+ * html div.tableWrapper {width:auto; height:250px;}
+
+/* Hide from IE5Mac only \*/
+#nav-main a span {float:none;}

0 comments on commit 4ce6310

Please sign in to comment.