Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 4e6b596

Browse files
ajeftsajefts
authored
Merge pull request #1134 from appirio-tech/dev
Remove april banner and font fixes for listings
2 parents 01e24d5 + 10187f1 commit 4e6b596

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+8126
-0
lines changed

‎app/fontTest/fontTest.jade‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
h1 Fonts Test
2+
p This is a simple showcase of the fonts included into this repo,
3+
| and a test of their proper packing into the bundle.
4+
.roboto-thin
5+
h3 Roboto Thin
6+
| Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas
7+
| semper consectetur dui, nec scelerisque lectus hendrerit a. Curabitur
8+
| eget imperdiet orci. Sed non tincidunt turpis, laoreet fringilla nisl.
9+
| Suspendisse tincidunt ligula arcu, nec hendrerit erat ultricies et. Nam
10+
| elit nisl, pharetra in leo a, posuere facilisis lacus. Vivamus mollis
11+
| est ac justo pulvinar iaculis sed ac ex. Cras et maximus enim, eget
12+
| posuere ante. Cras in viverra quam. Sed lacinia rutrum semper. Praesent
13+
| mollis turpis elit, vel feugiat nisl sollicitudin nec. Cras ex quam,
14+
| facilisis eu placerat ac, vehicula a nulla. Vivamus et tellus in est
15+
| hendrerit rhoncus et a leo. Donec dui lorem, laoreet nec malesuada sed,
16+
| dictum ut elit. Nullam pretium augue vel odio ultrices, ut commodo
17+
| lacus imperdiet. Integer maximus imperdiet odio, non dignissim lorem
18+
| sollicitudin nec. Sed sed cursus metus.
19+
.roboto-thin-italic
20+
h3 Roboto Thin Italic
21+
| Praesent quam arcu, ultricies et dolor sed, interdum gravida nibh.
22+
| Proin scelerisque porttitor nibh, nec finibus nibh interdum sit amet.
23+
| Duis luctus sapien nec velit sollicitudin convallis. Ut eget neque vel
24+
| nibh lacinia commodo. In ut lorem id quam molestie blandit. Integer in
25+
| nunc cursus, suscipit sem id, accumsan mi. Sed luctus, quam sit amet
26+
| fringilla feugiat, nisl lacus pretium nunc, et elementum est odio et
27+
| risus. Praesent quis cursus urna. Ut orci elit, rutrum id accumsan
28+
| luctus, cursus sed dui. Phasellus lorem urna, mattis et mauris sit amet,
29+
| tristique hendrerit sapien.
30+
.roboto-light
31+
h3 Roboto Light
32+
| Sed nec dolor blandit, commodo arcu in, tincidunt nulla. In in odio id
33+
| arcu luctus aliquet non in mi. Ut efficitur, lorem eget mollis tempus,
34+
| ligula purus varius massa, a malesuada diam urna placerat leo. Sed quis
35+
| diam ullamcorper, fringilla augue sed, hendrerit felis. Sed eget felis
36+
| ac nulla feugiat gravida. Donec a sem lobortis, pulvinar nibh eu,
37+
| convallis magna. Suspendisse tempus tincidunt dolor, id blandit est
38+
| lacinia eu. Nam fermentum, sapien at dictum consectetur, felis neque
39+
| mollis libero, at auctor nunc nunc eu tellus. Maecenas ultrices at
40+
| neque eget tincidunt. Nullam vel consequat nunc, eget efficitur quam.
41+
| Nam nec elit vitae metus cursus eleifend semper aliquet diam.
42+
.roboto-light-italic
43+
h3 Roboto Light Italic
44+
| Nulla suscipit dui et placerat vulputate. Nunc et tempus neque, eget
45+
| elementum elit. Integer vitae dignissim tellus, et venenatis nulla.
46+
| Vivamus non lacus et ipsum imperdiet interdum tempus ullamcorper leo.
47+
| Phasellus tempus magna imperdiet sagittis viverra. Curabitur varius
48+
| elementum auctor. Nullam quam nisl, vestibulum et magna pharetra,
49+
| vestibulum placerat leo. Aliquam faucibus maximus urna, sed mattis ex
50+
| pretium in. Nam eu enim vitae massa vestibulum iaculis. Quisque nec
51+
| risus varius, eleifend urna non, ornare est. Curabitur gravida tempus
52+
| eros, posuere pellentesque magna euismod sed. Donec sed justo ut dolor
53+
| accumsan gravida vitae nec neque. Proin ac tellus dui. Integer ac
54+
| euismod massa.
55+
.roboto-regular
56+
h3 Roboto Regular
57+
| Morbi a urna maximus, imperdiet ante id, rutrum sem. Nunc fermentum
58+
| ante sodales convallis placerat. Donec eleifend, metus eget congue
59+
| semper, lorem nibh vehicula velit, eu sollicitudin mi orci eget purus.
60+
| Pellentesque accumsan fermentum arcu et hendrerit. Donec non porta
61+
| purus. Vivamus eu venenatis sapien. Nullam et mi at eros finibus
62+
| ultrices eget sit amet est. Curabitur non diam ornare est dapibus
63+
| tempor a ut turpis. Nulla ut nibh metus. Vivamus hendrerit turpis nisl,
64+
| eget fermentum nulla egestas quis.
65+
.roboto-regular-italic
66+
h3 Roboto Regular Italic
67+
| Nam vel ligula in ipsum condimentum sodales. Praesent id lorem tortor.
68+
| In vel condimentum leo, nec rhoncus elit. Sed accumsan metus vitae diam
69+
| ultricies, eu vestibulum metus pretium. Nullam congue, purus a tempor
70+
| venenatis, leo dui blandit nibh, nec fermentum ante eros ac ipsum.
71+
| Maecenas id neque ligula. Ut vitae faucibus lectus, vel tempus ipsum.
72+
| Donec ut erat lobortis, vestibulum enim vel, scelerisque turpis.
73+
| Aliquam ornare velit at elementum euismod.
74+
.roboto-medium
75+
h3 Roboto Medium
76+
| Ut laoreet rhoncus vulputate. Quisque elementum quam justo, ac eleifend
77+
| mauris viverra eget. Nunc sit amet commodo est. Nullam scelerisque elit
78+
| ac porttitor finibus. Sed laoreet urna non enim molestie, iaculis
79+
| suscipit felis commodo. Vestibulum gravida ante porttitor urna
80+
| hendrerit, quis dapibus sem viverra. Praesent consectetur risus ac
81+
| finibus varius. Ut commodo felis vel laoreet ornare. Donec imperdiet
82+
| sagittis efficitur. Nunc in dui id ligula blandit vehicula a id leo. In
83+
| pulvinar felis eget tortor pretium pulvinar. Integer a mi a justo
84+
| sagittis finibus ac eget nisl. In eu dictum lectus, eu accumsan purus.
85+
.roboto-medium-italic
86+
h3 Roboto Medium Italic
87+
| Class aptent taciti sociosqu ad litora torquent per conubia nostra, per
88+
| inceptos himenaeos. Vestibulum eget eros malesuada lacus porta
89+
| scelerisque. Integer in dolor et metus dictum faucibus sit amet a
90+
| mauris. Vivamus eget volutpat nulla, non posuere sapien. Vivamus mattis
91+
| vehicula justo eu faucibus. Nunc eleifend mollis ultricies. Integer
92+
| elementum ipsum eu nisi sodales, eget ornare quam posuere. Maecenas sit
93+
| amet sem mattis, porttitor neque ut, molestie velit.
94+
.roboto-bold
95+
h3 Roboto Bold
96+
| Nulla quis cursus orci. Mauris metus enim, volutpat id diam ac,
97+
| fermentum dapibus augue. Donec mi elit, volutpat eget rutrum non,
98+
| lobortis ac enim. In tempus iaculis turpis, vitae facilisis quam
99+
| vehicula eget. Ut blandit, elit at porta vulputate, orci ipsum
100+
| fermentum nunc, non dignissim lectus metus a velit. In hac habitasse
101+
| platea dictumst. Mauris tincidunt, sem quis interdum ullamcorper, erat
102+
| velit interdum lacus, eu tincidunt eros lacus vitae libero.
103+
.roboto-bold-italic
104+
h3 Roboto Bold Italic
105+
| Donec luctus ligula id augue blandit porta. Orci varius natoque
106+
| penatibus et magnis dis parturient montes, nascetur ridiculus mus. Cras
107+
| sem eros, iaculis pulvinar gravida vitae, interdum eu lacus. Praesent
108+
| rutrum sem a dolor viverra aliquet. Vestibulum dictum tempus fringilla.
109+
| Pellentesque eu eros elit. Integer fringilla ipsum sed hendrerit
110+
| rhoncus.
111+
.roboto-black
112+
h3 Roboto Black
113+
| In varius nibh elit. Nam nec pretium erat. Duis euismod mi vel massa
114+
| scelerisque, ut tincidunt urna viverra. Praesent vel libero eros. Etiam
115+
| a accumsan nulla. Nulla consequat venenatis risus quis accumsan. Etiam
116+
| placerat pretium faucibus. Proin consequat in ante hendrerit lobortis.
117+
| Interdum et malesuada fames ac ante ipsum primis in faucibus. Ut eget
118+
| est tempus, aliquam enim quis, pellentesque erat. Nulla dapibus diam
119+
| interdum vehicula dignissim. Donec orci velit, varius sed nisi semper,
120+
| lobortis bibendum neque.
121+
.roboto-black-italic
122+
h3 Roboto Black Italic
123+
| Proin felis velit, suscipit sit amet consequat id, consectetur et
124+
| lectus. Donec porttitor sollicitudin lorem sed laoreet. Fusce rhoncus
125+
| mi id nulla cursus mollis. Sed scelerisque et sem id eleifend. Maecenas
126+
| quis nisi non diam tempor mattis at ut tortor. Ut auctor est odio, id
127+
| scelerisque massa facilisis in. Suspendisse sollicitudin rutrum porta.
128+
| Sed at purus eget lacus finibus sagittis. Sed nulla ligula, sagittis
129+
| quis ipsum vel, finibus feugiat eros. Fusce non enim a lectus imperdiet
130+
| auctor. Aliquam mattis molestie ante vel dignissim. Orci varius natoque
131+
| penatibus et magnis dis parturient montes, nascetur ridiculus mus.

‎app/fontTest/fontTest.module.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import angular from 'angular'
2+
3+
(function() {
4+
'use strict'
5+
6+
var dependencies = [
7+
'angular-jwt',
8+
'ui.router',
9+
'ngCookies',
10+
'tc.services',
11+
'tcUIComponents',
12+
'angularSlideables',
13+
'ngDialog',
14+
'react'
15+
]
16+
17+
angular.module('tc.fontTest', dependencies)
18+
19+
})()

‎app/fontTest/fontTest.routes.js‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
import angular from 'angular'
2+
3+
(function() {
4+
'use strict'
5+
6+
angular.module('tc.fontTest').config([
7+
'$stateProvider',
8+
routes
9+
]).run(['$rootScope', '$state', function($rootScope, $state) {
10+
$rootScope.$on('$stateChangeError', function(event, toState, toParams, fromState, fromParams, error) {
11+
// if (toState.name.indexOf('sloog') > -1 && 400 <= error.status <= 500 ) {
12+
//
13+
// // unable to find a member with that username
14+
// $state.go('404')
15+
// }
16+
})
17+
$rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams, error) {
18+
if (toState.name !== 'font-test') {
19+
// remove usersnap widget if not in listings page
20+
var usersnapWidget = document.querySelectorAll('div[id*="_report_button"]')
21+
if (usersnapWidget && usersnapWidget[0]) usersnapWidget[0].remove()
22+
}
23+
})
24+
}])
25+
26+
function routes($stateProvider) {
27+
var states = {
28+
'font-test': {
29+
parent: 'root',
30+
url: '/font-test/',
31+
resolve: {
32+
userHandle: ['$stateParams', function($stateParams) {
33+
return $stateParams.userHandle
34+
}]
35+
},
36+
data: {
37+
authRequired: false,
38+
title: 'Font Test'
39+
},
40+
views: {
41+
'container@': {
42+
template: require('./fontTest')()
43+
}
44+
}
45+
}
46+
}
47+
48+
for (var name in states) {
49+
var state = states[name]
50+
$stateProvider.state(name, state)
51+
}
52+
}
53+
})()

