From 129cf4582a6f807077747c6eec2ed264609ada35 Mon Sep 17 00:00:00 2001 From: Thabo Date: Tue, 27 Oct 2015 16:54:30 -0700 Subject: [PATCH 1/4] footer from topcoder app --- src/css/base.css | 4 ++-- src/footer.html | 5 +++-- wp/wp-content/themes/tcs-responsive/footer.php | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/css/base.css b/src/css/base.css index 827b007a..79e7c71f 100644 --- a/src/css/base.css +++ b/src/css/base.css @@ -595,8 +595,8 @@ sub, sup { .social-links { margin-bottom: 3px; } .social-links a { - width: 20px; - height: 20px; + width: 26px; + height: 26px; margin-top: 13px; } .social-links .fb-link { background-image: url(@@cdn/i/ico-facebook_desktop.svg); } diff --git a/src/footer.html b/src/footer.html index 8aa3631b..0834283a 100644 --- a/src/footer.html +++ b/src/footer.html @@ -1,3 +1,4 @@ + diff --git a/wp/wp-content/themes/tcs-responsive/footer.php b/wp/wp-content/themes/tcs-responsive/footer.php index 13847621..9ed42e3d 100644 --- a/wp/wp-content/themes/tcs-responsive/footer.php +++ b/wp/wp-content/themes/tcs-responsive/footer.php @@ -31,9 +31,9 @@ - + From ef31f87791b4b7e76c06b96cff865ee75d666b8c Mon Sep 17 00:00:00 2001 From: Thabo Date: Tue, 27 Oct 2015 17:20:11 -0700 Subject: [PATCH 2/4] header style from topcoder app --- src/css/base.css | 93 +++++++++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 40 deletions(-) diff --git a/src/css/base.css b/src/css/base.css index 79e7c71f..aab0b77e 100644 --- a/src/css/base.css +++ b/src/css/base.css @@ -623,7 +623,7 @@ sub, sup { display: inline-block; width: 12px; height: 12px; - background: url(@@cdn/i/magnifying_glass.svg); + background: url("@@cdn/i/magnifying_glass.svg"); background-size: contain; border: none; outline: none; @@ -673,7 +673,7 @@ sub, sup { height: 19px; left: 13px; top: 14px; - background: url(@@cdn/i/logo_mobile.svg); + background: url("@@cdn/i/logo_mobile.svg"); background-size: contain; background-repeat: no-repeat; } @@ -686,16 +686,7 @@ sub, sup { text-decoration: none; } .btn-link { - color: #fff; - font-size: 12px; - line-height: 1.2em; - border-radius: 4px; - background-color: #00AEFf; - display: inline-block; - padding: 8px 20px; - text-decoration: none; } - .btn-link.secondary-link { - background-color: #d1d3d4; } + display: inline-block; } .user-link .user-avatar, .user-link .btn-join { vertical-align: middle; @@ -728,9 +719,10 @@ sub, sup { background-color: transparent; } .menu-item { - color: #fff; + color: #a3a3ae; font-size: 18px; - font-weight: bold; } + font-weight: 500; + font-family: 'Sofia Pro'; } .search-wrapper input { font-weight: bold; @@ -742,7 +734,11 @@ sub, sup { width: 100%; padding: 0 15px 0 37px; background: transparent; - outline: none; } + outline: none; + box-shadow: none; } + .search-wrapper input:focus { + outline: none; + box-shadow: none; } .search-wrapper ::-webkit-input-placeholder { color: #7f7f7f; } @@ -766,8 +762,10 @@ sub, sup { border-radius: 50%; } .user-menu .username { - padding-left: 10px; vertical-align: middle; } + .user-menu .username.underline { + padding-bottom: 12px; + border-bottom: 2px #0096FF solid; } .user-menu .menu-item-header { text-transform: none; } @@ -789,6 +787,11 @@ sub, sup { font-size: 14px; cursor: pointer; } +.menu-text { + color: #fff; } + .menu-text:hover { + color: #fff; } + @media only screen and (max-width: 1024px) { .header-wrapper.autocomplete .menu-item:not(.search-wrapper), .header-wrapper.autocomplete ~ .bottom-footer > *:not(.copyright-notice) { @@ -814,8 +817,8 @@ sub, sup { .menu-link { display: block; } .menu-link.active { - background-color: rgba(0, 150, 255, 0.2); - border-left: 5px solid #0096ff; + background-color: rgba(0, 150, 255, 0.35); + border-left: 5px solid #0096FF; color: #fff; margin: 0 -20px; padding-left: 15px; } @@ -863,6 +866,8 @@ sub, sup { height: 53px; padding: 0; font-weight: normal; } + .search-wrapper .submenu input:focus { + background-color: transparent; } .search-wrapper .submenu ::-webkit-input-placeholder { color: #d1d3d4; } .search-wrapper .submenu ::-moz-placeholder { @@ -872,30 +877,28 @@ sub, sup { color: #d1d3d4; } .top-header { height: 54px; - max-width: 1376px; margin: 0 auto; } .top-header .main-menu { - line-height: 54px; - } + line-height: 54px; } .top-header .menu-item .submenu { overflow: hidden; - max-height: 0px; - transition: all .25s ease-in-out; - } + max-height: 0px; + transition: all 0.25s ease-in-out; } .top-header .menu-item:hover .submenu { - max-height: 500px; - } + max-height: 500px; } .top-header .menu-item:not(:hover) .submenu:not(.expanded):not(:hover) { - padding: 0px 54px 0px 54px; - } + padding: 0px 54px 0px 54px; } .top-header .menu-link:hover { - background-color: #0096ff; } + background-color: #0096FF; + text-decoration: none; } .top-header .menu-link.active { - background-color: rgba(0, 150, 255, 0.1); } + background-color: rgba(0, 150, 255, 0.35); } + .top-header .menu-link.active:hover { + background-color: #0096ff; } .top-header .menu-item:not(.anonymous-menu):hover .menu-item-header { position: relative; cursor: pointer; - color: #0096ff; } + color: #0096FF; } .top-header .menu-item:not(.anonymous-menu):hover .menu-item-header:after { content: ''; display: block; @@ -909,8 +912,12 @@ sub, sup { left: 50%; margin-left: -6px; background-color: transparent; } + .top-header .menu-item:not(.anonymous-menu):hover .menu-item-header.hide:after { + display: none; } + .top-header .menu-item.search-wrapper:hover .menu-item-header:after { + margin-left: 6px; } .top-header .logo-link { - background: url(@@cdn/i/logo_topcoder.svg); + background: url("@@cdn/i/logo_topcoder.svg"); width: 156px; height: 54px; margin: 0; @@ -927,22 +934,24 @@ sub, sup { top: 100%; left: 0; right: 0; - background-color: rgba(61, 61, 61, 0.95); } + background: rgba(38, 38, 38, 0.95); } .top-header .suggestion-list { text-align: left; font-size: 16px; line-height: 32px; color: #bababa; } .top-header .link-group .menu-link { - width: 130px; - height: 122px; + max-width: 90px; + padding: 0 30px; + height: 123px; font-size: 12px; + font-weight: 300; line-height: 1.2em; } .top-header .link-group .menu-link img { display: block; - height: 44px; - width: 44px; - margin: 20px auto 10px auto; } + height: 36px; + width: 36px; + margin: 30px auto 10px auto; } .top-header .user-menu, .top-header .search-wrapper { float: right; color: #a3a3a3; @@ -973,8 +982,11 @@ sub, sup { vertical-align: bottom; } .link-group { display: inline-block; - color: #a3a3a3; - font-size: 16px; } + color: #A3A3AE; + font-size: 14px; + font-weight: 400; } + .link-group.selected { + box-shadow: inset 0 -4px 0px -1px #0096ff; } .search-wrapper .menu-item-header:before { content: ''; display: inline-block; @@ -1019,6 +1031,7 @@ sub, sup { .nav-category + .nav-category { margin-left: 80px; } } + /*! Qtip2 style */ .qtip { From 4be01dab6e5ee0ad99d8ff9f4f94e6efc95a3381 Mon Sep 17 00:00:00 2001 From: Thabo Date: Tue, 27 Oct 2015 17:28:30 -0700 Subject: [PATCH 3/4] move sofia pro to where all pages can access --- src/css/member-onboarding.css | 169 ---------------------------------- src/css/style.css | 168 +++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 169 deletions(-) diff --git a/src/css/member-onboarding.css b/src/css/member-onboarding.css index 62013a19..aec7ebde 100644 --- a/src/css/member-onboarding.css +++ b/src/css/member-onboarding.css @@ -1,172 +1,3 @@ -/* fonts */ -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-ultralight-webfont.eot'); - src: url('/mf/fonts/sofiapro-ultralight-webfont.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-ultralight-webfont.woff') format('woff'), - url('/mf/fonts/sofiapro-ultralight-webfont.ttf') format('truetype'), - url('/mf/fonts/sofiapro-ultralight-webfont.svg#sofia_pro_ultralight') format('svg'); - font-weight: 100; - font-style: normal; -} -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-ultralight-italic-webfont.eot'); - src: url('/mf/fonts/sofiapro-ultralight-italic-webfont.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-ultralight-italic-webfont.woff') format('woff'), - url('/mf/fonts/sofiapro-ultralight-italic-webfont.ttf') format('truetype'), - url('/mf/fonts/sofiapro-ultralight-italic-webfont.svg#sofia_pro_ultralightitalic') format('svg'); - font-weight: 100; - font-style: italic; -} - -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-extralight-webfont.eot'); - src: url('/mf/fonts/sofiapro-extralight-webfont.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-extralight-webfont.woff') format('woff'), - url('/mf/fonts/sofiapro-extralight-webfont.woff2') format('woff2'), - url('/mf/fonts/sofiapro-extralight-webfont.svg#sofia_pro_extralight') format('svg'); - font-weight: 200; - font-style: normal; -} -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-extralight-italic-webfont.eot'); - src: url('/mf/fonts/sofiapro-extralight-italic-webfont.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-extralight-italic-webfont.woff') format('woff'), - url('/mf/fonts/sofiapro-extralight-italic-webfont.woff2') format('woff2'), - url('/mf/fonts/sofiapro-extralight-italic-webfont.ttf') format('truetype'); - font-weight: 200; - font-style: italic; -} - -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-light-webfont.eot'); - src: url('/mf/fonts/sofiapro-light-webfont.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-light-webfont.woff') format('woff'), - url('/mf/fonts/sofiapro-light-webfont.woff2') format('woff2'), - url('/mf/fonts/sofiapro-light-webfont.svg#sofia_pro_light') format('svg'), - url('/mf/fonts/sofiapro-light-webfont.ttf') format('truetype'); - font-weight: 300; - font-style: normal; -} - -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-light-italic-webfont.eot'); - src: url('/mf/fonts/sofiapro-light-italic-webfont.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-light-italic-webfont.woff') format('woff'), - url('/mf/fonts/sofiapro-light-italic-webfont.ttf') format('truetype'), - url('/mf/fonts/sofiapro-light-italic-webfont.svg#sofia_pro_lightitalic') format('svg'); - font-weight: 300; - font-style: italic; -} - -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-regular-webfont.eot'); - src: url('/mf/fonts/sofiapro-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-regular-webfont.woff') format('woff'), - url('/mf/fonts/sofiapro-regular-webfont.woff2') format('woff2'), - url('/mf/fonts/sofiapro-regular-webfont.ttf') format('truetype'), - url('/mf/fonts/sofiapro-regular-webfont.svg#sofia_pro_regular') format('svg'); - font-weight: 400; - font-style: normal; -} - -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-medium-webfont.eot'); - src: url('/mf/fonts/sofiapro-medium-webfont.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-medium-italic.woff') format('woff'), - url('/mf/fonts/sofiapro-medium-italic.woff2') format('woff2'), - url('/mf/fonts/sofiapro-medium-webfont.svg#sofia_pro_medium') format('svg'), - url('/mf/fonts/sofiapro-medium-webfont.ttf') format('truetype'); - font-weight: 500; - font-style: normal; -} - -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-medium-italic.eot'); - src: url('/mf/fonts/sofiapro-medium-italic.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-medium-italic.woff') format('woff'), - url('/mf/fonts/sofiapro-medium-italic.ttf') format('truetype'), - url('/mf/fonts/sofiapro-medium-italic.svg#sofia_pro_mediumitalic') format('svg'); - font-weight: 500; - font-style: italic; -} - -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-semibold-webfont.eot'); - src: url('/mf/fonts/sofiapro-semibold-webfont.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-semibold-webfont.woff') format('woff'), - url('/mf/fonts/sofiapro-semibold-webfont.woff2') format('woff2'), - url('/mf/fonts/sofiapro-semibold-webfont.svg#sofia_pro_semibold') format('svg'), - url('/mf/fonts/sofiapro-semibold-webfont.ttf') format('truetype'); - font-weight: 600; - font-style: normal; -} - -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-semibold-italic-webfont.eot'); - src: url('/mf/fonts/sofiapro-semibold-italic-webfont.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-semibold-italic-webfont.woff') format('woff'), - url('/mf/fonts/sofiapro-semibold-italic-webfont.ttf') format('truetype'), - url('/mf/fonts/sofiapro-semibold-italic-webfont.svg#sofia_pro_semibolditalic') format('svg'); - font-weight: 600; - font-style: italic; -} - -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-bold-webfont.eot'); - src: url('/mf/fonts/sofiapro-bold-webfont.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-bold-webfont.woff') format('woff'), - url('/mf/fonts/sofiapro-bold-webfont.woff2') format('woff2'), - url('/mf/fonts/sofiapro-bold-webfont.svg#sofia_pro_bold') format('svg'), - url('/mf/fonts/sofiapro-bold-webfont.ttf') format('truetype'); - font-weight: 700; - font-style: normal; -} - -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-bold-italic-webfont.eot'); - src: url('/mf/fonts/sofiapro-bold-italic-webfont.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-bold-italic-webfont.woff') format('woff'), - url('/mf/fonts/sofiapro-bold-italic-webfont.ttf') format('truetype'), - url('/mf/fonts/sofiapro-bold-italic-webfont.svg#sofia_pro_bolditalic') format('svg'); - font-weight: 700; - font-style: italic; -} - -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-black-webfont.eot'); - src: url('/mf/fonts/sofiapro-black-webfont.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-black-webfont.woff') format('woff'), - url('/mf/fonts/sofiapro-black-webfont.woff2') format('woff2'), - url('/mf/fonts/sofiapro-black-webfont.svg#sofia_pro_black') format('svg'), - url('/mf/fonts/sofiapro-black-webfont.ttf') format('truetype'); - font-weight: 800; - font-style: normal; -} - -@font-face { - font-family: 'Sofia Pro'; - src: url('/mf/fonts/sofiapro-black-italic-webfont.eot'); - src: url('/mf/fonts/sofiapro-black-italic-webfont.eot?#iefix') format('embedded-opentype'), - url('/mf/fonts/sofiapro-black-italic-webfont.woff') format('woff'), - url('/mf/fonts/sofiapro-black-italic-webfont.woff2#sofia_pro_blackitalic') format('svg'); - font-weight: 800; - font-style: italic; -} - /* Member Onboarding Base */ /*#onboarding a:active, #onboarding a:focus, #onboarding a:hover, #onboarding a:link, diff --git a/src/css/style.css b/src/css/style.css index 14b1ce1a..d03b355b 100644 --- a/src/css/style.css +++ b/src/css/style.css @@ -1,4 +1,172 @@ /* fonts */ +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-ultralight-webfont.eot'); + src: url('/mf/fonts/sofiapro-ultralight-webfont.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-ultralight-webfont.woff') format('woff'), + url('/mf/fonts/sofiapro-ultralight-webfont.ttf') format('truetype'), + url('/mf/fonts/sofiapro-ultralight-webfont.svg#sofia_pro_ultralight') format('svg'); + font-weight: 100; + font-style: normal; +} +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-ultralight-italic-webfont.eot'); + src: url('/mf/fonts/sofiapro-ultralight-italic-webfont.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-ultralight-italic-webfont.woff') format('woff'), + url('/mf/fonts/sofiapro-ultralight-italic-webfont.ttf') format('truetype'), + url('/mf/fonts/sofiapro-ultralight-italic-webfont.svg#sofia_pro_ultralightitalic') format('svg'); + font-weight: 100; + font-style: italic; +} + +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-extralight-webfont.eot'); + src: url('/mf/fonts/sofiapro-extralight-webfont.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-extralight-webfont.woff') format('woff'), + url('/mf/fonts/sofiapro-extralight-webfont.woff2') format('woff2'), + url('/mf/fonts/sofiapro-extralight-webfont.svg#sofia_pro_extralight') format('svg'); + font-weight: 200; + font-style: normal; +} +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-extralight-italic-webfont.eot'); + src: url('/mf/fonts/sofiapro-extralight-italic-webfont.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-extralight-italic-webfont.woff') format('woff'), + url('/mf/fonts/sofiapro-extralight-italic-webfont.woff2') format('woff2'), + url('/mf/fonts/sofiapro-extralight-italic-webfont.ttf') format('truetype'); + font-weight: 200; + font-style: italic; +} + +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-light-webfont.eot'); + src: url('/mf/fonts/sofiapro-light-webfont.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-light-webfont.woff') format('woff'), + url('/mf/fonts/sofiapro-light-webfont.woff2') format('woff2'), + url('/mf/fonts/sofiapro-light-webfont.svg#sofia_pro_light') format('svg'), + url('/mf/fonts/sofiapro-light-webfont.ttf') format('truetype'); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-light-italic-webfont.eot'); + src: url('/mf/fonts/sofiapro-light-italic-webfont.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-light-italic-webfont.woff') format('woff'), + url('/mf/fonts/sofiapro-light-italic-webfont.ttf') format('truetype'), + url('/mf/fonts/sofiapro-light-italic-webfont.svg#sofia_pro_lightitalic') format('svg'); + font-weight: 300; + font-style: italic; +} + +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-regular-webfont.eot'); + src: url('/mf/fonts/sofiapro-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-regular-webfont.woff') format('woff'), + url('/mf/fonts/sofiapro-regular-webfont.woff2') format('woff2'), + url('/mf/fonts/sofiapro-regular-webfont.ttf') format('truetype'), + url('/mf/fonts/sofiapro-regular-webfont.svg#sofia_pro_regular') format('svg'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-medium-webfont.eot'); + src: url('/mf/fonts/sofiapro-medium-webfont.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-medium-italic.woff') format('woff'), + url('/mf/fonts/sofiapro-medium-italic.woff2') format('woff2'), + url('/mf/fonts/sofiapro-medium-webfont.svg#sofia_pro_medium') format('svg'), + url('/mf/fonts/sofiapro-medium-webfont.ttf') format('truetype'); + font-weight: 500; + font-style: normal; +} + +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-medium-italic.eot'); + src: url('/mf/fonts/sofiapro-medium-italic.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-medium-italic.woff') format('woff'), + url('/mf/fonts/sofiapro-medium-italic.ttf') format('truetype'), + url('/mf/fonts/sofiapro-medium-italic.svg#sofia_pro_mediumitalic') format('svg'); + font-weight: 500; + font-style: italic; +} + +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-semibold-webfont.eot'); + src: url('/mf/fonts/sofiapro-semibold-webfont.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-semibold-webfont.woff') format('woff'), + url('/mf/fonts/sofiapro-semibold-webfont.woff2') format('woff2'), + url('/mf/fonts/sofiapro-semibold-webfont.svg#sofia_pro_semibold') format('svg'), + url('/mf/fonts/sofiapro-semibold-webfont.ttf') format('truetype'); + font-weight: 600; + font-style: normal; +} + +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-semibold-italic-webfont.eot'); + src: url('/mf/fonts/sofiapro-semibold-italic-webfont.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-semibold-italic-webfont.woff') format('woff'), + url('/mf/fonts/sofiapro-semibold-italic-webfont.ttf') format('truetype'), + url('/mf/fonts/sofiapro-semibold-italic-webfont.svg#sofia_pro_semibolditalic') format('svg'); + font-weight: 600; + font-style: italic; +} + +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-bold-webfont.eot'); + src: url('/mf/fonts/sofiapro-bold-webfont.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-bold-webfont.woff') format('woff'), + url('/mf/fonts/sofiapro-bold-webfont.woff2') format('woff2'), + url('/mf/fonts/sofiapro-bold-webfont.svg#sofia_pro_bold') format('svg'), + url('/mf/fonts/sofiapro-bold-webfont.ttf') format('truetype'); + font-weight: 700; + font-style: normal; +} + +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-bold-italic-webfont.eot'); + src: url('/mf/fonts/sofiapro-bold-italic-webfont.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-bold-italic-webfont.woff') format('woff'), + url('/mf/fonts/sofiapro-bold-italic-webfont.ttf') format('truetype'), + url('/mf/fonts/sofiapro-bold-italic-webfont.svg#sofia_pro_bolditalic') format('svg'); + font-weight: 700; + font-style: italic; +} + +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-black-webfont.eot'); + src: url('/mf/fonts/sofiapro-black-webfont.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-black-webfont.woff') format('woff'), + url('/mf/fonts/sofiapro-black-webfont.woff2') format('woff2'), + url('/mf/fonts/sofiapro-black-webfont.svg#sofia_pro_black') format('svg'), + url('/mf/fonts/sofiapro-black-webfont.ttf') format('truetype'); + font-weight: 800; + font-style: normal; +} + +@font-face { + font-family: 'Sofia Pro'; + src: url('/mf/fonts/sofiapro-black-italic-webfont.eot'); + src: url('/mf/fonts/sofiapro-black-italic-webfont.eot?#iefix') format('embedded-opentype'), + url('/mf/fonts/sofiapro-black-italic-webfont.woff') format('woff'), + url('/mf/fonts/sofiapro-black-italic-webfont.woff2#sofia_pro_blackitalic') format('svg'); + font-weight: 800; + font-style: italic; +} + @font-face { font-family: 'Source Sans Pro'; src: url('/mf/fonts/SourceSansPro-Regular-webfont.eot'); From 8c18521a4af1b7ea0cc766eb31a27c4d5f70aead Mon Sep 17 00:00:00 2001 From: Thabo Date: Tue, 27 Oct 2015 17:35:19 -0700 Subject: [PATCH 4/4] update links per topcoder app changes --- src/footer.html | 13 +++++++------ wp/wp-content/themes/tcs-responsive/footer.php | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/footer.html b/src/footer.html index 0834283a..b5d0f415 100644 --- a/src/footer.html +++ b/src/footer.html @@ -185,7 +185,7 @@

Comment Examples

vm.userMenu = [ { 'href': '/my-dashboard', 'text': 'DASHBOARD', 'icon': '/mf/i/nav/dashboard.svg' }, { 'href': '/members/' + handle, 'text': 'MY PROFILE', 'icon': '/mf/i/nav/badge.svg' }, - { 'href': 'https:' + tcconfig.communityURL + '/PactsMemberServlet?module=PaymentHistory&full_list=false', 'text': 'PAYMENTS', 'icon': '/mf/i/nav/money-bag.svg', 'target': '_blank' }, + { 'href': 'https:' + tcconfig.communityURL + '/PactsMemberServlet?module=PaymentHistory&full_list=false', 'text': 'PAYMENTS', 'icon': '/mf/i/nav/money-bag.svg' }, { 'href': '/settings/profile', 'text': 'SETTINGS', 'icon': '/mf/i/nav/gear.svg' }, ]; }); @@ -196,12 +196,13 @@

Comment Examples

vm.menuLinks = { 'compete': [ - { 'href': "/challenges/design/active/", 'text': 'DESIGN CHALLENGES', 'icon': '/mf/i/nav/design.svg' }, - { 'href': "/challenges/develop/active", 'text': 'DEVELOPMENT CHALLENGES', 'icon': '/mf/i/nav/development.svg' }, - { 'href': "/challenges/data/active", 'text': 'DATA SCIENCE CHALLENGES', 'icon': '/mf/i/nav/data-science.svg' }, - { 'href': 'https:' + tcconfig.arenaURL, 'text': 'THE ARENA', 'icon': '/mf/i/nav/srms.svg', 'target': '_blank' }, + { 'href': "/challenges/design/active/?pageIndex=1", 'text': 'DESIGN CHALLENGES', 'icon': '/mf/i/nav/design.svg' }, + { 'href': "/challenges/develop/active/?pageIndex=1", 'text': 'DEVELOPMENT CHALLENGES', 'icon': '/mf/i/nav/development.svg' }, + { 'href': "/challenges/data/active/?pageIndex=1", 'text': 'DATA SCIENCE CHALLENGES', 'icon': '/mf/i/nav/data-science.svg' }, + { 'href': 'https:' + tcconfig.arenaURL, 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/mf/i/nav/srms.svg', 'target': '_blank' }, ], 'learn': [ + { 'href': '/getting-started/', 'text': 'GETTING STARTED', 'icon': '/mf/i/nav/rocket.svg' }, { 'href': '/community/design/', 'text': 'DESIGN', 'icon': '/mf/i/nav/scroll-design.svg' }, { 'href': '/community/development/', 'text': 'DEVELOPMENT', 'icon': '/mf/i/nav/scroll-develop.svg' }, { 'href': '/community/data-science/', 'text': 'DATA SCIENCE', 'icon': '/mf/i/nav/scroll-data.svg' }, @@ -210,7 +211,7 @@

Comment Examples

'community': [ { 'href': '/community/members/', 'text': 'MEMBERS', 'icon': '/mf/i/nav/users.svg' }, { 'href': '/community/member-programs/', 'text': 'PROGRAMS', 'icon': '/mf/i/nav/medal.svg' }, - { 'href': 'https://' + tcconfig.forumsAppURL, 'text': 'FORUMS', 'icon': '/mf/i/nav/forum.svg', 'target': '_blank' }, + { 'href': 'https://' + tcconfig.forumsAppURL, 'text': 'FORUMS', 'icon': '/mf/i/nav/forum.svg' }, { 'href': '/community/statistics/', 'text': 'STATISTICS', 'icon': '/mf/i/nav/statistics.svg' }, { 'href': '/community/events/', 'text': 'EVENTS', 'icon': '/mf/i/nav/calendar.svg' }, { 'href': '/blog/', 'text': 'BLOG', 'icon': '/mf/i/nav/blog.svg' } diff --git a/wp/wp-content/themes/tcs-responsive/footer.php b/wp/wp-content/themes/tcs-responsive/footer.php index 9ed42e3d..bf9562b2 100644 --- a/wp/wp-content/themes/tcs-responsive/footer.php +++ b/wp/wp-content/themes/tcs-responsive/footer.php @@ -266,7 +266,7 @@ function _kms(u){ vm.userMenu = [ { 'href': '/my-dashboard', 'text': 'DASHBOARD', 'icon': '/mf/i/nav/dashboard.svg' }, { 'href': '/members/' + handle, 'text': 'MY PROFILE', 'icon': '/mf/i/nav/badge.svg' }, - { 'href': 'https:' + tcconfig.communityURL + '/PactsMemberServlet?module=PaymentHistory&full_list=false', 'text': 'PAYMENTS', 'icon': '/mf/i/nav/money-bag.svg', 'target': '_blank' }, + { 'href': 'https:' + tcconfig.communityURL + '/PactsMemberServlet?module=PaymentHistory&full_list=false', 'text': 'PAYMENTS', 'icon': '/mf/i/nav/money-bag.svg' }, { 'href': '/settings/profile', 'text': 'SETTINGS', 'icon': '/mf/i/nav/gear.svg' }, ]; }); @@ -277,12 +277,13 @@ function _kms(u){ vm.menuLinks = { 'compete': [ - { 'href': "/challenges/design/active/", 'text': 'DESIGN CHALLENGES', 'icon': '/mf/i/nav/design.svg' }, - { 'href': "/challenges/develop/active", 'text': 'DEVELOPMENT CHALLENGES', 'icon': '/mf/i/nav/development.svg' }, - { 'href': "/challenges/data/active", 'text': 'DATA SCIENCE CHALLENGES', 'icon': '/mf/i/nav/data-science.svg' }, - { 'href': 'https:' + tcconfig.arenaURL, 'text': 'THE ARENA', 'icon': '/mf/i/nav/srms.svg', 'target': '_blank' }, + { 'href': "/challenges/design/active/?pageIndex=1", 'text': 'DESIGN CHALLENGES', 'icon': '/mf/i/nav/design.svg' }, + { 'href': "/challenges/develop/active/?pageIndex=1", 'text': 'DEVELOPMENT CHALLENGES', 'icon': '/mf/i/nav/development.svg' }, + { 'href': "/challenges/data/active/?pageIndex=1", 'text': 'DATA SCIENCE CHALLENGES', 'icon': '/mf/i/nav/data-science.svg' }, + { 'href': 'https:' + tcconfig.arenaURL, 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/mf/i/nav/srms.svg', 'target': '_blank' }, ], 'learn': [ + { 'href': '/getting-started/', 'text': 'GETTING STARTED', 'icon': '/mf/i/nav/rocket.svg' }, { 'href': '/community/design/', 'text': 'DESIGN', 'icon': '/mf/i/nav/scroll-design.svg' }, { 'href': '/community/development/', 'text': 'DEVELOPMENT', 'icon': '/mf/i/nav/scroll-develop.svg' }, { 'href': '/community/data-science/', 'text': 'DATA SCIENCE', 'icon': '/mf/i/nav/scroll-data.svg' }, @@ -291,7 +292,7 @@ function _kms(u){ 'community': [ { 'href': '/community/members/', 'text': 'MEMBERS', 'icon': '/mf/i/nav/users.svg' }, { 'href': '/community/member-programs/', 'text': 'PROGRAMS', 'icon': '/mf/i/nav/medal.svg' }, - { 'href': 'https://' + tcconfig.forumsAppURL, 'text': 'FORUMS', 'icon': '/mf/i/nav/forum.svg', 'target': '_blank' }, + { 'href': 'https://' + tcconfig.forumsAppURL, 'text': 'FORUMS', 'icon': '/mf/i/nav/forum.svg' }, { 'href': '/community/statistics/', 'text': 'STATISTICS', 'icon': '/mf/i/nav/statistics.svg' }, { 'href': '/community/events/', 'text': 'EVENTS', 'icon': '/mf/i/nav/calendar.svg' }, { 'href': '/blog/', 'text': 'BLOG', 'icon': '/mf/i/nav/blog.svg' }