Skip to content

Commit e979d48

Browse files
committed
Bug 1109318 Privacy Day landing page for 2015
1 parent ed05921 commit e979d48

21 files changed

+1205
-268
lines changed

bedrock/privacy/templates/privacy/privacy-day.html

Lines changed: 269 additions & 101 deletions
Large diffs are not rendered by default.

bedrock/privacy/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
urlpatterns = patterns('',
1111
url(r'^/$', views.privacy, name='privacy'),
12-
page('/you', 'privacy/privacy-day.html'),
12+
page('/tips', 'privacy/privacy-day.html'),
1313
page('/principles', 'privacy/principles.html'),
1414
url(r'^/firefox/$', views.firefox_notices, name='privacy.notices.firefox'),
1515
url(r'^/firefox-os/$', views.firefox_os_notices, name='privacy.notices.firefox-os'),

bedrock/redirects/urls.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ def tabzilla_css_redirect(r):
7777
# Bug 815527 /m/privacy.html -> /privacy/firefox/
7878
redirect(r'^m/privacy.html$', 'privacy.notices.firefox'),
7979

80+
# Bug 1109318 /privacy/you -> privacy/tips/
81+
redirect(r'^privacy/you/$',
82+
'privacy.privacy-day'),
83+
8084
# Bug 821047 /about/mission.html -> /mission/
8185
redirect(r'^about/mission.html$', '/mission/'),
8286

bedrock/settings/base.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,8 @@ def JINJA_CONFIG():
513513
'css/privacy/privacy.less',
514514
),
515515
'privacy-day': (
516+
'css/sandstone/sandstone-resp.less',
517+
'css/base/mozilla-share-cta.less',
516518
'css/privacy/privacy-day.less',
517519
),
518520
'fb_privacy': (
@@ -956,6 +958,10 @@ def JINJA_CONFIG():
956958
'js/privacy/privacy.js',
957959
),
958960
'privacy-day': (
961+
'js/base/mozilla-pager.js',
962+
'js/base/mozilla-share-cta.js',
963+
'js/libs/jquery.waypoints.min.js',
964+
'js/libs/jquery.waypoints-sticky.min.js',
959965
'js/privacy/privacy-day.js',
960966
),
961967
'products': (

media/css/mozorg/contribute/contribute-2015.less

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
}
1515

