Merge pull request #487 from mgballard/master

IE8 Fixes
This commit is contained in:
Chris McAvoy 2013-06-06 06:30:52 -07:00
Родитель 83b6eaea33 95e946ec58
Коммит 52fd6504d7
3 изменённых файлов: 46 добавлений и 14 удалений

Просмотреть файл

@ -91,10 +91,12 @@ ol {
box-shadow: none;
color: #000;
}
.navbar .navbar-inner {
.navbar div.navbar-inner {
background-image: none;
background-repeat: repeat;
background: #45bcd2;
border-bottom: 1px solid #c0c0c0;
filter: none;
background-color: #45bcd2;
}
.navbar form.navbar-inner {
padding: 7px;
@ -106,11 +108,13 @@ ol {
padding-top: 25px;
}
.navbar .nav-wrap {
border: 1px solid #c0c0c0;
border-radius: 7px;
width: 100%;
padding: 0 0 0 0;
margin: 0 0 0 0;
width: 940px;
margin-bottom: -24px;
margin-bottom: -22px;
-webkit-box-shadow: 0 0 8px 3px rgba(0, 0, 0, 0.25);
-moz-box-shadow: 0 0 8px 3px rgba(0, 0, 0, 0.25);
box-shadow: 0 0 8px 3px rgba(0, 0, 0, 0.25);
@ -809,6 +813,11 @@ body .navbar.filter label.filter-activity {
body .navbar.filter label.filter-type {
background-position: 0 -720px;
}
body .navbar.filter .navbar-inner {
border: 1px solid #c0c0c0;
filter: none;
background: #45bcd2;
}
/* ------------------------------ */
/* Mobile : general ------------ */
/* ------------------------------ */
@ -868,6 +877,9 @@ body.home .navbar .navbar-inner {
overflow: visible;
max-height: 515px;
}
body.home .navbar .nav-wrap {
border: none;
}
body.home .navbar .nav > li {
font-weight: 400;
}
@ -968,13 +980,14 @@ body.home .navbar .nav-wrap ul.nav > li:nth-child(even) {
/* Landing page : all displays -- */
/* ------------------------------ */
body.home {
min-height: 775px;
background: url('../img/background-chalkboard-green.jpg') no-repeat center center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/background-chalkboard-green.jpg', sizingMethod='scale');
-ms-filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/background-chalkboard-green.jpg', sizingMethod='scale')";
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/media/img/background-chalkboard-green.jpg', sizingMethod='scale');
-ms-filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/media/img/background-chalkboard-green.jpg',sizingMethod='scale')";
overflow: visible;
}
body.home .navbar .navbar-inner {
@ -986,8 +999,8 @@ body.home .navbar .navbar-inner {
-o-background-size: cover;
background-size: cover;
padding-top: 0px;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/spacedimg.png', sizingMethod='scale');
-ms-filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/spacedimg.png', sizingMethod='scale')";
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/media/img/spacedimg.jpg', sizingMethod='scale');
-ms-filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/media/img/spacedimg.jpg',sizingMethod='scale')";
}
body.home .navbar .navbar-inner > .container {
background-image: url('../img/home_drawing.png');
@ -1107,6 +1120,7 @@ body.home #cl_i_vid {
/* ------------------------------ */
@media only screen and (max-width: 599px) {
body.home {
min-height: inherit;
background-image: url('../img/chalkboard_bg.jpg');
-webkit-background-size: inherit;
-moz-background-size: inherit;

Просмотреть файл

@ -93,10 +93,12 @@ ol {
}
}
}
.navbar-inner {
div.navbar-inner {
background-image:none;
background-repeat:repeat;
background:#45bcd2;
border-bottom:1px solid #c0c0c0;
filter:none;
background-color:#45bcd2;
}
form.navbar-inner {
padding:7px;
@ -108,11 +110,13 @@ ol {
padding-top:25px;
}
.nav-wrap {
border:1px solid #c0c0c0;
border-radius:7px;
width:100%;
padding:0 0 0 0;
margin:0 0 0 0;
width:940px;
margin-bottom:-24px;
margin-bottom:-22px;
-webkit-box-shadow:0 0 8px 3px rgba(0, 0, 0, 0.25);
-moz-box-shadow:0 0 8px 3px rgba(0, 0, 0, 0.25);
box-shadow:0 0 8px 3px rgba(0, 0, 0, 0.25);
@ -904,6 +908,11 @@ body {
background-position: 0 -720px;
}
}
.navbar-inner {
border:1px solid #c0c0c0;
filter:none;
background:#45bcd2;
}
}
}
@ -989,6 +998,10 @@ body.home {
overflow:visible;
max-height:515px;
}
.nav-wrap {
border:none;
}
.nav {
& > li {
@ -1094,6 +1107,7 @@ body.home {
/* ------------------------------ */
body.home {
min-height:775px;
.navbar {
.navbar-inner {
background-image:url('../img/spacedimg.jpg');
@ -1104,8 +1118,8 @@ body.home {
-o-background-size:cover;
background-size:cover;
padding-top:0px;
filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/spacedimg.png', sizingMethod='scale');
-ms-filter:"progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/spacedimg.png', sizingMethod='scale')";
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/media/img/spacedimg.jpg',sizingMethod='scale');
-ms-filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/media/img/spacedimg.jpg',sizingMethod='scale')";
& > .container {
background-image:url('../img/home_drawing.png');
background-position:top center;
@ -1118,8 +1132,8 @@ body.home {
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/background-chalkboard-green.jpg', sizingMethod='scale');
-ms-filter:"progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/background-chalkboard-green.jpg', sizingMethod='scale')";
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/media/img/background-chalkboard-green.jpg',sizingMethod='scale');
-ms-filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/media/img/background-chalkboard-green.jpg',sizingMethod='scale')";
overflow:visible;
.container {
width:960px;
@ -1242,6 +1256,7 @@ body.home {
@media only screen
and (max-width : 599px) {
body.home {
min-height:inherit;
background-image:url('../img/chalkboard_bg.jpg');
-webkit-background-size: inherit;
-moz-background-size: inherit;

Просмотреть файл

@ -10,6 +10,9 @@
<link rel="icon" type="image/png" href="/media/images/favicon.png">
<script type="text/javascript" src="//use.typekit.net/nht7hbp.js"></script>
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<!--[if lt IE 9]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
{% block head %}{% endblock %}
</head>
<body{% if bodyClass %} class="{{ bodyClass }}"{% endif %}>