From 0bc242fdefd683fe143fe808105dbac8684f0107 Mon Sep 17 00:00:00 2001 From: Shawn Johnson Date: Fri, 8 Aug 2014 19:55:29 -0400 Subject: [PATCH 01/10] update ruby version to 2.1.1 Address issue #6 --- .ruby-version | 2 +- .ruby-version.08.08.2014-19:54:37 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .ruby-version.08.08.2014-19:54:37 diff --git a/.ruby-version b/.ruby-version index ae6d5b9..314a6ed 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -1.9.3-p392 +ruby-2.1.1 diff --git a/.ruby-version.08.08.2014-19:54:37 b/.ruby-version.08.08.2014-19:54:37 new file mode 100644 index 0000000..ae6d5b9 --- /dev/null +++ b/.ruby-version.08.08.2014-19:54:37 @@ -0,0 +1 @@ +1.9.3-p392 From 8d1d61cc4414ded21c22015ebd53131cbb4d9415 Mon Sep 17 00:00:00 2001 From: Shawn Johnson Date: Fri, 8 Aug 2014 20:08:26 -0400 Subject: [PATCH 02/10] Update config to use kramdown for markdown #3 upgrade to kramdown --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 196ca8d..1492bd6 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,5 @@ name: Developer Hub -markdown: maruku +markdown: kramdown pygments: true safe: true baseurl: / From b7b9dbba6e4d30f5296209d5821cb8df9b8e247b Mon Sep 17 00:00:00 2001 From: Shawn Johnson Date: Fri, 15 Aug 2014 18:45:07 -0400 Subject: [PATCH 03/10] #2 - Initial changes to leverage Sass. Updated default template to refer to local resources (though I think we need a variable here for ghpages branches). Created placeholder includes. --- _config.yml | 2 ++ _layouts/default.html | 10 +++++----- static/{css/style.css => _sass/_base.scss} | 23 +++++++++++----------- static/_sass/_custom.scss | 0 static/_sass/_variables.scss | 1 + static/css/style.scss | 5 +++++ 6 files changed, 25 insertions(+), 16 deletions(-) rename static/{css/style.css => _sass/_base.scss} (97%) create mode 100644 static/_sass/_custom.scss create mode 100644 static/_sass/_variables.scss create mode 100644 static/css/style.scss diff --git a/_config.yml b/_config.yml index 1492bd6..bd70ee5 100644 --- a/_config.yml +++ b/_config.yml @@ -4,3 +4,5 @@ pygments: true safe: true baseurl: / exclude: ['.ruby-version', 'node_modules', 'package.json', 'bower.json'] +sass: + sass_dir: static/_sass diff --git a/_layouts/default.html b/_layouts/default.html index f7b111a..e8f6972 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -6,15 +6,15 @@ API documentation - [Agency] Open Tech - - + + @@ -42,7 +42,7 @@ {% include footer.html %} - - + + diff --git a/static/css/style.css b/static/_sass/_base.scss similarity index 97% rename from static/css/style.css rename to static/_sass/_base.scss index 9601915..4d5a230 100644 --- a/static/css/style.css +++ b/static/_sass/_base.scss @@ -360,7 +360,7 @@ nav a:visited { nav li:hover { color: #75787b; - border-left: 4px solid #2CB34A; + border-left: 4px solid $nav-color; background-color: transparent; border-bottom: 1px solid #d0d0ce; padding-left: 0; @@ -368,7 +368,7 @@ nav li:hover { nav li:active { color: #75787b; - border-left: 4px solid #2CB34A; + border-left: 4px solid $nav-color; background-color: transparent; border-bottom: 1px solid #d0d0ce; padding-left: 0; @@ -391,7 +391,7 @@ nav li { #overview a.overview { color: #101820; border-bottom: none; - border-left: 4px solid #2CB34A; + border-left: 4px solid $nav-color; background-color: transparent; margin-left: -4px; } @@ -399,7 +399,7 @@ nav li { #basics a.basics { color: #101820; border-bottom: none; - border-left: 4px solid #2CB34A; + border-left: 4px solid $nav-color; background-color: transparent; margin-left: -4px; } @@ -407,7 +407,7 @@ nav li { #console a.console { color: #101820; border-bottom: none; - border-left: 4px solid #2CB34A; + border-left: 4px solid $nav-color; background-color: transparent; margin-left: -4px; } @@ -415,7 +415,7 @@ nav li { #queries a.queries { color: #101820; border-bottom: none; - border-left: 4px solid #2CB34A; + border-left: 4px solid $nav-color; background-color: transparent; margin-left: -4px; } @@ -423,7 +423,7 @@ nav li { #fields a.fields { color: #101820; border-bottom: none; - border-left: 4px solid #2CB34A; + border-left: 4px solid $nav-color; background-color: transparent; margin-left: -4px; } @@ -431,7 +431,7 @@ nav li { #contribute a.contribute { color: #101820; border-bottom: none; - border-left: 4px solid #2CB34A; + border-left: 4px solid $nav-color; background-color: transparent; margin-left: -4px; } @@ -497,7 +497,7 @@ ul.repo-list.no-padding { } .header { - border-bottom: 4px solid #2CB34A; + border-bottom: 4px solid $nav-color; width: 100%; background-color: #fff; /*position: fixed;*/ @@ -935,7 +935,7 @@ input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } -button:: -moz-focus-inner, input::-moz-focus-inner { +button::-moz-focus-inner, input::-moz-focus-inner { border:0; padding:0; } @@ -1110,7 +1110,7 @@ del { thead {display: table-header-group; } /* Repeat header row at top of each printed page */ tr, img {page-break-inside: avoid; } img {max-width: 100% !important; } - @page {margin: 0.5cm} + page {margin: 0.5cm} p, h2, h3 {orphans: 3; widows: 3} h2, h3{page-break-after: avoid} } @@ -1167,6 +1167,7 @@ del { .open .expandable-button:before { content: "\f056"; +} /* custom class as .hidden is already used in the guide */ .expandable-hidden { diff --git a/static/_sass/_custom.scss b/static/_sass/_custom.scss new file mode 100644 index 0000000..e69de29 diff --git a/static/_sass/_variables.scss b/static/_sass/_variables.scss new file mode 100644 index 0000000..ccbc73d --- /dev/null +++ b/static/_sass/_variables.scss @@ -0,0 +1 @@ +$nav-color: #09c; diff --git a/static/css/style.scss b/static/css/style.scss new file mode 100644 index 0000000..ccf8a3d --- /dev/null +++ b/static/css/style.scss @@ -0,0 +1,5 @@ +--- +--- +@import 'variables'; +@import 'base'; +@import 'custom'; From e074896eb4daa87758a74c7b021381c7b438adc1 Mon Sep 17 00:00:00 2001 From: Shawn Johnson Date: Fri, 15 Aug 2014 18:50:30 -0400 Subject: [PATCH 04/10] #8 - Change pygments to highlighter --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index bd70ee5..b1ebd13 100644 --- a/_config.yml +++ b/_config.yml @@ -1,6 +1,6 @@ name: Developer Hub markdown: kramdown -pygments: true +highlighter: pygments safe: true baseurl: / exclude: ['.ruby-version', 'node_modules', 'package.json', 'bower.json'] From e03d3f150216d67f96234556503561c049e4e01d Mon Sep 17 00:00:00 2001 From: Shawn Johnson Date: Sat, 16 Aug 2014 09:51:02 -0400 Subject: [PATCH 05/10] Include only generic logo, to be replaced by agency-specific logo after fork. --- static/img/logo.png | Bin 7688 -> 9732 bytes static/img/logo_210.png | Bin 1781 -> 0 bytes static/img/logo_211.png | Bin 9732 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 static/img/logo_210.png delete mode 100644 static/img/logo_211.png diff --git a/static/img/logo.png b/static/img/logo.png index 40880047eb6a0699c669ba88fa46119bf6366e57..62f026e0dacf1a74c385b219d346e3ef0d10a4e3 100644 GIT binary patch literal 9732 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 literal 7688 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 XXn$BgTWNz500000NkvXXu0mjfk%nT? diff --git a/static/img/logo_211.png b/static/img/logo_211.png deleted file mode 100644 index 62f026e0dacf1a74c385b219d346e3ef0d10a4e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9732 zcma)hWl$W<(k>c21a}q_6nVK`;h zB#`hYWl$2FxCl13k{W6dRU5424DZ(U&*#hO>&eNEMMq6d&D$HfMVMaaEPPyCxOwPL z#F!!wj-@?UXZO7Ud1%IbST$j|QH-ws0XKU)#@=`D>R4#2va5`R_}cg6yB_XY-{&x2 zXsA`Psoc#SgFeJ=G^olkhFD@~C=1CvBR9~>$7vB(ECRMqeX0B_mn<7ip@Q%I{vE^! z{QhAaXi&MCQdG~-!djqxKV^e}NK!%@sCrcL%{Ou>ZXlekcVgrwl#>@3@!0nEEJ=2_ zk@8I7@zpclXH3EOC26Xs*SPmglpk0GE4@MjjFI>q&wKCJn8eso54QK)BDD)U!FLCv zIq+Ayv3PT{q?3t`LGxj7K=N;D-Q9MlIg>{q2`5)17luqevq&oId7#r4AuK6|a<6 zfVUp8^wtTwP>>Y_%aJfFPlSrnYMHcklxEb+azilk#YQV^Dn5tb^!6*9_G>PRz^Uw) zwVkukW&eK9!wyp-x{!UNkWq{*Wj747uOuJYC9%`%dJ^eEFxHhCs2auqZ3 z+9^znD5}5?IM2hK^qu^4z+{2V5$Am+8FBM61^d=Z)E9XCq!|cuK;P}90ac+RzH<;} z!q$W@3G0$+lI*8QRuwM3HQlm&VSelDvA-32l6hUKxnF;x1??>XHbvge{s3M&z=vCc zZ|k2aS!29 zcSnSG$mt9%2-L8bN`n3s)^#ujNak{{IhuF%HXxfA$Pr+hk5Q%!;~`b|=~HCWGSz#eg#{BQaSvI5G;sbCi?uY+TbozB zzVZIT3F^V2rK3!g5%zsFQUt1e99FpE9?XcXo#hTcy61EU$YA}G{k;m>X?~g^iTE}h zcr%R#OAF2PN39-~lne@l0Um`l&xdvkB4>qN>V<9%fgL6M9BeeWYvlw-3|~QpwI2lI z^f4tESqZH+I4d8cDdc&Z+zaMIAFUTsX&?V@48~xbdT5bPA1Q=mKk*NuAc7i4D=|QPQCrV7CI(`wE5=@0lvs#>#ndnU6pdWDOk$0j1QJVb5*~8hz zqYpQ*Hyk%aH<(X&5kWisQbr4GrTBQUfX{@<(R71q#urBIiHDCQ7Vt4c4MyVi^rJSO zLm!OLO&jY=R($LbJP`Rq^@n$y&UlcrKTi`%4vKH9I9obvI-j>1Z}4v@3gG18v4FYz zJ9fl=k3ERK;P?>*;0t}-%Fi$QRH#%|U;4W=vShThyx6J$Ki^C8yNI+RooI#hu`q$K zcS=KKLwrNlADmyF^z@a2YBp*RwKp|sHF34&3R2~+0-Yj@eB837GLN$OVxYKxMtkTJ z{H-TUFqzyec`F75Vi_V=7;``N4hg_9@mNb_Ab+po3tG%{T+}O)dlG8+%4A+bstZ8wV=`J3re9D;~#|X|9FH zcf`hT4RGJh8aK=cOtme4SuC308p~VOn37oNo9~&;8($kw7*$yknd@2}nsS?=o6VRz zn&s^ayGFXMxPV-<504JC_RV$|wr_SPw>!sp``}%pTvwe*4l1`#_H+&ocD@{Z+yhSh z9O@b!=r0<;>P?=RA8zcO7_AyQoynS6pMDMoXDFt#MAk)KLT_OT;q@Q|QoW161-!)x zQuq?zQ(abUanK3V<NT81BSoduBdOdZ$|bGTwLmM{4`EJ4 zzdI4LA}ge_rD{eQltaoPN91!Za~N#Z-zv58wJKKfc^GS{6fjwE0SQ6WDbz32GSm@N zY)LjrXN!NUD~rxaUUlxeQcFeT#mL4$T#V49H3hbEm>St{@ zIVd=&J4`&I-s7D49@g&Xo&X_+W`UD$BM3Yn;YeCN6Yj{awwcglzc!BGfaMFhzGt_d zS)XX{w(XZ(x(}ZgwZwaN--m!pXRPyh4du7yyRQQ>1H1!JsO(k9t>+B4-m~AAp^}3d zf)<5Odnba|MW#h=`yPzI+XtT_5_%I53Iqz+3dD>tjVp}jzb>HT5bIE6C0F$q{C?e$ z$B-M9bTBNo+P@m*R@PA-QWh%8DRdl~9SIw}8Hye$9hn{?7}Dp91)jOLUL(FI7D;Xn zo(>zz1z`$c@nOMZs$yw;z`W2Yq%net z#pxQLd?4S&ja;s|ff&#*K;jJ?5(*DS!9kgrR?3YM;LtZyUU1X+Z8yC-U**~)aAN}fvg zDhTsez1&(zRe(~FimGe)sf-7c9+7s3)8gyNHdm;vyt|4!-l_HpM_uS?;F?6Zn%DJo4g(H= z<$xvkR!JvKCrkETPE|&Fo})gi4*pC1TGx23Ym7$M;sER;nHBh6jqV~3$zi!4J&O zL5z?a7m}`$JRZ%LkRUcM*CE9+v^}8J$2mYTO*pYMEi!RDsXq3adE-62|JgwMwL16Xqo1)C%)n3IT4gI`BiKp3(dAxZSkk|7>^{yrR*GB66 zg!jbbY4{PxqAF4O&WIUQjQ~wuZ!{iF6hy1Nc0z&e!={}=8CY3;i7p?^SbV5 zHBsfePv~1|KhyL2j;9Nu4WVx41-ECj+eX*A&!K_8uDq|fM*P6-rnL&k-?Fi5sgp6ZOM&| z1G}e;sm;Odn04GS*l~PwZ7Sd5#FE5vdGl9Ky5APilAD`9&`-p|_)hG0BtblU=$GPc zURU>QU|XYE)xSq*}4-mMd>>ZxrY3p{%zKQRAkx%8&1 zX9Q7CG89tT&>xVKG9=P?i&ZN67~nFEu=Hs5$+L;lskW(>D~f-zh`FaxU8k| ziL|f!EZ-ua0SR{E+T{1;(WZ!}x)?K5y}8Bw+gc1y-&ig>uHYnGDZO z%4(x4D&#z6cV#zbcKAK{ZmPVMg$(u2SO(;l@Rw;2tEi~21qPJb?eurV)J+(wp{fJh z7c>@q+FG9Gao*NmHDznN$}QU++$qskyOu7bxV^Y>xzSpTF6beoot~XFm0it6=WnUg z*|iS{b3dig8+~N}>H@$m-xF!GyjRtV0JrzS-l@LHf*|8{%LvMdB8X}3UgC_ZLH4)E zz~g6`z$8-_=gP<1DC=}?6~`;btr@qev~K#WD5Q>Me`v}|XF#@4|$ZwZ0BqUE#49t$+7@WHI>3PQNJc@gz2>^Gij zR1auRB*nsn05_*?!3p7 z>^Q$0Vbe5HYnR}tc{yv%xBsx=l3Yl=M_#2PP$fu#4Dk$+kFXjL^6~hiAZaPl-L(?a zDvr11GDu7EC6Y0Ejfe{;2YZ0Tm1T)Cp4ws8={(W&iW#X8i6Kf~+FSB92`xUVte&Jy z2EIZ_VX|0IzHVl8oXUbOcQ7ZL$6b)0l7@Bpfpg&atM~IC-0MALHO1PnOHvj?tSg9sW<#N|dU} zwyx3>UJM7hT3OB=mXf=#*E#n3bpSh|{mZ$){d=CO`{Cs8-8BKj+n;`Jt;&g-Mev`Eo$h@K7#9(4V?d zpcts3zQ92dFF^Sfe(W7~he8&3yMKm-u?muOQNZm*84RLGvetp(rrL^!K9-X3#%T&R zrsCfW!zW{tLKs6IC`gt9uAoizewsu-?c4l~L^VMav8)V3E2~CaNyrsHT(mgXcZ7U{ zf(koKJT}^1|49QOE9`vG*vX=mc*9jd2#B~P7hL32T3)JE)>Pan)h1&ut}Y)}dRKfw zfr#+~DbJeNN+(f{CjH|qNnuurX9>WF)ueT#e0-(1czR*TZbV=Jb1d4N$qdWF)}+NG z?@($lWiNY&e(!ESar<%XIiW6S%NJY-rLkSI%~W8wLx$n1jKmhQlJrnMs6TeCg7o8p z-KIgVLDog_R~>CJLsH6QN{RY6b%?r9g?t6N?ajscl3)H}(a$=L0{*%d6DZX0qrk7+ zeOW5sl(RUrf9ulgXls96*x3?7Zkt;WR9kCre)`uIQ#tq1+<$< zc&5$J9h@z+$J|eR#G)wP*tVF}K^xP**Pgv2r`lH8R!1*=KhihB z@DJjoLlh+#nAh_3c$Mo?pXEwP$;&aAXO-p#XD8>{f85Oz%(>6n&b4qHaon)4aVSt^ z9P_z;iQ$>RS`xEkv_m_CoL%yo@FHcW>hb9{ZnOzlbaHkk`?WkMo?qe3VwqvR(7Gw| zNDgYMDauJ@i@>l%CHBkCkFt*bnArKXw10>*jN_Yn!LX%ytnOcNCm(82S6y0@*5eWO zQ9Hf(u+Y&i-=f^A*v8JzWtOw=tk4@gl!Q~(Tp&;OM`5BxXisVT+ofAy+s|KBSwFg| z?#mFoK1z6@dLer~`rtimT%F%%QQO1S!_mX>!byf_qnsl?3tOOZM@L3?5_4gQ;n@qZ?>bH$~Gs8bwa!%V|+on{eM(Kmng{osK zcRT&+h8xo!Pt5f1Z-cWYJogE~oI=(m_8doKo*IH$M{~Y@jf%BBW=<{-BcsdT+YULf zuImCiBQ}+$S-Y^ZIkai@)E<+rx@@?tY62Y9H(42;ezg4ME$gK+D`D^0HQ zKj|U(Z^MFu7a|zR+123Og#kvmD^T%4Roh6|g5%h!At%E2@H9Ir)I6RLy~1CXsCXAWh!OU zZge+Wy*#ccr}H(eC`&ajChD}&zxzT6o%lK^(m1zhlO9MNfL&Y!of3@GmsUVlok&dB zhqa1BLU8K;;3{gaayIvUe+v772bg*hCaUB0Bvop<)L+p=e7u3@Z4FNtZWv=TO+s71 z*riwMvSZNZAwEJKTDfVHm6@pXwJOwI;&zG~FVBzycAXCuc&d+!EgyD4TaXE2b*D={r`7-Hn`_U9I3&6q? z3jFef*`fAyyWcW;`C&^lP*3~sqo7UnZwiXj(SJC8b2X9=tntXHCxrkz3!0RhuH5I{ z8vR^NCyY_^TS_^;6K)rC(|N1>HZ$$yPhoS$FzLv1U-)~9xKbt!ju zb*Tqa5!FE*AwHc3rjxMaRxGA>Zi;m67D@Bp2Lj$#UChb2nAw=wDS*giWMl#^W)^%ZAc_Bl|D6d^Sh=}5@v*RYdU`T@axgo( zShBG3^768;Jm-*FlzlI4o?;tStZ5{TC|m50y{J+RNNd3uJ9??%?{@ z29S-DOW(%j11VAc7g>B`i8&N*O9_nY)z8(=QgRQegct`&laC7 z%SfeG%BbT+eV~s1Q$UR*`$I`Ih^m_0V3=sL_lwt7FTWS`W$@eZ$VPX(ef^Z&pp+vg z;dIC4hU<*rd*e^r2!Vi?2kO^7C0zUyrL~iB9magq1FwL5)6%~ku9HCAEzdlgs{jg5 z?yyhx@i*RFcw$9U!D+Wi;u)CuvhSppd=~MR&?EC&U=9+Fk;b4sYk|%@ddtI&@u`Wg z-nW&h%*;hkyb~C!l~uO8SeSEue~P2940C_OI20IuyW)m8&g9m0c!JTqe7qQS+aKUJ zqH5II4GjT~3c{ILRi`mg+C3-Q(>3cb`22kc06`x!2H0bl55~a(#<*B`;3MOKh$~$~ z!@SfSj>yy-I!HrrBU@E8Ma#9^04&GKxIV$S!%eKwirkl>rm+^5KN5{+hdS{e_nU35{4Q1_L7Z(t_v3K>p z!ri3USh@X|m+P6gw}8?}-aS#Vl-}K>q)8%ef!ZhoZH)jLN{(d1qPoisDba){_z0@g{HKj!AHUc+NvXz*_=mAQaQ zg~xrN4-arRJ%R7tecL41*sZKKZ{^BMKec^*eY1HBnwn4{y}d!!s%3H+0*@U4W;Zvt zh&YsA$~Eh&s~HI?dMYY1SooXrICoNdu+_W zfDuTI3^K@8cl`>>Q037qVQOP?oSBiaU!ukJT3Fmzg7@WMQrp!eDbqm1AUE5^|FMDk zbg5cn-n0X=p$@!rlhODG5En#Fc|Cl}-!hZSr8*@qEia~{tD6;@fb)ZcT~$TJaQ(X= zIUADL{=qM6whniG?$1lR;ryOm~KDhmw;hq786R|V8zVVB;Q4-FR< z7LbX)NVnxe0)7%U@+P*~$rwk#$LGCNLLds(N$G~d3}NzC3yb-mW_lUf=rZgF2(6>H zxjD_M>%fZg_VzkH2T#qml3)+z-GEjnX{dquC@DNVyy*{T@@%xbI&#%eUtEXXsudAG zmlbDXVb;Ap%!gg=4GfGhC?G-=d1vvNv-gdYt{k>qZ_RuI%17H;Yp-g)1BbRp6Dgyt zL;IAp)Kb!NF-S=*IG-kSxnRfeKSI8n4o7M!eI*;4$p*@ID7{-3`>!@1l`Buj;4+gv zAvvGGzr7Acv25|T=3x{UEPltLfoILOcxs|E!*=6;|B0?)+uYPd`g*1%X1bR^E_N^z zN2Msd=X8JZv&Zd`o?wF065=sF&uWUsTjAyHT^S1kk~cwP@@O&|(l;D|+4wlG+_rQ4 zDJ5cqK7jLkgE%Z_Y?pn1Z|@ArYT`pjY`vUtdE*dctEsE2YpMC|{4i&jG|2tbeHypb zK)|!EqdV3WCojLq#RdJAHtBbALm)S>-sQVVh($b!c+ueU$SzHXQdHO*D-xo`N~!8R zYX+*U;CSz+bUB^wWJ#7yYDz2?~cbHb3CUuc`G6R@kxM1s4dKX!6Tv`r33 zVj?e<%cTk$1F6H71ODz&0=b!1k?060R&9R=&9zT&(634Ja7apcy=HtsHtXGqS!^mc zacAj@PMv0#aGj8@YJIF4((rttpx<|Q(X)eCcz7{*5^U37Y9{|Q@g(EsSqmA&L`6k~ zCZHR92)2cyXZ|1$Nzq)hXAOxCkT6x9hxMLdxs^C#(5$Nv5pQa4*`vO=xUd-<*b8h* zo|hsBd|7c3uC6}86?b9?U@+MUdDIHCx7=)v5{E+nV8Y46GaB8P2i}L>K|T6TYokQs z^wA{~3>LB5<#Z|jYQaBQ(uzvLr`E@?^DquzOg~BQHtY?#= zQC}~w1Y;?1aou`bo6~e$)51ZYKQsk-Hx0^Pn6&f%($Ywa+#A^^t2u z79wy0yyUS2Se;}x-9F)(LAW2wC32+`W0mvkoO~enp-t zFrPltjyBE@D=VWpS9f)F^*M-JoMTA+8ay?{IH3-UAz>$?G;z#BhKZS+&a7RG%TA+% z+;fLTjE!iahDM0{_e8msad*PkLK8*hcRNbB)3*AvxvZbM^mEGozLr~5bQm*h&CycQ zGGJMR2*z+&6*(qGyA@I!FP3CBT77nwZ0OH)JFvLOW%DKwCbqx7vFikz{lU?(k}zJ{ z_I{=)&vJ8eS4Tr`#yYl?IKU)?NMWwBvONx}+JWr=XFRrDwo-_HT~1 z&HTGP;U5sni<0u@xW8=1+T!7*v!>@>AAeh1{E4NzCrX91Z`<>*@!NR7dQewamw~>L zN40?#&vzs~&kS#LtKNahN<>M67jGv9K0MsaorR_DAT6zxhogqf@v$89==eC%MKG0W zZ0-w{S!`C8uB$j_oB)ZvU6D zvLF%MT?U&(tQE}lWXS;M$z{X!D=;OXF~gMRC_|AWB)XFVMn*=q*|^f;R@{jzInPk4 z+O_s!!tj0Ag^J?aHA?iyi$J29d?b`7c(o*Uxx=M&&MIfKKh1>uFT%6?2iJ6?(_=fb zY8Yny5+#wG?s@ahnM`%v{kTXMjx+uvnqHA=#Ig)&k&y2w&6BfT`xMm~2@C$)C3{VoWMC>=Ui88QR;-1~_ctgRSDWvnBz)NFAJ4XE{P$=r zC-VJhA%TAHWXsSX{BdY}IR8F=-+NR<*5crM{^vWVlawRuULLNbW;j;u#5;9F3SYk! zo&to|7>MttkL&#KE#^23{={6x`_pZX&UdZ7pDp(h5nG#lrCgd6fcTj-(oRKBUkxb92+rX zToV-e`1oO9VVsz&T3~&scBPfjZqYsfVB4@8ZOW3>-rxF+C6;RAH7sSA2J)@PMf5e( z%Q3y`3YEYvl+lU9=zvGWFU%&@A16?MjH+p+PtRQF;Ti)F5kZQD1*qi(x$ zSE#s{^dIP&1Zm<)1)nl9dM&>BU!S)X?_<*=jF3Hz-o<;c0|V*AnVz1#6B7k*8}AV> zVA7~d%%jHWs>SQ-1Rqy@-81Wo@&HA2dxfcckhvMDGBhJSf=15inl1$V1a?Rt>eQgW zm3#5JvW!u49Ff%PlC(D43OJu&@3Zv2>SH;J_^Wq-aUA-PKu3gLBQWe{+;opLtTgnSt&L5;oElzd$Fh20hRB4yi@SXK=MUD5 zff?>K8U@X@m9>4Tbk-XX-CIeG$ye_tHj7tnl|yd@lp7bIuR_$5o3F0$$mAw2q|1+l zV|{&L6VrY2%-(o?VwtV6Oa7cm`Tv9Y@(y#X5##;U_~P)NH<`4!0;pEhDCGYDF@wX0 From 395b0c2943bc32311cf37b4bbb2140f03f485b16 Mon Sep 17 00:00:00 2001 From: Shawn Johnson Date: Sat, 16 Aug 2014 09:52:28 -0400 Subject: [PATCH 06/10] #9 - Replace generic Agency references with variables from config.yml. --- _config.yml | 10 ++++++++++ _includes/footer.html | 15 ++++++--------- _includes/header.html | 5 ++--- _includes/nav.html | 4 ++-- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/_config.yml b/_config.yml index b1ebd13..ad41ea9 100644 --- a/_config.yml +++ b/_config.yml @@ -6,3 +6,13 @@ baseurl: / exclude: ['.ruby-version', 'node_modules', 'package.json', 'bower.json'] sass: sass_dir: static/_sass + +defaults: + - + scope: + path: "" # an empty string here means all files in the project + values: + organization-name: "Agency" + organization-url: "http://agency.gov" + organization-email: user@agency.gov + source-code-policy.url: \ No newline at end of file diff --git a/_includes/footer.html b/_includes/footer.html index 126a16c..e796491 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -2,9 +2,9 @@

Open source

- As a work of the United States Government, source code released by the [Agency] is in the public + As a work of the United States Government, source code released by the {{ page.organization-name }} is in the public domain by default within the United States. - + View our full source code policy.

@@ -14,16 +14,13 @@

Open source

-
- - - +
\ No newline at end of file diff --git a/_includes/header.html b/_includes/header.html index 85365bc..ec0089c 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,10 +1,9 @@
-

[Agency] Open Tech

 +

{{ page.organization-name }} Open Tech

- + -
diff --git a/_includes/nav.html b/_includes/nav.html index 1ec94f0..cf486d3 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -1,6 +1,6 @@ -

Agency
API docs

-

Build your own tools using our API to access [Agency] public data.

+

{{ page.organization-name }}
API docs

+

Build your own tools using our API to access {{ page.organization-name }} public data.