Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Petter Joelson committed Mar 18, 2019
1 parent 4e6ac27 commit a4c4505
Show file tree
Hide file tree
Showing 64 changed files with 5,186 additions and 113 deletions.
1 change: 0 additions & 1 deletion CNAME
View file

This file was deleted.

15 changes: 15 additions & 0 deletions _config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ collections:
uploads:
title: Uploads
output: true
groups:
title: Groups
output: true
defaults:
- scope:
path: ''
Expand All @@ -25,6 +28,12 @@ defaults:
values:
layout: page
lang: en
- scope:
path: ''
type: groups
values:
layout: project
lang: sv
- scope:
path: ''
type: posts
Expand Down Expand Up @@ -107,6 +116,12 @@ projectpartner:
sv: Projektpartner
en: Project partner
partners:
- title: Digidem Lab
link: http://digidemlab.org
logo: "/uploads/logo-digidemlab.png"
- title: Allmänna Arvsfonden
link: http://arvsfonden.se
logo: "/uploads/logo-arvsfonden.png"
- title: Göteborgs Stad - Förvaltningen för konsument- och medborgarservice
logo: "/uploads/logo-goteborg.png"
link: http://goteborg.se/wps/portal/start/kommun-o-politik/kommunens-organisation/forvaltningar/forvaltningar/forvaltningen-for-konsument--och-medborgarservice-/!ut/p/z1/hU7NCoMwGHsar_1q_Wm7WxlD0P3ALrpehrpOZauVWjfY00-Pg40FcghJSEBCAbIvH11Tus705X3WJxmfQ5JgPw39LNkIikW0JtFufwiyI4H8X0DONv4BgSEF2VUaPWuNMCIkoowwzhkNGY85XfZFXwWsAWnVVVll0WTnW61zw7jysIcvU31b2BhUG-3hb5XWjA6KzyQMunhtVS7e-Y0waA!!/dz/d5/L2dBISEvZ0FBIS9nQSEh/
Expand Down
10 changes: 10 additions & 0 deletions _groups/goteborg-en.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
title: CivicTech Göteborg
permalink: "/en/goteborg/"
lang: en
ref: goteborg
excerpt: Etiam porta sem malesuada magna mollis euismod.
ingress-text: Cras mattis consectetur purus sit amet fermentum. Donec ullamcorper nulla non metus auctor fringilla.
---

Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Nullam quis risus eget urna mollis ornare vel eu leo. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus.
8 changes: 8 additions & 0 deletions _groups/goteborg.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
title: CivicTech Göteborg
ref: goteborg
excerpt: Etiam porta sem malesuada magna mollis euismod.
ingress-text: Cras mattis consectetur purus sit amet fermentum. Donec ullamcorper nulla non metus auctor fringilla.
---

Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Nullam quis risus eget urna mollis ornare vel eu leo. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus.
42 changes: 10 additions & 32 deletions _includes/footer-partners.html
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,15 @@
<section id="partners" class="">
<section class="section">
<div class="container">
<h2 class="title">{{site.partner[page.lang].partnership}}</h2>

<div class="container py-3">
<div class="row">
<div class="col-sm-4">
<h2 class="display-3">{{site.partner[page.lang].initiative}}</h2>
<div class="row">
<div class="col-md-8 col-sm-12 pb-2">
<a href="http://digidemlab.org" title="Digidem Lab">
<img src="{{site.baseurl}}/uploads/logo-digidemlab.png" alt="Digidem Lab" class="img-fluid">
</a>
</div>
<div class="columns">
{% for item in site.partners %}
<div class="column">
<a href="{{item.link}}" title="{{item.title}}">
<img src="{{site.baseurl}}{{item.logo}}" alt="{{item.title}}">
</a>
</div>
<h2 class="display-3">{{site.partner[page.lang].support}}</h2>
<div class="row">
<div class="col-md-6 col-sm-12 pb-2">
<a href="http://arvsfonden.se" title="Allmänna Arvsfonden">
<img src="{{site.baseurl}}/uploads/logo-arvsfonden.png" alt="Arvsfonden" class="img-fluid">
</a>
</div>
</div>
</div>
<div class="col-sm-8">
<h2 class="display-3">{{site.partner[page.lang].partnership}}</h2>
<div class="row">
{% for item in site.partners %}
<div class="col-sm-6 col-md-3 pb-1">
<a href="{{item.link}}" title="{{item.title}}">
<img src="{{site.baseurl}}{{item.logo}}" alt="{{item.title}}" class="img-fluid">
</a>
</div>
{% endfor %}
</div>
</div>
{% endfor %}
</div>
</div>
</section>
44 changes: 19 additions & 25 deletions _includes/projects.html
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,24 @@
{% assign hackathons=site.hackathons | where:"lang", page.lang | sort:'event-date' | reverse %}
<div class="columns">

