diff --git a/Gemfile b/Gemfile index 180cfa2..d706f1d 100644 --- a/Gemfile +++ b/Gemfile @@ -4,3 +4,5 @@ gem 'middleman', '~> 4.2' gem 'middleman-autoprefixer', '~> 2.7' gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby] gem 'wdm', '~> 0.1', platforms: [:mswin, :mingw] +gem 'redcarpet' +gem 'middleman-syntax' diff --git a/Gemfile.lock b/Gemfile.lock index fdea7da..4ff998d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,6 +73,9 @@ GEM servolux tilt (~> 2.0) uglifier (~> 3.0) + middleman-syntax (3.0.0) + middleman-core (>= 3.2) + rouge (~> 2.0) minitest (5.11.3) padrino-helpers (0.13.3.4) i18n (~> 0.6, >= 0.6.7) @@ -86,6 +89,8 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) + redcarpet (3.4.0) + rouge (2.2.1) sass (3.4.25) servolux (0.13.0) temple (0.8.0) @@ -103,6 +108,8 @@ PLATFORMS DEPENDENCIES middleman (~> 4.2) middleman-autoprefixer (~> 2.7) + middleman-syntax + redcarpet tzinfo-data wdm (~> 0.1) diff --git a/_config.yml b/_config.yml deleted file mode 100644 index c419263..0000000 --- a/_config.yml +++ /dev/null @@ -1 +0,0 @@ -theme: jekyll-theme-cayman \ No newline at end of file diff --git a/config.rb b/config.rb index 71ec870..e33b33c 100644 --- a/config.rb +++ b/config.rb @@ -1,6 +1,13 @@ # Activate and configure extensions # https://middlemanapp.com/advanced/configuration/#configuring-extensions +set :markdown_engine, :redcarpet +set :markdown, :fenced_code_blocks => true, :smartypants => true + +activate :syntax + +activate :directory_indexes + activate :autoprefixer do |prefix| prefix.browsers = "last 2 versions" end @@ -40,7 +47,7 @@ page '/*.txt', layout: false # Build-specific configuration # https://middlemanapp.com/advanced/configuration/#environment-specific-settings -# configure :build do -# activate :minify_css -# activate :minify_javascript -# end +configure :build do + activate :minify_css + activate :minify_javascript +end diff --git a/source/API.md b/source/API.html.md similarity index 87% rename from source/API.md rename to source/API.html.md index d4d69ec..988ec57 100644 --- a/source/API.md +++ b/source/API.html.md @@ -1,4 +1,6 @@ -# API documentation +--- +title: API documentation +--- ## Getting an API token @@ -31,17 +33,18 @@ To authenticate your requests you should put this token in the `Authorization` h Authorization: Bearer ``` +
+ + - <%= yield %> + <%= partial 'nav' %> +
+

<%= current_page.data.title %>

+
+
+ <%= yield %> +
+ + + <%= javascript_include_tag "site" %> + diff --git a/source/stylesheets/site.css.scss b/source/stylesheets/site.css.scss index fda2be7..3eed974 100644 --- a/source/stylesheets/site.css.scss +++ b/source/stylesheets/site.css.scss @@ -1,24 +1,92 @@ -body { - background-color: #fbc547; - color: #333; - font-family: -apple-system, BlinkMacSystemFont, "Avenir Next", "Avenir", - "Segoe UI", "Lucida Grande", "Helvetica Neue", "Helvetica", "Fira Sans", - "Roboto", "Noto", "Droid Sans", "Cantarell", "Oxygen", "Ubuntu", - "Franklin Gothic Medium", "Century Gothic", "Liberation Sans", sans-serif; - padding: 18vh 1rem; - text-align: center; +$plume: #7765e3; +$plumedark: #6457a6; +$gray: #F4F4F4; + +@import url('https://fonts.googleapis.com/css?family=Playfair+Display'); + +html, body { + padding: 0px; + margin: 0px; +} + +h1, h2, h3 { + font-family: 'Playfair Display'; +} + +header { + margin: auto; + padding: 30vh 20vw; + background: linear-gradient(0deg, $plumedark, $plume); + color: white; + font-size: 1.5em; +} + +body > main > * { + padding: 0px 20vw; } -a { - color: rgba(#000, 0.7); +nav { + padding: 0px 20vw; + background: $gray; + ul { + list-style: none; + padding: 0px; + margin: 0px; + display: flex; + justify-content: space-between; - &:focus, - &:hover { - color: rgba(#000, 0.6); + li { + a { + display: block; + padding: 2em 0em; + border-bottom: 2px solid transparent; + transition: all ease-in 0.2s; + + &:hover { + border-bottom-color: $plume; + } + } + } } } -.middleman-logo { - margin-bottom: 1rem; - width: 10rem; +a, a:visited { + text-decoration: none; + color: $plume; } + +footer { + padding: 5em 5vw; + background: $gray; + margin-top: 10vh; + text-align: center; +} + +.highlight { + padding-top: 1em; + padding-bottom: 1em; + overflow-x: auto; +} + +body > main { + margin-top: 2em; + line-height: 1.3em; + + ul { + padding-left: calc(20vw + 1.5em); + li { + padding: 0.5em 0; + } + } +} + +@media screen and (max-width: 1000px) { + body > main > * { + padding: 0 5vw; + } + + header { + padding: 10vh 20vw; + text-align: center; + } +} \ No newline at end of file diff --git a/source/UPDATE.md b/source/update.html.md similarity index 91% rename from source/UPDATE.md rename to source/update.html.md index 4826e8a..db1302c 100644 --- a/source/UPDATE.md +++ b/source/update.html.md @@ -1,4 +1,6 @@ -# Updating your instance +--- +title: Updating your instance +--- To update your instance, run these commands with `plume` user if you created it, or with your default user, in the Plume directory.