‎app/topcoder.module.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { getCurrentUser, loadUser } from './services/userv3.service.js'
1111
'tc.peer-review',
1212
'tc.myDashboard',
1313
'tc.listings',
14+
'tc.fontTest',
1415
'tc.mySRMs',
1516
'tc.myChallenges',
1617
'tc.profile',

‎assets/css/_font-test.scss‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
@import 'fonts';
2+
3+
.roboto-thin {
4+
h3 {
5+
font-weight: bold;
6+
margin: 24px 0 12px;
7+
}
8+
font-family: 'Roboto', Helvetica, Arial, sans-serif;
9+
font-weight: 100;
10+
}
11+
12+
.roboto-thin-italic {
13+
h3 {
14+
font-weight: bold;
15+
margin: 24px 0 12px;
16+
}
17+
font-family: 'Roboto', Helvetica, Arial, sans-serif;
18+
font-weight: 100;
19+
font-style: italic;
20+
}
21+
22+
.roboto-light {
23+
h3 {
24+
font-weight: bold;
25+
margin: 24px 0 12px;
26+
}
27+
font-family: 'Roboto', Helvetica, Arial, sans-serif;
28+
font-weight: 300;
29+
}
30+
31+
.roboto-light-italic {
32+
h3 {
33+
font-weight: bold;
34+
margin: 24px 0 12px;
35+
}
36+
font-family: 'Roboto', Helvetica, Arial, sans-serif;
37+
font-style: italic;
38+
font-weight: 300;
39+
}
40+
41+
.roboto-regular {
42+
h3 {
43+
font-weight: bold;
44+
margin: 24px 0 12px;
45+
}
46+
font-family: 'Roboto', Helvetica, Arial, sans-serif;
47+
font-weight: 400;
48+
}
49+
50+
.roboto-regular-italic {
51+
h3 {
52+
font-weight: bold;
53+
margin: 24px 0 12px;
54+
}
55+
font-family: 'Roboto', Helvetica, Arial, sans-serif;
56+
font-style: italic;
57+
font-weight: 400;
58+
}
59+
60+
.roboto-medium {
61+
h3 {
62+
font-weight: bold;
63+
margin: 24px 0 12px;
64+
}
65+
font-family: 'Roboto', Helvetica, Arial, sans-serif;
66+
font-weight: 500;
67+
}
68+
69+
.roboto-medium-italic {
70+
h3 {
71+
font-weight: bold;
72+
margin: 24px 0 12px;
73+
}
74+
font-family: 'Roboto', Helvetica, Arial, sans-serif;
75+
font-style: italic;
76+
font-weight: 500;
77+
}
78+
79+
.roboto-bold {
80+
h3 {
81+
font-weight: bold;
82+
margin: 24px 0 12px;
83+
}
84+
font-family: 'Roboto', Helvetica, Arial, sans-serif;
85+
font-weight: 700;
86+
}
87+
88+
.roboto-bold-italic {
89+
h3 {
90+
font-weight: bold;
91+
margin: 24px 0 12px;
92+
}
93+
font-family: 'Roboto', Helvetica, Arial, sans-serif;
94+
font-style: italic;
95+
font-weight: 700;
96+
}
97+
98+
.roboto-black {
99+
h3 {
100+
font-weight: bold;
101+
margin: 24px 0 12px;
102+
}
103+
font-family: 'Roboto', Helvetica, Arial, sans-serif;
104+
font-weight: 900;
105+
}
106+
107+
.roboto-black-italic {
108+
h3 {
109+
font-weight: bold;
110+
margin: 24px 0 12px;
111+
}
112+
font-family: 'Roboto', Helvetica, Arial, sans-serif;
113+
font-style: italic;
114+
font-weight: 900;
115+
}