{% for item in hackathons %}
<div class="{% cycle 'bg-faded', '' %}">
<div class="container py-3b py-lg-3c">
<div class="row">
<div class="col">
<h2 class="display-2 mb-0b mb-lg-2b"><a href="{{site.baseurl}}{{item.url}}" class="text-primary">{{item.title}}</a></h2>
{% for post in site.posts limit:3 %}
<div class="column">
<div class="card">
<div class="card-image">
<figure class="image is-4by3">
<img src="https://bulma.io/images/placeholders/1280x960.png" alt="Placeholder image">
</figure>
</div>
</div>
<div class="row mb-3">
<div class="col-lg-9">
<h3 class="mb-0">{{item.event-date-desc}} // {{item.place}}</h3>
<p class="lead text-primary">{{item.excerpt}}</p>
<p class="">{{ item.ingress-text | strip_html }}</p>
</div>
</div>
<div class="row">
<div class="col-lg-5 col-xl-4 offset-xl-1 push-lg-7">
{% include page-links.html links=item.links %}
</div>
{% if site.categories[item.ref] %}
<div class="col-lg-7 pull-lg-5 hidden-xs-down">
{% include project-logos.html %}
<div class="card-content">
<div class="content">
<h3 class="title">{{post.title}}</h3>
{{post.excerpt}}
</div>
{% endif %}
<div class="card-footer">
icon
</div>
</div>
</div>
</div>
</div>
{% endfor %}
{% endfor %}

</div>
4 changes: 0 additions & 4 deletions _layouts/default.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#00ffcc">
<meta name="theme-color" content="#00ffcc">

<link href="https://fonts.googleapis.com/css?family=Noto+Sans" rel="stylesheet">
<link rel="stylesheet" href="{{ "/assets/css/main.css" | prepend: full_base_url }}">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
</head>

<body id="{{page.id}}">
Expand All @@ -32,7 +30,5 @@
<!-- JavaScript -->
<script src="{{ "/assets/js/holder.min.js" | prepend: full_base_url }}"></script>
<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
</body>
</html>
112 changes: 75 additions & 37 deletions _layouts/start.html
View file
Original file line number Diff line number Diff line change
@@ -1,58 +1,96 @@
---
layout: default
---

<header class="site-header bg-primary" role="banner">
<div class="header-image">
<div class="container" style="z-index:99">
<nav class="navbar navbar-toggleable-md navbar-light pt-2 pt-lg-3 pb-0">
<button class="navbar-toggler navbar-toggler-right border-0" type="button" data-toggle="modal" data-target="#menuModal" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<!-- <i class="fa fa-bars fa-3x" aria-hidden="true"></i> -->
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse justify-content-end mb-auto" id="main-menu">
<ul class="navbar-nav nav-menu-secondary ml-4">
{% include menu-lang.html %}
</ul>
<section class="hero is-primary is-medium">
<!-- Hero head: will stick at the top -->
<div class="hero-head">
<nav class="navbar">
<div class="container">
<div class="navbar-brand">
<a class="navbar-item">
<img src="https://bulma.io/images/bulma-type-white.png" alt="Logo">
</a>
<span class="navbar-burger burger" data-target="navbarMenuHeroA">
<span></span>
<span></span>
<span></span>
</span>
</div>
</nav>
<div class="row py-5">
<div class="col-lg-10 offset-lg-1 text-center">
<h1 class="display-1"><span class="bg-danger text-white text-uppercase">{{page.title}}</span></h1>
<h2 class=""><span class="bg-danger text-white text-uppercase">{{page.description}}</span></h2>
<a class="btn btn-secondary" href="https://chat.civictech.se" role="button">{{site.join[page.lang]}}</a>
<div id="navbarMenuHeroA" class="navbar-menu">
<div class="navbar-end">
<a class="navbar-item">
Om oss
</a>
<a class="navbar-item">
Joina chatten
</a>
</div>
</div>
</div>
</nav>
</div>

<!-- Hero content: will be in the middle -->
<div class="hero-body">
<div class="container has-text-centered">
<h1 class="title">
Title
</h1>
<h2 class="subtitle">
Subtitle
</h2>
</div>
</div>
</header>

