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

banner and announcement changes #1293

Merged
merged 1 commit into from
Mar 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions app/my-dashboard/notifications/news.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
[
{
"header": "There are no announcements",
"details": "You are all caught up!",
"headerExpand": "",
"detailsExpand": "",
"backgroundImageDesktop": "",
"backgroundImageTablet": "",
"backgroundImageMobile": "",
"header": "Algorithm, Marathon, Regionals, & More!",
"details": "TCO18 news is here! Find out the details for Algorith & Marathon Competitions, regional events, and more!",
"headerExpand": "TCO18 News - Algorithm, Marathon, Regionals, & More!",
"detailsExpand": "TCO18 news is here! Find out the details for Algorith & Marathon Competitions, regional events, and more!",
"backgroundImageDesktop": "tco18news-desktop.jpg",
"backgroundImageTablet": "tco18news-tablet.jpg",
"backgroundImageMobile": "tco18news-mobile.jpg",
"customTag": {
"text": "TCO18 News"
},
"live": false,
"liveExpand": false,
"videoCode": "",
"isEmpty": true
"isEmpty": false
}
]
2 changes: 1 addition & 1 deletion app/my-dashboard/notifications/notifications.jade
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
in a new row
.banner-row
// a.banner.tco18(href="https://tco18.topcoder.com/",target="_blank",rel="noopener noreferrer")
a.banner.happy-holi(href="https://topcoder.com/",target="_blank",rel="noopener noreferrer")
a.banner.womens-day(href="https://topcoder.com/",target="_blank",rel="noopener noreferrer")
a.banner.watson(href="https://cognitive.topcoder.com/")
img(src=require("../../../assets/images/logo_white.png"), alt="TCO17")
12 changes: 4 additions & 8 deletions assets/css/directives/notification.directive.scss
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ $desktop-width: 1024px;
======*/
@include mobile {
flex-direction: column;
padding: 20px;
align-items: center;
}

Expand Down Expand Up @@ -146,6 +145,7 @@ $desktop-width: 1024px;
flex-direction: column;
padding: 14px;
padding-top: 0;
padding-bottom: 10px;
margin-top: 0;
}
}
Expand All @@ -155,7 +155,7 @@ $desktop-width: 1024px;
margin-bottom: 14px;
color: #FFF;
@include desktop {
margin-top: 75px;
margin-top: 0;
width: 100%;
padding: 20px 0 13px 44px;
}
Expand All @@ -166,10 +166,7 @@ $desktop-width: 1024px;
======
With Video
======*/
flex: 1;
text-align: center;
margin-top:50px;
margin-bottom:20px;

/*
======
Expand All @@ -183,8 +180,8 @@ $desktop-width: 1024px;
@include mobile {
font-size: 24px;
text-align: center;
padding-top: 20px;
padding-bottom: 20px;
padding-top: 10px;
flex: 1;
/*
======
With Logo
Expand Down Expand Up @@ -225,7 +222,6 @@ $desktop-width: 1024px;
@include mobile {
font-size: 18px;
line-height: 26px;
margin-bottom: 25px;
text-align: center;
/*
======
Expand Down
9 changes: 7 additions & 2 deletions assets/css/my-dashboard/notifications.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
background: url(../../images/banner-tco18-stage-3.jpg) center/cover;
background-position: center top;
}
&.happy-holi{
background: url(../../images/happy-holi.png) center/cover;
&.womens-day{
background: url(../../images/womens-day.png) center/cover;
background-position: center top;
}
&.watson{
Expand All @@ -70,6 +70,11 @@
background-repeat: no-repeat;
background-color: #333333;
}
&.womens-day{
background: url(../../images/womens-day.png) center/cover;
background-position: left top;
height: 60vw;
}
}
}
}
Binary file removed assets/images/news/DarkCircles-desktop.jpg
Binary file not shown.
Binary file removed assets/images/news/DarkCircles-mobile.jpg
Binary file not shown.
Binary file removed assets/images/news/DarkCircles-tablet.jpg
Binary file not shown.
Binary file added assets/images/news/tco18news-desktop.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/news/tco18news-mobile.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/news/tco18news-tablet.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/images/news/tshirt-desktop.jpg
Binary file not shown.
Binary file removed assets/images/news/tshirt-mobile.jpg
Binary file not shown.
Binary file removed assets/images/news/tshirt-tablet.jpg
Binary file not shown.
Binary file added assets/images/womens-day.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.