From 492074c717e4d2fea194f0eace42d286973c46a4 Mon Sep 17 00:00:00 2001 From: Josh south Date: Fri, 31 Mar 2017 16:07:37 -0700 Subject: [PATCH] Various post-launch fixes (#2549) * WIP #2052 - Adding sass - Test components - Night mode - docker con banner - archive legacy css * add compressed css * Update branding for cloud api docs * split out global header * rescale mods * adjust viewport rescaling * sync * test * testing deploy * john rules, please update man * test: removing all styles * trying to make netlify work * add min-height to sidebars * testing * Update style.css manually add css * testing * test * Update style.css * adding dockercon svg * add svgs add svgs * remove css * re-add * s/container-fluid/container --- _config.yml | 7 + _includes/global-header.html | 140 +- _includes/header.html | 25 +- _includes/side-menu.html | 4 +- _layouts/docs.html | 8 +- _scss/_base.scss | 158 ++ _scss/_buttons.scss | 71 + _scss/_content.scss | 139 ++ _scss/_github.scss | 98 + _scss/_global-header.scss | 55 + _scss/_layout.scss | 231 +++ _scss/_mobile.scss | 409 ++++ _scss/_navigation.scss | 372 ++++ _scss/_night-mode.scss | 272 +++ _scss/_overrides.scss | 141 ++ _scss/_typography.scss | 71 + _scss/_utilities.scss | 267 +++ _scss/_variables.scss | 78 + apidocs/docker-cloud/images/docker-cloud.svg | 14 + apidocs/docker-cloud/index.html | 4 +- apidocs/docker-cloud/stylesheets/screen.css | 13 +- components.md | 148 ++ css/{ => archive}/allcss.css | 0 css/{ => archive}/app2.css | 0 css/{ => archive}/documentation.css | 0 css/{ => archive}/p2p.css | 0 css/{ => archive}/temporary.css | 0 css/main.css | 1338 ------------ css/style.css | 1913 +----------------- css/style.scss | 17 + css/temp.css | 83 - images/dockercon.png | Bin 0 -> 10678 bytes images/dockercon.svg | 22 + index.md | 14 +- js/docs.js | 45 +- 35 files changed, 2721 insertions(+), 3436 deletions(-) create mode 100755 _scss/_base.scss create mode 100755 _scss/_buttons.scss create mode 100755 _scss/_content.scss create mode 100755 _scss/_github.scss create mode 100755 _scss/_global-header.scss create mode 100755 _scss/_layout.scss create mode 100755 _scss/_mobile.scss create mode 100755 _scss/_navigation.scss create mode 100755 _scss/_night-mode.scss create mode 100755 _scss/_overrides.scss create mode 100755 _scss/_typography.scss create mode 100755 _scss/_utilities.scss create mode 100755 _scss/_variables.scss create mode 100644 apidocs/docker-cloud/images/docker-cloud.svg create mode 100644 components.md rename css/{ => archive}/allcss.css (100%) rename css/{ => archive}/app2.css (100%) rename css/{ => archive}/documentation.css (100%) rename css/{ => archive}/p2p.css (100%) rename css/{ => archive}/temporary.css (100%) delete mode 100644 css/main.css create mode 100644 css/style.scss create mode 100644 images/dockercon.png create mode 100644 images/dockercon.svg diff --git a/_config.yml b/_config.yml index 8cbdd0e395..6f8be94797 100644 --- a/_config.yml +++ b/_config.yml @@ -163,3 +163,10 @@ defaults: path: "apidocs/v2.0.1" values: hide_from_sitemap: true + +# Assets +# +# We specify the directory for Jekyll so we can use @imports. +sass: + sass_dir: _scss + style: :compressed \ No newline at end of file diff --git a/_includes/global-header.html b/_includes/global-header.html index a4a3cecb96..7f82b14a91 100644 --- a/_includes/global-header.html +++ b/_includes/global-header.html @@ -1,51 +1,55 @@
-
-
- -
+
+
+ +
-
+
@@ -58,30 +62,36 @@
+ + +
-
+
+ diff --git a/_includes/header.html b/_includes/header.html index b007ec9840..8f3d02a207 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,7 +1,7 @@ + \ No newline at end of file diff --git a/_includes/side-menu.html b/_includes/side-menu.html index bc22ee4adc..23230234bc 100644 --- a/_includes/side-menu.html +++ b/_includes/side-menu.html @@ -1,5 +1,5 @@ -{% if page.landing == true %}