Commit 93f5989d authored by Olga Brani's avatar Olga Brani

Merge pull request #6 from olgabrani/master

Dockerfile and minor fixes
parents 349d00c4 f6096d27
FROM shawnzhu/ruby-nodejs
RUN gem install jekyll
FROM node
RUN apt-get update && apt-get install -y --no-install-recommends ruby rubygems ruby-dev
RUN gem install jekyll compass
ADD . /src
WORKDIR /src
RUN npm install -y -g
RUN compass compile static --output=compressed
CMD [ "jekyll", "serve", "-H", "0.0.0.0" ]
CMD ["jekyll", "serve", "-H", "0.0.0.0"]
......@@ -52,8 +52,10 @@ Then run grunt with the following options:
If you want to watch for changes in sass files, run `compass watch` in a separate terminal.
## Output files
## Build using Docker
All output static site pages and files are found under `_site/` folder.
Just run `docker build .` and everything should be build automatically.
## Output files
All output static site pages and files are found under `_site/` folder.
......@@ -8,6 +8,7 @@
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link href='https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700&amp;subset=latin,greek-ext,greek' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Lato:300,400,600,700&amp;subset=latin,greek-ext,greek' rel='stylesheet' type='text/css'>
<link rel="alternate" type="application/atom+xml" href="{{ '/atom.xml' | prepend: site.baseurl }}" title="Atom feed">
<!-- Custom CSS -->
......
......@@ -27,6 +27,6 @@ Enjoy,
the Synnefo team
[1]: https://www.synnefo.org/docs/synnefo/latest/Changelog.html?highlight=changelog#v0-16-1
[2]: https://www.synnefo.org/docs/synnefo/latest/upgrade/upgrade-0.16.1.html
[2]: https://www.synnefo.org/docs/synnefo/latest/upgrade/upgrade-0.16.html
[3]: https://groups.google.com/forum/#!forum/synnefo
[4]: https://kiwiirc.com/client/chat.freenode.net/synnefo
......@@ -10,6 +10,7 @@
list-style: none outside none;
li {
background: $secondary-bg;
font-family: $header-font-family;
a {
display: block;
padding: 20px;
......
......@@ -99,7 +99,7 @@ $row-width: rem-calc(650);
// We use these to control various global styles
$body-bg: #e6e7e8;
$body-font-color: #4e4e4e;
$body-font-family: "Open Sans", "Helvetica", Helvetica, Arial, sans-serif;
$body-font-family: "Lato", "Helvetica", Helvetica, Arial, sans-serif;
// $font-weight-normal:normal;
// $body-font-weight: $font-weight-normal;
// $body-font-style: normal;
......@@ -178,7 +178,7 @@ $border-color: #c2c2c2;
// $include-html-type-classes: $include-html-classes;
// We use these to control header font styles
// $header-font-family: $body-font-family;
$header-font-family: 'Open Sans';
$header-font-weight: bold;
// $header-font-style: normal;
$header-font-color: $body-font-color;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment