Skip to content
This repository has been archived by the owner on May 26, 2022. It is now read-only.

Commit

Permalink
Merge pull request #65 from stephaniehobson/Listings
Browse files Browse the repository at this point in the history
Bug 913686: Listings
  • Loading branch information
craigcook committed Oct 22, 2013
2 parents 0eae100 + 79fc3d1 commit e1fb886
Show file tree
Hide file tree
Showing 25 changed files with 798 additions and 94 deletions.
4 changes: 4 additions & 0 deletions bin/update/deploy.py
Expand Up @@ -35,6 +35,10 @@ def update_info(ctx):
ctx.local('git log -3')
ctx.local('git status')
ctx.local('git submodule status')
with ctx.lcd('locale'):
ctx.local('svn info')
ctx.local('svn status')

ctx.local('git rev-parse HEAD > static/revision')


Expand Down
25 changes: 16 additions & 9 deletions careers/base/static/css/base.css
Expand Up @@ -160,7 +160,7 @@ a:hover,
a:focus,
a:active {
color: #0073aa;
text-decoration: underline;
text-decoration: none;
}

figure {
Expand Down Expand Up @@ -317,7 +317,6 @@ figure {
.nav-main a:focus,
.nav-main nav a:active {
color: #0096dd;
text-decoration: none;
}

@media (max-width: 680px) {
Expand Down Expand Up @@ -418,7 +417,6 @@ figure {
padding: 15px 20px 12px 20px;
color: #fff;
font-size: 14px;
text-decoration: none;
text-transform: uppercase;
}

Expand Down Expand Up @@ -524,21 +522,21 @@ figure {
text-align: center;
}

a.cta:link,
a.cta:visited {
.cta,
.cta:link,
.cta:visited {
box-shadow: inset 0 0 1px 0 rgba(0, 0, 0, 0.3);
border-top: 1px solid #44a5e1;
border-bottom: 1px solid #257cc0;
background-color: #338fd1;
background: -webkit-linear-gradient(#44a5e1, #257cc0);
background: linear-gradient(#44a5e1, #257cc0);
color: #fff;
text-decoration: none;
}

a.cta:hover,
a.cta:focus,
a.cta:active {
.cta:hover,
.cta:focus,
.cta:active {
box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.3);
border-top: 1px solid #3799d8;
border-bottom: 1px solid #0d55bd;
Expand Down Expand Up @@ -583,6 +581,14 @@ a.cta:active {
margin: 10px 0;
}

.listings-done .cta {
width: 100%;
border-radius: 0;
border: 0;
padding: 11px;
font-size: 13px;
}

@media (min-width: 681px) {
.cta {
min-width: 175px;
Expand Down Expand Up @@ -696,6 +702,7 @@ a.cta:active {
border: 0;
background: transparent;
cursor: pointer;
font-size: 0;
}

.carousel-button-next {
Expand Down
52 changes: 38 additions & 14 deletions careers/base/static/fonts/icomoon/icomoon.dev.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified careers/base/static/fonts/icomoon/icomoon.eot
Binary file not shown.
48 changes: 36 additions & 12 deletions careers/base/static/fonts/icomoon/icomoon.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified careers/base/static/fonts/icomoon/icomoon.ttf
Binary file not shown.
Binary file modified careers/base/static/fonts/icomoon/icomoon.woff
Binary file not shown.
2 changes: 1 addition & 1 deletion careers/careers/forms.py
Expand Up @@ -5,7 +5,7 @@

class PositionFilterForm(forms.Form):
team = forms.ModelChoiceField(queryset=Category.objects.order_by('name'),
empty_label='All Positions',
empty_label='All Teams',
widget=forms.Select(attrs={'autocomplete': 'off'}))
position_type = forms.ChoiceField(choices=(
('', 'All Positions'),
Expand Down
1 change: 0 additions & 1 deletion careers/careers/static/css/careers.css
Expand Up @@ -788,7 +788,6 @@
.community-box a:focus,
.community-box a:active {
color: #4bbde6;
text-decoration: none;
}

.community-modal {
Expand Down
24 changes: 24 additions & 0 deletions careers/careers/static/css/listings-ie8.css
@@ -0,0 +1,24 @@
#listings-intro {
height: 298px;
background-image: url(/static/img/listings-banner-920.jpg);
}

.listings-head {
float:left;
}

#listings-filters {
float: right;
text-align: right;
}

.listings-filters-head,
.listings-filter label {
display: none;
}

.listings-filter {
display: inline-block;
margin-bottom: 20px;
padding-left: 20px;
}

0 comments on commit e1fb886

Please sign in to comment.