Merge remote-tracking branch 'ballard/master'

This commit is contained in:
Chris McAvoy 2013-06-03 16:48:13 -05:00
Родитель 4318552e68 aef1da2726
Коммит d25d41eb8c
7 изменённых файлов: 786 добавлений и 341 удалений

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

@ -85,6 +85,7 @@ ol {
}
.navbar .navbar-inner {
background-image: url('../img/chalkboard_bg.jpg');
background-repeat: repeat;
}
.navbar form.navbar-inner {
padding: 7px;
@ -154,6 +155,7 @@ nav.pagination ul li a {
-webkit-box-shadow: inset 0px 10px 20px 0px rgba(0, 0, 0, 0.25);
-moz-box-shadow: inset 0px 10px 20px 0px rgba(0, 0, 0, 0.25);
box-shadow: inset 0px 10px 20px 0px rgba(0, 0, 0, 0.25);
background-repeat: repeat;
}
.footer a {
color: #fff;
@ -236,8 +238,110 @@ nav.pagination ul li a {
.wrapper.secondary {
position: relative;
color: #fff;
overflow: hidden;
}
/*mobile*/
@media only screen and (min-width: 320px) and (max-width: 599px) {
.container p,
.container h1,
.container h2,
.footer .upper p {
width: inherit;
}
#main {
padding-top: 15px;
}
.form-search label,
.form-inline label,
.form-search .btn-group,
.form-inline .btn-group {
display: block;
}
.filter label {
display: none;
}
.navbar .nav-wrap,
.container,
.navbar-static-top .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container,
.navbar .brand {
width: 95%;
margin: 0 0 0 0;
padding: 0 0 0 0;
margin-left: auto;
margin-right: auto;
}
.form-horizontal .control-label {
text-align: left;
float: none;
}
.form-horizontal .controls {
margin-left: 0px;
}
.span6 {
width: inherit;
}
/*mobile navbar*/
.navbar div.navbar-inner {
padding-left: 0px;
padding-right: 0px;
padding-top: 10px;
padding-bottom: 10px;
border: none;
}
.navbar .nav-wrap {
width: 90%;
margin: 0 auto;
}
.navbar .nav-wrap ul.nav li {
display: block;
}
.navbar .nav-wrap ul.nav li a {
padding: 5px 0;
}
.navbar .nav-wrap ul.nav li:nth-child(even),
.navbar .nav-wrap ul.nav > .active > a,
.navbar .nav-wrap ul.nav > .active > a:hover {
border-left: none;
border-right: none;
}
/*mobile footer*/
.footer .upper {
padding-top: 15px;
}
.footer .upper p {
width: inherit;
background-image: none;
padding-left: 0px;
}
.footer .upper ul.pull-right {
width: 270px;
display: block;
float: none;
margin: 0 auto;
}
.footer .upper ul.pull-right li {
width: 90px;
float: left;
}
.footer .upper ul.pull-right li a {
margin: 0 auto;
}
.footer .lower {
border-top: none;
}
.footer .lower ul.pull-left {
display: none;
}
.footer .lower ul.pull-right {
float: none;
text-align: center;
}
.footer .lower ul.pull-right li {
display: inline;
}
}
/*CSOL-site specific*/
.poster a,
.poster img {
display: block;
@ -496,20 +600,62 @@ input[type="password"].metered:focus:invalid + .password-meter {
input[type="password"].metered:focus:invalid:focus + .password-meter {
border-color: #e9322d;
}
/*landing page specific*/
body.home {
background-image: url('../img/background-chalkboard-green.jpg');
background-repeat: no-repeat;
-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')";
overflow: visible;
/* ------------------------------ */
/* Mobile : width > iphone ------ */
/* ------------------------------ */
@media only screen and (min-width: 321px) and (max-width: 940px) {
.navbar .brand {
background-image: url('../img/csol_logo_480.png');
height: 166px;
}
body.home .container {
width: 960px;
}
/* ------------------------------ */
/* Mobile : width <= iphone ----- */
/* ------------------------------ */
@media only screen and (max-width: 320px) {
.navbar .brand {
background-image: url('../img/csol_logo_320.png');
height: 116px;
}
}
/* ------------------------------ */
/* CSOL-site SPECIFIC ----------- */
/* ------------------------------ */
/* ------------------------------ */
/* Mobile : width <= iphone ---- */
/* ------------------------------ */
@media only screen and (max-width: 320px) {
.span3 {
width: 150px;
}
ul.thumbnails li figure.thumbnail > a img {
width: 140px;
}
ul.thumbnails li figure.thumbnail {
margin: 0 0 0 0;
}
ul.thumbnails li figure.thumbnail > a img {
display: block;
width: 140px;
height: 140px;
background-image: url('../img/badge-default-320.png');
}
ul.thumbnails li:nth-child(2n+2) figure.thumbnail > a img {
background-position: 0 -140px;
}
ul.thumbnails li:nth-child(3n+3) figure.thumbnail > a img {
background-position: -140px 0px;
}
ul.thumbnails li:nth-child(4n+4) figure.thumbnail > a img {
background-position: -140px -140px;
}
}
/* ------------------------------ */
/* Landing page ---------------- */
/* ------------------------------ */
body.home #main {
padding: 0 0 0 0;
display: none;
}
body.home .navbar {
-webkit-box-shadow: 0px 10px 20px 0px rgba(0, 0, 0, 0.25);
@ -517,24 +663,9 @@ body.home .navbar {
box-shadow: 0px 10px 20px 0px rgba(0, 0, 0, 0.25);
}
body.home .navbar .navbar-inner {
background-image: url('../img/spacedimg.jpg');
background-repeat: no-repeat;
background-position: top center;
-webkit-background-size: cover;
-moz-background-size: cover;
-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')";
overflow: visible;
max-height: 515px;
}
body.home .navbar .navbar-inner > .container {
background-image: url('../img/home_drawing.png');
background-position: top center;
background-repeat: no-repeat;
}
body.home .navbar .nav > li.dropdown.open > .dropdown-toggle {
color: #fff;
}
@ -542,7 +673,7 @@ body.home .navbar .brand {
background-image: url('../img/csol_logo_sm.png');
position: absolute;
left: 50%;
margin-left: -102px;
margin-left: -93px;
z-index: 2;
top: 50px;
width: 189px;
@ -553,10 +684,10 @@ body.home .navbar .nav-wrap {
width: inherit;
margin-bottom: 0px;
height: 600px;
width: 310px;
width: 314px;
margin: 0 auto;
background: none;
background-image: url('../img/banner300.png');
background-image: url('../img/banner314.png');
background-position: top center;
background-repeat: no-repeat;
position: relative;
@ -565,7 +696,6 @@ body.home .navbar .nav-wrap {
}
body.home .navbar .nav-wrap ul.nav {
padding-top: 200px;
left: -6px;
}
body.home .navbar .nav-wrap ul.nav > li {
text-align: left;
@ -626,9 +756,40 @@ body.home .navbar .nav-wrap ul.nav > li:nth-child(even) {
border-left: none;
border-right: none;
}
body.home #main {
padding: 0 0 0 0;
display: none;
/* ------------------------------ */
/* Landing page : larger displays */
/* ------------------------------ */
@media screen and (min-width: 600px) {
body.home {
background-image: url('../img/background-chalkboard-green.jpg');
background-repeat: no-repeat;
-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')";
overflow: visible;
}
body.home .navbar .navbar-inner {
background-image: url('../img/spacedimg.jpg');
background-repeat: no-repeat;
background-position: top center;
-webkit-background-size: cover;
-moz-background-size: cover;
-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')";
}
body.home .navbar .navbar-inner > .container {
background-image: url('../img/home_drawing.png');
background-position: top center;
background-repeat: no-repeat;
}
body.home .container {
width: 960px;
}
body.home .navbar-static-top .container {
width: inherit;
@ -646,7 +807,6 @@ body.home .secondary .upper > .pull-right {
width: 340px;
padding-top: 55px;
position: relative;
left: -7px;
}
body.home .secondary .upper > .pull-right li:nth-child(even) {
margin: 12px;
@ -742,17 +902,54 @@ body.home #cl_i_vid {
height: 25px;
text-indent: -9000px;
}
.filter {
color: #EEE;
}
.filter select {
margin-right: 10px;
width: 115px;
vertical-align: baseline;
/* ------------------------------ */
/* Landing page : mobile -------- */
/* ------------------------------ */
@media only screen and (min-width: 320px) and (max-width: 599px) {
body.home {
background-image: url('../img/chalkboard_bg.jpg');
}
.filter input {
vertical-align: baseline;
body.home .navbar {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
body.home .navbar div.navbar-inner {
padding-top: 0px;
background-image: none;
background: none;
border: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
body.home .navbar .nav-wrap ul.nav li {
display: block;
}
body.home .navbar .nav-wrap ul.nav li a {
padding: 10px 15px 10px;
}
body.home .footer {
background-image: none;
box-shadow: none;
}
body.home .footer .upper {
padding-top: 70px;
padding-bottom: 20px;
}
body.home .footer .upper p,
body.home .footer .upper div {
display: none;
}
body.home .footer .upper ul {
width: 90%;
display: block;
}
body.home .footer .upper ul li {
width: 32%;
}
body.home .footer .upper ul li a {
margin: 0 auto;
}
.filter .navbar-inner {
padding-left: 10px;
}

Двоичные данные
static/media/img/badge-default-320.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 6.6 KiB

Двоичные данные
static/media/img/banner314.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 17 KiB

Двоичные данные
static/media/img/csol_logo_320.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 20 KiB

Двоичные данные
static/media/img/csol_logo_480.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 35 KiB

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

@ -1,6 +1,12 @@
$(document).ready(function(){
var mob = 0;
if( /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent) ) mob = 1
$('.show-tooltip').tooltip();
if($('body.home').length != 0) {
var vidLink = $('<a href="#">watch video</a>').click(function(){
if($('#i_vid').length == 0) {
var bkgFade = $('<div id="bkg_fade" style="display:none;"></div>');
@ -23,6 +29,11 @@ $(document).ready(function(){
/*landing page menu rearrange*/
$('<p id="rahm">This summer Mayor Rahm Emanuel is challenging all Chicago youth to participate in the Summer of Learning. School stops for the summer, but learning never should.</p>').prependTo('.footer .upper');
$('<div id="bubbles"><span class="lt">join the conversation on <a href="#">Facebook</a>.</span><span class="rt">share stories</span></div>').appendTo('.footer .upper');
if(mob) {
vidLink = '<a href="http://www.youtube.com/v/6WwpwtYNsNk">watch video</a>';
}
$('li.claim').after($('<li class="video"></li>').append(vidLink));
$('li.log-in').before($('.about'));

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

@ -93,6 +93,7 @@ ol {
}
.navbar-inner {
background-image:url('../img/chalkboard_bg.jpg');
background-repeat:repeat;
}
form.navbar-inner {
padding:7px;
@ -170,6 +171,7 @@ nav.pagination {
-webkit-box-shadow:inset 0px 10px 20px 0px rgba(0, 0, 0, 0.25);
-moz-box-shadow:inset 0px 10px 20px 0px rgba(0, 0, 0, 0.25);
box-shadow:inset 0px 10px 20px 0px rgba(0, 0, 0, 0.25);
background-repeat:repeat;
a {
color: #fff;
}
@ -263,10 +265,121 @@ nav.pagination {
&.secondary {
position:relative;
color:#fff;
overflow:hidden;
}
}
/*mobile*/
@media only screen
and (min-width : 320px)
and (max-width : 599px) {
.container p, .container h1, .container h2, .footer .upper p {
width:inherit;
}
#main {
padding-top:15px;
}
.form-search label, .form-inline label, .form-search .btn-group, .form-inline .btn-group {
display:block;
}
.filter label {
display:none;
}
.navbar .nav-wrap,
.container,
.navbar-static-top .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container,
.navbar .brand {
width:95%;
margin:0 0 0 0;
padding:0 0 0 0;
margin-left:auto;
margin-right:auto;
}
.form-horizontal {
.control-label {
text-align:left;
float:none;
}
.controls {
margin-left:0px;
}
}
.span6 {
width:inherit;
}
/*mobile navbar*/
.navbar {
div.navbar-inner {
padding-left:0px;
padding-right:0px;
padding-top:10px;
padding-bottom:10px;
border:none;
}
.nav-wrap {
width:90%;
margin:0 auto;
ul.nav {
li {
display:block;
a {
padding: 5px 0;
}
}
li:nth-child(even),
& > .active > a,
& > .active > a:hover,
{
border-left:none;
border-right:none;
}
}
}
}
/*mobile footer*/
.footer {
.upper {
padding-top:15px;
p {
width:inherit;
background-image:none;
padding-left:0px;
}
ul.pull-right {
width:270px;
display:block;
float:none;
margin:0 auto;
li {
width:90px;
float:left;
a {
margin: 0 auto;
}
}
}
}
.lower {
border-top:none;
ul.pull-left {
display:none;
}
ul.pull-right {
float:none;
text-align:center;
li {
display:inline;
}
}
}
}
}
/*CSOL-site specific*/
.poster a,
.poster img {
display: block;
@ -594,43 +707,96 @@ input[type="password"].metered {
}
}
/*landing page specific*/
/* ------------------------------ */
/* Mobile : width > iphone ------ */
/* ------------------------------ */
@media only screen
and (min-width : 321px)
and (max-width : 940px ) {
.navbar .brand {
background-image: url('../img/csol_logo_480.png');
height:166px;
}
}
/* ------------------------------ */
/* Mobile : width <= iphone ----- */
/* ------------------------------ */
@media only screen
and (max-width : 320px) {
.navbar .brand {
background-image: url('../img/csol_logo_320.png');
height:116px;
}
}
/* ------------------------------ */
/* CSOL-site SPECIFIC ----------- */
/* ------------------------------ */
/* ------------------------------ */
/* Mobile : width <= iphone ---- */
/* ------------------------------ */
@media only screen
and (max-width : 320px) {
.span3 {
width:150px;
}
ul.thumbnails li figure.thumbnail > a img {
width:140px;
}
ul.thumbnails {
li {
figure.thumbnail {
margin:0 0 0 0;
& > a img {
display:block;
width:140px;
height:140px;
background-image:url('../img/badge-default-320.png');
}
}
}
li:nth-child(2n+2) {
figure.thumbnail {
& > a img {
background-position:0 -140px;
}
}
}
li:nth-child(3n+3) {
figure.thumbnail {
& > a img {
background-position:-140px 0px;
}
}
}
li:nth-child(4n+4) {
figure.thumbnail {
& > a img {
background-position:-140px -140px;
}
}
}
}
}
/* ------------------------------ */
/* Landing page ---------------- */
/* ------------------------------ */
body.home {
background-image:url('../img/background-chalkboard-green.jpg');
background-repeat:no-repeat;
-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')";
overflow:visible;
.container {
width:960px;
#main {
padding:0 0 0 0;
display:none;
}
.navbar {
-webkit-box-shadow:0px 10px 20px 0px rgba(0, 0, 0, 0.25);
-moz-box-shadow:0px 10px 20px 0px rgba(0, 0, 0, 0.25);
box-shadow:0px 10px 20px 0px rgba(0, 0, 0, 0.25);
.navbar-inner {
background-image:url('../img/spacedimg.jpg');
background-repeat:no-repeat;
background-position:top center;
-webkit-background-size:cover;
-moz-background-size:cover;
-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')";
overflow:visible;
max-height:515px;
& > .container {
background-image:url('../img/home_drawing.png');
background-position:top center;
background-repeat:no-repeat;
}
}
.nav {
& > li {
@ -643,7 +809,7 @@ body.home {
background-image:url('../img/csol_logo_sm.png');
position:absolute;
left:50%;
margin-left:-102px;
margin-left:-93px;
z-index:2;
top:50px;
width:189px;
@ -654,10 +820,10 @@ body.home {
width:inherit;
margin-bottom:0px;
height:600px;
width:310px;
width:314px;
margin:0 auto;
background:none;
background-image:url('../img/banner300.png');
background-image:url('../img/banner314.png');
background-position:top center;
background-repeat:no-repeat;
position:relative;
@ -665,7 +831,6 @@ body.home {
box-shadow:none;
ul.nav {
padding-top:200px;
left:-6px;
& > li {
text-align:left;
display:block;
@ -726,10 +891,43 @@ body.home {
}
}
}
#main {
padding:0 0 0 0;
display:none;
}
/* ------------------------------ */
/* Landing page : larger displays */
/* ------------------------------ */
@media screen and (min-width: 600px) {
body.home {
.navbar {
.navbar-inner {
background-image:url('../img/spacedimg.jpg');
background-repeat:no-repeat;
background-position:top center;
-webkit-background-size:cover;
-moz-background-size:cover;
-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')";
& > .container {
background-image:url('../img/home_drawing.png');
background-position:top center;
background-repeat:no-repeat;
}
}
}
background-image:url('../img/background-chalkboard-green.jpg');
background-repeat:no-repeat;
-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')";
overflow:visible;
.container {
width:960px;
}
.navbar-static-top {
.container {
@ -749,7 +947,6 @@ body.home {
width:340px;
padding-top:55px;
position:relative;
left:-7px;
li:nth-child(even){
margin:12px;
}
@ -850,21 +1047,61 @@ body.home {
text-indent:-9000px;
}
}
.filter {
color: #EEE;
select {
margin-right: 10px;
width: 115px;
vertical-align: baseline;
}
input {
vertical-align: baseline;
/* ------------------------------ */
/* Landing page : mobile -------- */
/* ------------------------------ */
@media only screen
and (min-width : 320px)
and (max-width : 599px) {
body.home {
background-image:url('../img/chalkboard_bg.jpg');
.navbar {
-webkit-box-shadow:none;
-moz-box-shadow:none;
box-shadow:none;
div.navbar-inner {
padding-top:0px;
background-image:none;
background:none;
border:none;
-webkit-box-shadow:none;
-moz-box-shadow:none;
box-shadow:none;
}
.nav-wrap {
ul.nav {
li {
display:block;
a {
padding: 10px 15px 10px;
}
}
}
}
}
.footer {
background-image:none;
box-shadow:none;
.upper {
padding-top:70px;
padding-bottom:20px;
p, div {
display:none;
}
ul {
width:90%;
display:block;
li {
width:32%;
a {
margin: 0 auto;
}
}
}
}
.navbar-inner {
padding-left: 10px;
}
}
}