‎assets/css/_fonts.scss‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// FONT STACK
2+
// --------------------------------------------------------------------------------------------
3+
// Use the mixin to include fonts.
4+
5+
@mixin font-family($font-name, $font-weight, $font-style, $font-url, $font-file) {
6+
@font-face {
7+
font-family: '#{$font-name}';
8+
src: url('#{$font-url}#{$font-file}.eot');
9+
src: url('#{$font-url}#{$font-file}.eot?#iefix') format('embedded-opentype'), url('#{$font-url}#{$font-file}.woff') format('woff'), url('#{$font-url}#{$font-file}.ttf') format('truetype'), url('#{$font-url}#{$font-file}.svg##{$font-name}') format('svg');
10+
font-weight: $font-weight;
11+
font-style: $font-style;
12+
}
13+
}
14+
15+
// FONT WEIGHTS
16+
// --------------------------------------------------------------------------------------------
17+
// Use the numerical value instead of the weight name.
18+
19+
// 100 Thin (Hairline)
20+
// 200 Extra Light (Ultra Light)
21+
// 300 Light
22+
// 400 Normal
23+
// 500 Medium
24+
// 600 Semi Bold (Demi Bold)
25+
// 700 Bold
26+
// 800 Extra Bold (Ultra Bold)
27+
// 900 Black (Heavy)
28+
29+
// Roboto
30+
@include font-family('Roboto', 900, normal, '../fonts/roboto/', 'roboto-black');
31+
@include font-family('Roboto', 900, italic, '../fonts/roboto/', 'roboto-blackitalic');
32+
@include font-family('Roboto', 700, normal, '../fonts/roboto/', 'roboto-bold');
33+
@include font-family('Roboto', 700, italic, '../fonts/roboto/', 'roboto-bolditalic');
34+
@include font-family('Roboto', 500, normal, '../fonts/roboto/', 'roboto-medium');
35+
@include font-family('Roboto', 500, italic, '../fonts/roboto/', 'roboto-mediumitalic');
36+
@include font-family('Roboto', 400, normal, '../fonts/roboto/', 'roboto-regular');
37+
@include font-family('Roboto', 400, italic, '../fonts/roboto/', 'roboto-italic');
38+
@include font-family('Roboto', 300, normal, '../fonts/roboto/', 'roboto-light');
39+
@include font-family('Roboto', 300, italic, '../fonts/roboto/', 'roboto-lightitalic');
40+
@include font-family('Roboto', 100, normal, '../fonts/roboto/', 'roboto-thin');
41+
@include font-family('Roboto', 100, italic, '../fonts/roboto/', 'roboto-thinitalic');

‎assets/css/topcoder.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
@import 'topcoder/tc-styles';
2+
@import 'fonts';
3+
@import 'font-test';
24
@include glyphicons-halflings;
35

46
@font-face {

0 commit comments

Comments
 (0)