<section class="container mt-2 mt-lg-3 pb-3b">
<div class="row">
<div class="col p-0">
<div class="box text-update py-2b px-2 px-lg-3">
<p class="mb-2b lead text-primary">{{page.news-flash[0].text}}</p>
<div class="text-right lead text-primary">
<a href="{{site.baseurl}}{{page.news-flash[0].link}}" class="icon-arrow-blue pl-4 pl-lg-3">{{page.news-flash[0].link-title}}</a>
</div>

<!-- Hero footer: will stick at the bottom -->
<div class="hero-foot">
<div class="container">
<div class="field is-grouped is-pulled-right">
{% for item in site.groups %}
<p class="control">
<a href="{{item.url}}" class="button is-text">{{item.title}}</a>
</p>
{% endfor %}
<p class="control">
<a class="button">
Starta i din stad!
</a>
</p>
</div>
</div>
</div>
</section>

<section id="projects">
<div class="container pt-2">
<div class="row">
<div class="col">
<h2 class="display-3">{{site.project-title[page.lang]}}</h2>
</div>
<section class="section">
<div class="container">
<div class="columns">
{% for item in page.principles %}
<div class="column">
<h3 class="title">{{item.title}}</h3>
<p>{{item.text}}</p>
</div>
{% endfor %}
</div>
</div>
</section>

{% include projects.html %}
<section class="section">
<div class="container">
<p class="mb-2b lead text-primary">{{page.news-flash[0].text}}</p>
<div>
<a href="{{site.baseurl}}{{page.news-flash[0].link}}" class="icon-arrow-blue pl-4 pl-lg-3">{{page.news-flash[0].link-title}}</a>
</div>
</div>
</section>

<section class="section">
<div class="container">
<h2 class="title">{{site.project-title[page.lang]}}</h2>
{% include projects.html %}

</div>
</section>


{% include contact.html %}
{% include footer-partners.html %}
{% include footer.html %}
8 changes: 8 additions & 0 deletions _sass/_bulma.sass
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@charset "utf-8"
/*! bulma.io v0.7.4 | MIT License | github.com/jgthms/bulma */
@import "bulma/utilities/_all"
@import "bulma/base/_all"
@import "bulma/elements/_all"
@import "bulma/components/_all"
@import "bulma/grid/_all"
@import "bulma/layout/_all"
18 changes: 9 additions & 9 deletions _sass/_custom-variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,21 @@
// Start with assigning color names to specific hex values.
$white: #fff !default;
$black: #000 !default;
$teal: #00ffcc;
$teal: #50E3C2;
// $strong-blue: #3300ff;
$violet: #9a24f4;
$violet: #9013FE;
$magenta: #ff21f5;
$yellow: #ffff00;
$yellow: #F2E610;
// $primary-blue: #0000ff;
$blue: #0425f3;
$blue: #00ADEF;

// Create grayscale
$gray-dark: #1f2021 !default;
$gray: #f7f7f7 !default;
$gray-dark: #4A4A4A !default;
$gray: rgba(155,155,155,0.52) !default;

// Reassign color vars to semantic color scheme
$brand-primary: $blue !default;
$brand-success: $teal !default;
$brand-primary: $teal !default;
$brand-success: $yellow !default;
$brand-info: $violet !default;
$brand-warning: $yellow !default;
$brand-danger: $magenta !default;
Expand Down Expand Up @@ -241,7 +241,7 @@ $link-hover-decoration: underline !default;
$font-size-base: 1.25rem !default;
$line-height-base: 1.5 !default;

$font-family-sans-serif: 'Noto Sans', sans-serif !default;
$font-family-sans-serif: 'OfficeCodeProD', sans-serif !default;

$headings-font-family: 'BentonSans', !default;
$headings-font-weight: normal !default;
Expand Down
13 changes: 13 additions & 0 deletions _sass/_fonts.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,16 @@
font-style: normal;

}

@font-face {
font-family: 'OfficeCodeProD';
src: url('../fonts/officecodeprod-regular-webfont.eot');
src: url('../fonts/officecodeprod-regular-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/officecodeprod-regular-webfont.woff2') format('woff2'),
url('../fonts/officecodeprod-regular-webfont.woff') format('woff'),
url('../fonts/officecodeprod-regular-webfont.ttf') format('truetype'),
url('../fonts/officecodeprod-regular-webfont.svg#office_code_pro_dregular') format('svg');
font-weight: normal;
font-style: normal;

}
5 changes: 5 additions & 0 deletions _sass/bulma/base/_all.sass
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@charset "utf-8"

@import "minireset.sass"
@import "generic.sass"
@import "helpers.sass"
Loading

0 comments on commit a4c4505

Please sign in to comment.