1616
// Some common colors
17-
@mozillared: #c13832;
1817
@lightbeige: #fcf9f4;
1918
@darkbeige: #d7d3c8;
2019
@green: #7abf88;
@@ -242,7 +241,7 @@ textarea:focus {
242241
.page-title {
243242
.font-size(72px);
244243
text-align: center;
245-
color: @mozillared;
244+
color: @mozillaRed;
246245
}
247246

248247
.head-stats {
@@ -293,11 +292,11 @@ textarea:focus {
293292
position: absolute;
294293
top: 0;
295294
z-index: 1;
296-
background: @mozillared;
295+
background: @mozillaRed;
297296
padding: 40px 0 10px;
298297
width: 100%;
299298
min-height: 40px;
300-
border-bottom: 1px solid darken(@mozillared, 5%);
299+
border-bottom: 1px solid darken(@mozillaRed, 5%);
301300
.section-dark;
302301
.clearfix;
303302
}
@@ -338,7 +337,7 @@ textarea:focus {
338337
&:hover,
339338
&:focus,
340339
&:active {
341-
background-color: lighten(@mozillared, 10%);
340+
background-color: lighten(@mozillaRed, 10%);
342341
background-color: rgba(255, 255, 255, .1);
343342
color: #fff;
344343
text-decoration: none;
@@ -352,7 +351,7 @@ textarea:focus {
352351
.button-flat;
353352
border-radius: 6px;
354353
margin-top: 10px;
355-
background-color: darken(@mozillared, 10%);
354+
background-color: darken(@mozillaRed, 10%);
356355
bottom: 10px;
357356
left: 10px;
358357
width: auto;
@@ -375,7 +374,7 @@ textarea:focus {
375374
border-style: solid;
376375
border-width: 13px;
377376
border-color: transparent;
378-
border-top-color: @mozillared;
377+
border-top-color: @mozillaRed;
379378
content: '';
380379
height: 0;
381380
left: 50%;
@@ -627,7 +626,7 @@ textarea:focus {
627626
margin-left: -95px;
628627
width: 180px;
629628
height: 180px;
630-
border: 5px solid @mozillared;
629+
border: 5px solid @mozillaRed;
631630
border-radius: 100%;
632631
}
633632
}
@@ -699,7 +698,7 @@ textarea:focus {
699698
color: lighten(@textColorPrimary, 40%);
700699

701700
&:after {
702-
color: @mozillared;
701+
color: @mozillaRed;
703702
}
704703
}
705704

@@ -827,9 +826,9 @@ textarea:focus {
827826
height: 170px;
828827
text-align: center;
829828
display: block;
830-
border: 5px solid @mozillared;
829+
border: 5px solid @mozillaRed;
831830
border-radius: 100%;
832-
background: @mozillared;
831+
background: @mozillaRed;
833832
color: #fff;
834833
line-height: 1.1;
835834
position: relative;
@@ -864,7 +863,7 @@ textarea:focus {
864863
text-decoration: none;
865864

866865
.event-date {
867-
background: lighten(@mozillared, 5%);
866+
background: lighten(@mozillaRed, 5%);
868867
}
869868

870869
.event-title,
@@ -1092,7 +1091,7 @@ textarea:focus {
10921091
.errorlist {
10931092
margin: 0;
10941093
padding: .25em 0;
1095-
color: @mozillared;
1094+
color: @mozillaRed;
10961095

10971096
li {
10981097
width: auto;
@@ -1132,8 +1131,8 @@ textarea:focus {
11321131

11331132
&:before {
11341133
background-color: transparent;
1135-
border: 5px solid @mozillared;
1136-
color: @mozillared;
1134+
border: 5px solid @mozillaRed;
1135+
color: @mozillaRed;
11371136
cursor: pointer;
11381137
display: block;
11391138
font-family: 'Font Awesome';
@@ -1273,7 +1272,7 @@ textarea:focus {
12731272
left: -4px;
12741273
top: 0;
12751274
text-align: center;
1276-
color: @mozillared;
1275+
color: @mozillaRed;
12771276
}
12781277
}
12791278

@@ -1335,11 +1334,11 @@ textarea:focus {
13351334
}
13361335

13371336
#modal .window .inner header {
1338-
background-color: @mozillared;
1337+
background-color: @mozillaRed;
13391338
}
13401339

13411340
#modal-close .button {
1342-
background: darken(@mozillared, 10%);
1341+
background: darken(@mozillaRed, 10%);
13431342
box-shadow: none;
13441343
}
13451344

@@ -1417,7 +1416,7 @@ textarea:focus {
14171416
text-align: center;
14181417

14191418
.section-title {
1420-
color: @mozillared;
1419+
color: @mozillaRed;
14211420
margin: 0 0 .15em;
14221421
}
14231422

@@ -1476,7 +1475,7 @@ textarea:focus {
14761475
.mozillians-profile {
14771476
width: 450px;
14781477
height: 450px;
1479-
border: 5px solid @mozillared;
1478+
border: 5px solid @mozillaRed;
14801479
border-radius: 100%;
14811480
background: #fff url('/media/img/contribute/mozillians-profile.png') center center no-repeat;
14821481
float: left;
@@ -1643,7 +1642,7 @@ textarea:focus {
16431642
.story-intro .photo {
16441643
width: 220px;
16451644
height: 220px;
1646-
border: 8px solid @mozillared;
1645+
border: 8px solid @mozillaRed;
16471646
border-radius: 100%;
16481647
position: absolute;
16491648
left: 50%;
@@ -1752,7 +1751,7 @@ textarea:focus {
17521751

17531752
.name {
17541753
font-weight: bold;
1755-
color: @mozillared;
1754+
color: @mozillaRed;
17561755
}
17571756

17581757
.country {
@@ -2195,7 +2194,7 @@ textarea:focus {
21952194
#contribute-nav-menu {
21962195
display: none;
21972196
width: 160px;
2198-
background: @mozillared;
2197+
background: @mozillaRed;
21992198
padding: 0 5px 5px;
22002199
border-radius: 6px;
22012200
left: 0;

0 commit comments

Comments
 (0)