Skip to content

Commit

Permalink
#8 - Research page content WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
Jooseppi12 committed Jan 29, 2021
1 parent 678615d commit 997d67f
Show file tree
Hide file tree
Showing 17 changed files with 419 additions and 61 deletions.
Binary file added src/Hosted/assets/conferences/cefp-grey.png
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 src/Hosted/assets/conferences/cefp.png
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 src/Hosted/assets/conferences/fp-bud-grey.png
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 src/Hosted/assets/conferences/fp-bud.png
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 src/Hosted/assets/conferences/fpdays-grey.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 src/Hosted/assets/conferences/fpdays.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 src/Hosted/assets/conferences/icfp-grey.png
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 src/Hosted/assets/conferences/icfp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
171 changes: 170 additions & 1 deletion src/Hosted/assets/contact-map-styles.json
Original file line number Diff line number Diff line change
@@ -1 +1,170 @@
[{"featureType":"administrative","elementType":"labels","stylers":[{"visibility":"off"}]},{"featureType":"administrative.country","elementType":"geometry.stroke","stylers":[{"color":"#f2f2f2"}, {"visibility":"on"}]},{"featureType":"administrative.province","elementType":"geometry.stroke","stylers":[{"visibility":"off"}]},{"featureType":"landscape","elementType":"geometry","stylers":[{"visibility":"on"},{"color":"#e3e3e3"}]},{"featureType":"landscape.natural","elementType":"labels","stylers":[{"visibility":"off"}]},{"featureType":"poi","elementType":"all","stylers":[{"visibility":"off"}]},{"featureType":"road","elementType":"all","stylers":[{"color":"#cccccc"}]},{"featureType":"road","elementType":"labels","stylers":[{"visibility":"off"}]},{"featureType":"transit","elementType":"labels.icon","stylers":[{"visibility":"off"}]},{"featureType":"transit.line","elementType":"geometry","stylers":[{"visibility":"off"}]},{"featureType":"transit.line","elementType":"labels.text","stylers":[{"visibility":"off"}]},{"featureType":"transit.station.airport","elementType":"geometry","stylers":[{"visibility":"off"}]},{"featureType":"transit.station.airport","elementType":"labels","stylers":[{"visibility":"off"}]},{"featureType":"water","elementType":"geometry","stylers":[{"color":"#FFFFFF"}]},{"featureType":"water","elementType":"labels","stylers":[{"visibility":"off"}]}]
[
{
"featureType": "all",
"elementType": "geometry.fill",
"stylers": [
{
"weight": "2.00"
}
]
},
{
"featureType": "all",
"elementType": "geometry.stroke",
"stylers": [
{
"color": "#9c9c9c"
}
]
},
{
"featureType": "all",
"elementType": "labels.text",
"stylers": [
{
"visibility": "on"
}
]
},
{
"featureType": "landscape",
"elementType": "all",
"stylers": [
{
"color": "#f2f2f2"
}
]
},
{
"featureType": "landscape",
"elementType": "geometry.fill",
"stylers": [
{
"color": "#ffffff"
}
]
},
{
"featureType": "landscape.man_made",
"elementType": "geometry.fill",
"stylers": [
{
"color": "#ffffff"
}
]
},
{
"featureType": "poi",
"elementType": "all",
"stylers": [
{
"visibility": "off"
}
]
},
{
"featureType": "road",
"elementType": "all",
"stylers": [
{
"saturation": -100
},
{
"lightness": 45
}
]
},
{
"featureType": "road",
"elementType": "geometry.fill",
"stylers": [
{
"color": "#eeeeee"
}
]
},
{
"featureType": "road",
"elementType": "labels.text.fill",
"stylers": [
{
"color": "#7b7b7b"
}
]
},
{
"featureType": "road",
"elementType": "labels.text.stroke",
"stylers": [
{
"color": "#ffffff"
}
]
},
{
"featureType": "road.highway",
"elementType": "all",
"stylers": [
{
"visibility": "simplified"
}
]
},
{
"featureType": "road.arterial",
"elementType": "labels.icon",
"stylers": [
{
"visibility": "off"
}
]
},
{
"featureType": "transit",
"elementType": "all",
"stylers": [
{
"visibility": "off"
}
]
},
{
"featureType": "water",
"elementType": "all",
"stylers": [
{
"color": "#46bcec"
},
{
"visibility": "on"
}
]
},
{
"featureType": "water",
"elementType": "geometry.fill",
"stylers": [
{
"color": "#c8d7d4"
}
]
},
{
"featureType": "water",
"elementType": "labels.text.fill",
"stylers": [
{
"color": "#070707"
}
]
},
{
"featureType": "water",
"elementType": "labels.text.stroke",
"stylers": [
{
"color": "#ffffff"
}
]
}
]
126 changes: 121 additions & 5 deletions src/Hosted/assets/custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -524,13 +524,129 @@ nav.light {
color: white;
text-decoration: none;

.menu-transparent:not(.scroll-menu) &, .menu-transparent.dark & {
.menu-transparent:not(.scroll-menu) &, .dark & {
color: #47b2e4;
}

.title-alternative {
color: #ccc;
margin-left: 0px;
font-size: 1em;
}
}

.cnt-box-team {
.caption {
h2 {
&::before {
content: none;
}
}
}
}

.custom-timeline {
position: relative;
list-style: none;
padding: 0;

&:before {
content: '';
position: absolute;
top: 0;
bottom: 0;
width: 5px;
background: #aaaaaa;
left: 20%;
margin-left: -10px;

@media screen and (max-width: 760px) {
display: none;
}
}

& li {
position: relative;
}

.year {
display: block;
width: 25%;
padding-right: 100px;
position: absolute;
top: 1em;
text-align: right;
font-size: 1.5em;
color: #587790;

@media screen and (max-width: 760px) {
display: none;
}
}

.tl-content {
margin: 0 0 15px 25%;
color: #587790;
padding: 0.5em 2em 0.5em 1em;
font-weight: 300;
line-height: 1.4;
position: relative;
border-radius: 5px;

h2 {
margin-top: 0px;
padding: 0 0 10px 0;
border-bottom: 1px solid #aaaaaa;
}

@media screen and (max-width: 760px) {
margin: 0px;
}
}

.tl-small-date {
display: none;

@media screen and (max-width: 760px) {
display: inline-block;
}
}
}

.sponsor-logo {
position: absolute;
top: 50%;
left: 50%;
transform: translateX(-50%) translateY(-50%);

&-holder {
height: 20vh;
position: relative;
}

&-fpbud {
max-width: 60% !important;
}

&-icfp {
max-width: 100% !important;
}

&-fpdays {
max-width: 50% !important;
}

&-cefp {
max-width: 100% !important;
}
}

.menu-title .title-alternative {
color: #ccc;
margin-left: 0px;
font-size: 1em;
.cnt-box-team, .cnt-box-team:hover {
.caption {
@media screen and (max-width: 992px) {
height: unset;
position: unset;
padding-top: 0px;
}
}
}
Binary file removed src/Hosted/assets/research-2.jpg
Binary file not shown.
Binary file removed src/Hosted/assets/research-3.jpg
Binary file not shown.
Binary file removed src/Hosted/assets/research-4.jpg
Binary file not shown.
Binary file removed src/Hosted/assets/research-5.jpg
Binary file not shown.
2 changes: 1 addition & 1 deletion src/Hosted/consulting.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div ws-replace="MenuBar"></div>
</nav>
<!-- HEADER -->
<header class="header-image ken-burn-center light full-screen" data-parallax="true" data-natural-height="966" data-natural-width="1450" data-bleed="0" data-image-src="assets\consulting-1.jpg" data-offset="0">
<header class="header-image ken-burn-center light" data-parallax="true" data-natural-height="966" data-natural-width="1450" data-bleed="0" data-image-src="assets\consulting-1.jpg" data-offset="0">
<div class="container">
<h1>Build your F# application with us</h1>
<h2>By weaving together advances in F# development, intelligent operations, and modern full-stack applications, we can help your company deliver on the promise of digital transformation</h2>
Expand Down
2 changes: 1 addition & 1 deletion src/Hosted/contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</head>
<body>
<div id="preloader"></div>
<nav class="menu-wide menu-transparent menu-fixed align-right dark" data-menu-anima="fade-bottom" data-scroll-detect="true">
<nav class="menu-wide menu-fixed align-right dark" data-menu-anima="fade-bottom" data-scroll-detect="true">
<div ws-replace="MenuBar"></div>
</nav>
<main>
Expand Down
Loading

0 comments on commit 997d67f

Please sign in to comment.