From 4d85d967b1d21409933a2cc342c8acb171ad568f Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 27 Mar 2017 23:37:59 -0400 Subject: [PATCH] Update styles --- website/Gemfile | 2 +- website/Gemfile.lock | 10 +- website/Makefile | 2 +- website/config.rb | 38 +- website/packer.json | 2 +- website/source/assets/images/caret-green.png | Bin 219 -> 0 bytes .../source/assets/images/caret-green@2x.png | Bin 361 -> 0 bytes website/source/assets/images/caret-light.png | Bin 213 -> 0 bytes .../source/assets/images/caret-light@2x.png | Bin 348 -> 0 bytes website/source/assets/images/caret-white.png | Bin 152 -> 0 bytes .../source/assets/images/caret-white@2x.png | Bin 238 -> 0 bytes website/source/assets/images/favicon.png | Bin 359 -> 0 bytes website/source/assets/images/favicon@2x.png | Bin 605 -> 0 bytes website/source/assets/images/hashi-logo.png | Bin 335 -> 0 bytes .../source/assets/images/hashi-logo@2x.png | Bin 543 -> 0 bytes .../source/assets/images/icon-download.png | Bin 411 -> 0 bytes .../source/assets/images/icon-download@2x.png | Bin 500 -> 0 bytes website/source/assets/images/icon-github.png | Bin 502 -> 0 bytes .../source/assets/images/icon-github@2x.png | Bin 810 -> 0 bytes website/source/assets/images/logo-text.svg | 29 +- website/source/assets/images/logo.svg | 1 - website/source/assets/images/logo_large.png | Bin 36539 -> 0 bytes .../source/assets/images/triangle-sprite.png | Bin 220 -> 0 bytes .../assets/images/triangle-sprite@2x.png | Bin 354 -> 0 bytes website/source/assets/javascripts/_cubes.js | 76 ++ .../assets/javascripts/app/_CubeDraw.js | 82 -- .../source/assets/javascripts/app/_Init.js | 45 - .../source/assets/javascripts/app/_Sidebar.js | 51 - .../source/assets/javascripts/application.js | 14 +- .../source/assets/javascripts/lib/_Base.js | 145 --- .../lib/_Function.prototype.bind.js | 21 - .../javascripts/lib/_String.substitute.js | 14 - .../javascripts/lib/_jquery.waypoints.js | 647 ---------- website/source/assets/stylesheets/_api.scss | 83 +- .../source/assets/stylesheets/_buttons.scss | 139 +-- .../source/assets/stylesheets/_community.scss | 26 +- website/source/assets/stylesheets/_docs.scss | 132 +- .../source/assets/stylesheets/_downloads.scss | 91 +- .../source/assets/stylesheets/_footer.scss | 2 + .../source/assets/stylesheets/_global.scss | 55 +- .../source/assets/stylesheets/_header.scss | 33 +- website/source/assets/stylesheets/_home.scss | 1079 +++++++++-------- website/source/assets/stylesheets/_inner.scss | 89 ++ .../assets/stylesheets/_livestream.scss | 37 - website/source/assets/stylesheets/_logos.scss | 62 + .../source/assets/stylesheets/_mixins.scss | 761 ------------ .../source/assets/stylesheets/_sidebar.scss | 106 -- .../assets/stylesheets/_syntax.scss.erb | 4 +- .../source/assets/stylesheets/_utilities.scss | 209 ---- .../source/assets/stylesheets/_variables.scss | 83 ++ .../assets/stylesheets/application.scss | 9 +- website/source/downloads.html.erb | 4 +- website/source/index.html.erb | 260 ++-- website/source/layouts/_announcement-bnr.erb | 14 - website/source/layouts/_footer.erb | 68 -- website/source/layouts/_header.erb | 33 - website/source/layouts/_meta.erb | 37 - website/source/layouts/_sidebar.erb | 26 +- website/source/layouts/docs.erb | 616 +++++----- website/source/layouts/downloads.erb | 26 +- website/source/layouts/guides.erb | 46 +- website/source/layouts/http.erb | 214 ++-- website/source/layouts/inner.erb | 19 +- website/source/layouts/intro.erb | 122 +- website/source/layouts/layout.erb | 157 ++- .../source/layouts/svg/_svg-by-hashicorp.erb | 17 - website/source/layouts/svg/_svg-download.erb | 4 - website/source/layouts/svg/_svg-github.erb | 9 - .../layouts/svg/_svg-hashicorp-logo.erb | 7 - 69 files changed, 1912 insertions(+), 3946 deletions(-) delete mode 100644 website/source/assets/images/caret-green.png delete mode 100644 website/source/assets/images/caret-green@2x.png delete mode 100644 website/source/assets/images/caret-light.png delete mode 100644 website/source/assets/images/caret-light@2x.png delete mode 100644 website/source/assets/images/caret-white.png delete mode 100644 website/source/assets/images/caret-white@2x.png delete mode 100644 website/source/assets/images/favicon.png delete mode 100644 website/source/assets/images/favicon@2x.png delete mode 100644 website/source/assets/images/hashi-logo.png delete mode 100644 website/source/assets/images/hashi-logo@2x.png delete mode 100644 website/source/assets/images/icon-download.png delete mode 100644 website/source/assets/images/icon-download@2x.png delete mode 100644 website/source/assets/images/icon-github.png delete mode 100644 website/source/assets/images/icon-github@2x.png delete mode 100644 website/source/assets/images/logo.svg delete mode 100644 website/source/assets/images/logo_large.png delete mode 100644 website/source/assets/images/triangle-sprite.png delete mode 100644 website/source/assets/images/triangle-sprite@2x.png create mode 100644 website/source/assets/javascripts/_cubes.js delete mode 100644 website/source/assets/javascripts/app/_CubeDraw.js delete mode 100644 website/source/assets/javascripts/app/_Init.js delete mode 100644 website/source/assets/javascripts/app/_Sidebar.js delete mode 100644 website/source/assets/javascripts/lib/_Base.js delete mode 100644 website/source/assets/javascripts/lib/_Function.prototype.bind.js delete mode 100644 website/source/assets/javascripts/lib/_String.substitute.js delete mode 100755 website/source/assets/javascripts/lib/_jquery.waypoints.js create mode 100644 website/source/assets/stylesheets/_inner.scss delete mode 100644 website/source/assets/stylesheets/_livestream.scss create mode 100644 website/source/assets/stylesheets/_logos.scss delete mode 100755 website/source/assets/stylesheets/_mixins.scss delete mode 100644 website/source/assets/stylesheets/_sidebar.scss delete mode 100755 website/source/assets/stylesheets/_utilities.scss delete mode 100644 website/source/layouts/_announcement-bnr.erb delete mode 100644 website/source/layouts/_footer.erb delete mode 100644 website/source/layouts/_header.erb delete mode 100644 website/source/layouts/_meta.erb delete mode 100644 website/source/layouts/svg/_svg-by-hashicorp.erb delete mode 100644 website/source/layouts/svg/_svg-download.erb delete mode 100644 website/source/layouts/svg/_svg-github.erb delete mode 100644 website/source/layouts/svg/_svg-hashicorp-logo.erb diff --git a/website/Gemfile b/website/Gemfile index 3b04441c6..405a8c992 100644 --- a/website/Gemfile +++ b/website/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem "middleman-hashicorp", "0.3.15" +gem "middleman-hashicorp", "0.3.22" diff --git a/website/Gemfile.lock b/website/Gemfile.lock index 6c816d6d5..229218ac9 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -6,7 +6,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - autoprefixer-rails (6.7.7) + autoprefixer-rails (6.7.7.1) execjs bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) @@ -77,7 +77,7 @@ GEM rack (>= 1.4.5, < 2.0) thor (>= 0.15.2, < 2.0) tilt (~> 1.4.1, < 2.0) - middleman-hashicorp (0.3.15) + middleman-hashicorp (0.3.22) bootstrap-sass (~> 3.3) builder (~> 3.2) middleman (~> 3.4) @@ -103,7 +103,7 @@ GEM mini_portile2 (2.1.0) minitest (5.10.1) multi_json (1.12.1) - nokogiri (1.7.0.1) + nokogiri (1.7.1) mini_portile2 (~> 2.1.0) padrino-helpers (0.12.8.1) i18n (~> 0.6, >= 0.6.7) @@ -138,7 +138,7 @@ GEM turbolinks (5.0.1) turbolinks-source (~> 5) turbolinks-source (5.0.0) - tzinfo (1.2.2) + tzinfo (1.2.3) thread_safe (~> 0.1) uber (0.0.15) uglifier (2.7.2) @@ -151,7 +151,7 @@ PLATFORMS ruby DEPENDENCIES - middleman-hashicorp (= 0.3.15) + middleman-hashicorp (= 0.3.22) BUNDLED WITH 1.14.6 diff --git a/website/Makefile b/website/Makefile index e9a70a8fa..0e83eb946 100644 --- a/website/Makefile +++ b/website/Makefile @@ -1,4 +1,4 @@ -VERSION?="0.3.15" +VERSION?="0.3.22" website: @echo "==> Starting website in Docker..." diff --git a/website/config.rb b/website/config.rb index 78b35bf08..3453fff10 100644 --- a/website/config.rb +++ b/website/config.rb @@ -18,7 +18,7 @@ helpers do end "Nomad by HashiCorp" - end + end # Get the description for the page # @@ -26,7 +26,12 @@ helpers do # # @return [String] def description_for(page) - return escape_html(page.data.description || "") + description = (page.data.description || "") + .gsub('"', '') + .gsub(/\n+/, ' ') + .squeeze(' ') + + return escape_html(description) end # This helps by setting the "active" class for sidebar nav elements @@ -43,10 +48,22 @@ helpers do # Returns the id for this page. # @return [String] def body_id_for(page) - if name = page.data.sidebar_current && !name.blank? + if !(name = page.data.sidebar_current).blank? return "page-#{name.strip}" end - return "page-home" + if page.url == "/" || page.url == "/index.html" + return "page-home" + end + if !(title = page.data.page_title).blank? + return title + .downcase + .gsub('"', '') + .gsub(/[^\w]+/, '-') + .gsub(/_+/, '-') + .squeeze('-') + .squeeze(' ') + end + return "" end # Returns the list of classes for this page. @@ -54,10 +71,21 @@ helpers do def body_classes_for(page) classes = [] - if page && page.data.layout + if !(layout = page.data.layout).blank? classes << "layout-#{page.data.layout}" end + if !(title = page.data.page_title).blank? + title = title + .downcase + .gsub('"', '') + .gsub(/[^\w]+/, '-') + .gsub(/_+/, '-') + .squeeze('-') + .squeeze(' ') + classes << "page-#{title}" + end + return classes.join(" ") end end diff --git a/website/packer.json b/website/packer.json index d286e6ef5..35de63232 100644 --- a/website/packer.json +++ b/website/packer.json @@ -8,7 +8,7 @@ "builders": [ { "type": "docker", - "image": "hashicorp/middleman-hashicorp:0.3.15", + "image": "hashicorp/middleman-hashicorp:0.3.22", "discard": "true", "run_command": ["-d", "-i", "-t", "{{ .Image }}", "/bin/sh"] } diff --git a/website/source/assets/images/caret-green.png b/website/source/assets/images/caret-green.png deleted file mode 100644 index a56cbf13bff8561cd6463f6aa21a61642496dd4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^96-#&!3HGb=lz)rq!xL)IEGZ*DxF}+b;v-%&H5`_ z6&Jhyqkt#<<}Yteu4tV9$F{}7Q~1RLtqRsck*)sT6SlA!)%Jgg;}ZXKkF~mYyXGh5 zRZCgw873t7i~lX-a*f?_PVavBpIE{8Z+h(KO8Rh6D7P&oAX~)98|I Tz1$9TECYk5tDnm{r-UW|jT}`- diff --git a/website/source/assets/images/caret-green@2x.png b/website/source/assets/images/caret-green@2x.png deleted file mode 100644 index f94fbd6c6039a012c45a551e3a01db2f204154ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmV-v0ha!WP)%rxv9gKU>LlEdoB!51Unv2aAEiXPl91^?tw_KIEGX(mQL8p$mA%(s=tUi zgDJPABhF)|SV4p)nV z8Q5kBBz-e$I%}wKgk!V&iDNl++~E>?WxIMg4G%oYefN5$A&1>O;q;Buck|Aws|31} N!PC{xWt~$(698^ePecF! diff --git a/website/source/assets/images/caret-light@2x.png b/website/source/assets/images/caret-light@2x.png deleted file mode 100644 index ca8339dc2aebad3f8fd1a8ede1546639ab2f3cea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 348 zcmV-i0i*tjP)#@0_{w-OcEX zm;LL6cP`WXimRfW&v;XU@zjoX<(<7?PSGz`xJ;a%(_8iwEST+$Z1h=$>{ uJREw#9+DqbcpWIMPowFw6o&sA&3^%-&l_W4vi`*Y00003SF zu?>Py6o%0sD?&n#cCJ9AX9yacz$L6G+`tV;sGY(XN+zJ7vxUOqvwFFC+;c>adCDW@ zjk(FAU?%uc%cEo^_;Qvfzh`Gw+#6qx9$>YLGuyB+|i}{es zqr>#_cw&0(al^bx6{F@yFjFYTnJ>XgsTesErcsOoFU(zgJTL=^Vq7sJnPOCI1Pdp{ oII<9|TofbagK4!#kLl$60Zn^Pe2VqaD*ylh07*qoM6N<$f}W>j>Hq)$ diff --git a/website/source/assets/images/favicon.png b/website/source/assets/images/favicon.png deleted file mode 100644 index 4e31851979b1f043496ad66b1e0060b9a23beddf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmV-t0hs=YP)-=J0Sj#gm;9WU8jjtW5}7+Za`bE z!Zl#xU!iB#Ob9r?UI4Bs`1D#Opu|SFBEtAp_}R7TV9lN@d#ZvCE__R@=7@7^KG$4b z{ASYaN$d=+a~j)RW;gx!T-Em_uMzp=U2aNxwh~q|8X8!fXE)^m zHNHjFJbTCNTeCHZ%3aP2+k{ZO($IWo)Jp>o;bvtgVPM%%ZsiZGX4*EtNpZb zCN#5r4$eM~mZjlVHS=iq+tS-7tt`-Hi@`eLJMkq7~4{|?g%ZEF7cY4YgbB?DH%+yUoFD^J0AVcPWBj`zhkj~EmA0@-LgZJhKU zd{3dIVA{;%z0b?;oOVV-8!V!8&^!B_0-C_Ix$>y5{Gs^xXRyj7K5lg%_0h#lVEXzO zUB)IrU+!|8FwM}VtYO+Zx%*!HU;C$rRA4 zG`@8VpwDr_p8*^bT*4|&i>&2a_360vN>n(Aukrz2&#_1vZYcyb_!}G&f< zt(bL!4ge|$cBtkHWi{7RA;w;9r8LA#ZK6AZ@EI25AW9SK?u;OOl^rrfGN6WC5pu^Q z=|00Q2##xs2zg|x%@B`v(gACux_Gtn#y8f*!pDq$3mC>)zw=zhopL5Z#N*AZT zz!GWaScF_LP!dRGoZFvarz8pW^Ng^nO}q`iG|S75mL8;S4|cbvBLhamBcORHlu~85-aRYE33KLouRi7HDY0m zP1MvLnhB8z3%jbib$uyB2H3{Rwv?w#6d7SneQQHSo7dHb36UWdCVI{?0KjaH(M6Qq zAGS$=6*j{4<^$NyKNXYJq*kP z8|*6c0e~(1AVl`qdKLu$Yx_Wm^jM{q_q>TBe{3=L8&mmbUTSbkY(Cc+S{9n<2@3;@ zd&KyJ*qqMON0i;?)&T(4@^K>U;tEg`yD8dE8YMsKBJ1T;vn$zbPBMQc*eJJ{U*%F` zlf7(tH8n9I_LEK2+(y2u8Efl6iQ8Aps<8nsFsD?_>0JFPV&mLzQJJ)`dyFZAy=OI< hwu;jgYcJcWx+&ng3f=Ic@Ztaf002ovPDHLkV1l4V{Xzf$ diff --git a/website/source/assets/images/icon-download.png b/website/source/assets/images/icon-download.png deleted file mode 100644 index eb32ebf937db899f59afb90e2adc72db5bbfc6f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 411 zcmV;M0c8G(P)M{F_ z3Iv`4fKH_04mTa_1aFGZpFf}Q@)iyu4Hrn_0iTOy@3yR%-|w~@M#7sgx_$n%FkwS5 zx^N40hB1Sg72br=g|k3?#4J%UA`Z>H>U1T!FNwr>9>;gkNN&UjzdA zhKBk@L;*$IVq+mv0Z~A1gg=M`Df0!(LfPTrKn7R=P%0u6s5cU*ATls6&ObadEiKI- zs1ayIL=@0EpcF^}kQ*Mk{FuB1P)MsJ$S;_I-EYF77k~cCP5Hpx^~>P4*SALr7yg|w zx@-JQN@(AH;Y8N#kXpv&oF+X-RSm0vx_*1QIEGX(PMvZ!?}&i_gL(#soN@C1|IDY? z?sX4)R=Fi=nReiuC6Vhs>G(eCXwOKVdRXeLtZSsEXQ-IRE4RCsul(3z`?VwPwe{30 zpQmefEuVLB_5Y&0E5)=y@u3=k4V`r%Ls{ zzdV@s?OxUQ*^+lY@?96&xBCNYd%ffL^+Nyr5Bh&+bo5hj&3;zC5Eu*$p00i_>zopr E0Kw?iS^xk5 diff --git a/website/source/assets/images/icon-github.png b/website/source/assets/images/icon-github.png deleted file mode 100644 index 997f472652b5ba97544844ba1118368ea3a34d37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 502 zcmV~g8ay0 z@ofSwcsyiT6N3@3#QQULCkj!`u#Bg0xSJnnZftij{_-U;zkgI-VS*+5tBntbG_VPzGC%J?z z@W7a-JGwGK=H|J95wORz4(RPrSZ1hD59Ji9vC@SYztY>u=kpbDLZMJu6M0A^aT`IN zM2;&i4;?uGsF51C(W8q7fgZ%N%0RxUd@WBYxh!Ln-5ecs!+4W`k4~T6c*E+Jz^!PH zsf6;%1Yk=b5GZFv8t7sWWWR#F2rxIyJQu*USO^g{f}98r9a>jaaBrGN*Fwy-v#*l1 sbquhPAn&y*LADdijp&#~!`5s61DCyij8#Ba=Kufz07*qoM6N<$f?A^EasU7T diff --git a/website/source/assets/images/icon-github@2x.png b/website/source/assets/images/icon-github@2x.png deleted file mode 100644 index a2fb6d162c2e29f6f6d7866299e9a7158191f30a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 810 zcmV+_1J(SAP)UL1uwykk(+qP}n-S6)+Zj<-!uQIbgE_>g8$uddt z-yA-cl{ZkzCIPmb9Vp~MlE)<9NPgfO|FMqq(1X5L36YWdWNaN7{Q?p$dHYQDE%pc{rE1dRVxjhy!t1J z!9IAzcA-!$m`&RP?8g3dRb%P*Lzf00Vqe7m?K)lXh((MRPinJA%Jwm`HeH}Cd(!$f zRCLs&03mu%5O=^g{$m~Ip$GlQz0hGU;$##lf7>p{2B(z4Cb|f49K>4L$e{1#K)Hzt zV!+{S;Vws(h}8~iO&=4)fWz4WACEGdjZ$8uILT;&7;u2cWoIO@_xel`O-)WKz+;HL z_b76=maa0pNn*g`Y&s$K#2Z5=aGel)t5JIDC1OuCHs5-bm=Wh220Fv8Ob1+z&9jm1 zXem=FDw`hFnebT_SzFrbhdD9ABr)LW3#{rGNvsfaYhU?WR$&vQfCD_;^8gVq8Y39h zdgk^XM4B5Y69>5|CiayGQI~H^>K2;tfB^$ixgi97x(gwMaXU%FA}wx-(@aN(Hfd6j z2u+Vi(3UfTY}wLRsp1Kd@l&c4>9wOUnZpx`6tOq4k)$*!e26pd%%f8&Y17OE!0spZ z_=R