Merge pull request #14 from fluentdesk/v0.7.0-beta

v0.7.0 beta
fresh-standard · Dec 19, 2015 · 3866e10 · 3866e10
2 parents c77fcac + 82c80fb
commit 3866e10
Show file tree

Hide file tree

Showing 56 changed files with 3,423 additions and 1,635 deletions.
diff --git a/README.md b/README.md
@@ -1,19 +1,22 @@
 fluent-themes
 =============
+
 Stylized templates for your résumé and/or CV, compatible with [FRESH][f] and
 [JSON Resume][jrs] formats.
 
-- `awesome`: A technical resume theme based on [Awesome-CV][awe].
-- `minimist`: An unstyled barebones theme.
-- `modern`: A middle of the road theme with a modern look 'n feel.
-- `hello-world`: A simple-as-possible example theme.
-- `compact`: A visually dense/compact theme.
+- [positive][t-positive]: A visually dense/compact theme.
+- [modern][t-modern]: A middle of the road theme with a modern look 'n feel.
+- [compact][t-compact]: A visually dense/compact theme.
+- [awesome][t-awesome]: A technical resume theme based on [Awesome-CV][awe].
+- [minimist][t-minimist]: An unstyled barebones theme.
+- [hello-world][t-hello]: A simple-as-possible example theme.
 - New themes weekly.
 
 ## Install
 
 You don't need to install this repository to use the themes; just install
-[FluentCV Desktop][1] or [Command Line][2]. Otherwise you can install the latest official standalone version of the theme repository over NPM...
+[FluentCV Desktop][1] or [Command Line][2]. Otherwise you can install the latest
+official standalone version of the theme repository over NPM...
 
 `[sudo] npm install fluent-themes --save`
 
@@ -29,7 +32,9 @@ multiple formats. Each theme lives in a separate folder and consists of:
 - Any necessary support files (CSS, LaTeX partials, etc.).
 - A dedicated README.
 
-Within its containing folder, a theme can have an arbitrary structure provided you either a) follow a standard naming convention or b) specify your theme files in your theme's JSON file. If you can do `{{ r.name }}` in a template file you
+Within its containing folder, a theme can have an arbitrary structure provided
+you either a) follow a standard naming convention or b) specify your theme files
+in your theme's JSON file. If you can do `{{ r.name }}` in a template file you
 can work with FRESH themes.
 
 ## Contribute
@@ -46,7 +51,13 @@ MIT. See [LICENSE.md][1] for details.
 
 [1]: http://fluentcv.com
 [2]: https://github.com/fluentdesk/fluentcv
-[3]: ../LICENSE.md
+[3]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
 [f]: https://github.com/fluentdesk/FRESCA
 [jrs]: http://jsonresume.org
 [awe]: https://github.com/posquit0/Awesome-CV
+[t-awesome]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/awesome
+[t-minimist]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/minimist
+[t-modern]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/modern
+[t-hello]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/hello-world
+[t-compact]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/compact
+[t-positive]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/positive
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fluent-themes",
-  "version": "0.6.3-beta",
+  "version": "0.7.0-beta",
   "description": "Multiformat résumé themes and templates for FluentCV and JSON Resume.",
   "repository": {
     "type": "git",

diff --git a/themes/awesome/README.md b/themes/awesome/README.md
@@ -1,12 +1,12 @@
 Theme: Awesome
 ==============
 An experimental FluentCV theme based on [Byungjin Park's][author]
-[Awesome-CV][acv] resume template for LaTeX.
+[Awesome-CV][acv] résumé template for LaTeX.
 
 ## Use
 
 1. Run `fluentcv build my-resume.json to out/my-resume.all -t awesome` to create
-a LaTeX resume in the Awesome-CV style using your FRESH or JSON Resume resume.
+a LaTeX résumé in the Awesome-CV style using your FRESH or JSON Resume resume.
 
 2. Generate a styled PDF by running `xelatex my-resume.tex` in the `examples`
 folder generated in Step 1. You'll need a valid and updated LaTeX environment on

diff --git a/themes/compact/README.md b/themes/compact/README.md
@@ -1,3 +1,5 @@
 Theme: Compact
 ==============
-A compact, no-nonsense resume theme for FluentCV.
+A compact, no-frills résumé theme for FluentCV.
+
+![](compact.png)
diff --git a/themes/compact/compact.png b/themes/compact/compact.png
diff --git a/themes/compact/src/compact-doc.xml b/themes/compact/src/compact-doc.xml
@@ -161,7 +161,7 @@
       <w:rPr>
         <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
         <wx:font wx:val="Calibri"/>
-        <w:sz-cs w:val="24"/>
+        <w:sz-cs w:val="20"/>
         <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
       </w:rPr>
       <w:pPr>
@@ -175,17 +175,20 @@
       <w:link w:val="Heading1Char"/>
       <w:rsid w:val="00505903"/>
       <w:pPr>
-        <w:spacing w:before="100" w:before-autospacing="on"/>
+        <w:spacing w:before="100" w:before-autospacing="off"/>
         <w:outlineLvl w:val="0"/>
+        <w:pBdr>
+          <w:bottom w:val="single" w:sz="6" w:space="1" w:color="auto" />
+        </w:pBdr>
       </w:pPr>
       <w:rPr>
         <wx:font wx:val="Calibri"/>
         <w:b/>
         <w:b-cs/>
-        <w:color w:val="AEAAAA"/>
-        <w:kern w:val="36"/>
-        <w:sz w:val="32"/>
-        <w:sz-cs w:val="48"/>
+        <!-- <w:color w:val="AEAAAA"/> -->
+        <w:kern w:val="20"/>
+        <w:sz w:val="20"/>
+        <w:sz-cs w:val="20"/>
       </w:rPr>
     </w:style>
     <w:style w:type="paragraph" w:styleId="Heading2">
@@ -195,15 +198,15 @@
       <w:link w:val="Heading2Char"/>
       <w:rsid w:val="00505903"/>
       <w:pPr>
-        <w:spacing w:before="120"/>
+        <w:spacing w:before="60"/>
         <w:outlineLvl w:val="1"/>
       </w:pPr>
       <w:rPr>
         <wx:font wx:val="Calibri"/>
         <w:b/>
         <w:b-cs/>
         <w:caps/>
-        <w:sz-cs w:val="36"/>
+        <w:sz-cs w:val="20"/>
       </w:rPr>
     </w:style>
     <w:style w:type="paragraph" w:styleId="Heading3">
@@ -276,7 +279,7 @@
         <w:b/>
         <w:b-cs/>
         <w:caps/>
-        <w:sz-cs w:val="36"/>
+        <w:sz-cs w:val="20"/>
       </w:rPr>
     </w:style>
     <w:style w:type="character" w:styleId="Heading3Char">
@@ -286,8 +289,8 @@
       <w:rPr>
         <w:rFonts w:ascii="Calibri Light" w:fareast="Times New Roman" w:h-ansi="Calibri Light" w:cs="Times New Roman"/>
         <w:color w:val="1F4D78"/>
-        <w:sz w:val="24"/>
-        <w:sz-cs w:val="24"/>
+        <w:sz w:val="20"/>
+        <w:sz-cs w:val="20"/>
       </w:rPr>
     </w:style>
     <w:style w:type="paragraph" w:styleId="NormalWeb">
@@ -312,8 +315,8 @@
         <w:b-cs/>
         <w:color w:val="AEAAAA"/>
         <w:kern w:val="36"/>
-        <w:sz w:val="32"/>
-        <w:sz-cs w:val="48"/>
+        <w:sz w:val="20"/>
+        <w:sz-cs w:val="20"/>
       </w:rPr>
     </w:style>
     <w:style w:type="character" w:styleId="Strong">
@@ -349,11 +352,12 @@
       <w:rPr>
         <w:rFonts w:ascii="Calibri Light" w:h-ansi="Calibri Light"/>
         <wx:font wx:val="Calibri Light"/>
-        <w:caps/>
+        <!-- <w:caps/> -->
         <w:spacing w:val="-10"/>
         <w:kern w:val="28"/>
-        <w:sz w:val="48"/>
-        <w:sz-cs w:val="56"/>
+        <w:sz w:val="20"/>
+        <w:sz-cs w:val="20"/>
+        <w:caps/>
       </w:rPr>
     </w:style>
     <w:style w:type="character" w:styleId="TitleChar">
@@ -362,11 +366,11 @@
       <w:rsid w:val="002D3B7B"/>
       <w:rPr>
         <w:rFonts w:ascii="Calibri Light" w:h-ansi="Calibri Light"/>
-        <w:caps/>
+        <!-- <w:caps/> -->
         <w:spacing w:val="-10"/>
         <w:kern w:val="28"/>
-        <w:sz w:val="48"/>
-        <w:sz-cs w:val="56"/>
+        <w:sz w:val="20"/>
+        <w:sz-cs w:val="20"/>
       </w:rPr>
     </w:style>
     <w:style w:type="paragraph" w:styleId="ListParagraph">
@@ -399,7 +403,7 @@
       <w:rsid w:val="00A210E1"/>
       <w:rPr>
         <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
-        <w:sz-cs w:val="24"/>
+        <w:sz-cs w:val="20"/>
       </w:rPr>
     </w:style>
   </w:styles>
@@ -454,25 +458,16 @@
           </w:tabs>
         </w:pPr>
         <w:r>
+          <w:rPr>
+            <w:sz w:val="28"/>
+            <w:b/>
+          </w:rPr>
           <w:t>{{ r.name }}</w:t>
         </w:r>
         <w:r>
           <w:tab/>
         </w:r>
-        <w:r>
-          <w:rPr>
-            <w:color w:val="DADADA"/>
-          </w:rPr>
-          <w:t>{{ r.info.label }}</w:t>
-        </w:r>
-      </w:p>
-      <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="00505903" wsp:rsidP="00C146CA">
-        <w:pPr>
-          <w:rPr>
-            <w:sz-cs w:val="20"/>
-          </w:rPr>
-        </w:pPr>
-        <w:hlink w:dest="mailto:{{ r.contact.email }}">
+        <w:hlink w:dest="mailto:{{{ r.contact.email }}}">
           <w:r wsp:rsidRPr="003876BF">
             <w:rPr>
               <w:rStyle w:val="Hyperlink"/>
@@ -499,13 +494,13 @@
           </w:rPr>
           <w:t> - </w:t>
         </w:r>
-        <w:hlink w:dest="{{ r.contact.website }}">
+        <w:hlink w:dest="{{{ r.contact.website }}}">
           <w:r wsp:rsidRPr="003876BF">
             <w:rPr>
               <w:rStyle w:val="Hyperlink"/>
               <w:sz-cs w:val="20"/>
             </w:rPr>
-            <w:t>{{ r.contact.website }}</w:t>
+            <w:t>{{trimURL r.contact.website }}</w:t>
           </w:r>
         </w:hlink>
       </w:p>

diff --git a/themes/compact/src/compact-html.css b/themes/compact/src/compact-html.css
@@ -1,5 +1,5 @@
 html, body, main, section, header, ul, p, h1, h2, h3 {
-  font-family: Helvetica, sans-serif;
+  font-family: Calibri, 'Helvetica Neue', Helvetica, 'Segoe UI', sans-serif;
   font-size: 12px;
   margin: 0; padding: 0;
   display: block;
@@ -26,6 +26,11 @@ h3 {
   font-size: 1em;
 }
 
+hr {
+  border: none;
+  border-top: 1px solid #B3B3B3;
+}
+
 main {
   padding: 15px;
   max-width: 700px;
@@ -59,16 +64,22 @@ thead {
 main > header {
   width: 100%;
   float: left;
-  margin-bottom: 1em;
+  margin-bottom: 0;
+  position: relative;
 }
 
 
 main > header > h1 {
   float: left;
   font-size: 1.5em;
+  text-transform: uppercase;
+  line-height: 1;
 }
 #contact {
   float: right;
+  position: absolute;
+  right: 0;
+  bottom: 0;
 }
 
 #contact > div {

diff --git a/themes/compact/src/compact-html.html b/themes/compact/src/compact-html.html
@@ -2,26 +2,25 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>{{ r.name }}</title>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
+    <title>{{ RAW.name }}</title>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
     <link href="compact-html.css" rel="stylesheet" type="text/css">
   </head>
   <body>
     <main>
       <header>
-        <h1>{{ r.name }}</h1>
+        <h1>{{{ r.name }}}</h1>
         <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{ RAW.contact.email }}">{{ r.contact.email }}</a></div>{{/if}}
-          {{#if r.contact.phone}}<div class="phone">{{ r.contact.phone }}</div>{{/if}}
-          {{#if r.contact.website}}<div class="website"><a href="{{ RAW.contact.website }}">{{ r.contact.website }}</a></div>{{/if}}
+          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
+          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
+          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/if}}
         </div>
       </header>
 
 
 {{#if r.info.brief}}
       <section id="summary">
-        {{ r.info.brief }}
+        {{{ r.info.brief }}}
       </section>
 {{/if}}
 
@@ -58,7 +57,7 @@ <h2><span class="fa fa-code"></span> Skills</h2><hr>
         <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2><hr>
         </header>
 
-        {{#each r.employment.history }}
+        {{#each r.employment.history}}
           {{#compare @index 4 operator="<"}}
             <h3><em>{{ position }}</em>,
               {{#if url }}
@@ -67,11 +66,11 @@ <h3><em>{{ position }}</em>,
               {{ employer }}
               {{/if}}
               <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
-            <p style="clear: both;">{{ summary }}</p>
+            <p style="clear: both;">{{{ summary }}}</p>
             {{#if highlights}}
               <ul>
               {{#each highlights}}
-                <li>{{ this }}</li>
+                <li>{{{ this }}}</li>
               {{/each}}
               </ul>
             {{/if}}
@@ -84,7 +83,7 @@ <h3>Previously...</h3>
             <ul>
             {{/compare}}
 
-            <li>{{ position }}, {{ employer }}</li>
+            <li>{{{ position }}}, {{{ employer }}}</li>
 
             {{#if @last}}
             </ul>
@@ -101,7 +100,7 @@ <h3>Previously...</h3>
         <h2><span class="fa fa-mortar-board"></span> Education</h2><hr>
         </header>
         {{#each r.education.history}}
-          <h3>{{ institution }} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+          <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
         {{/each}}
 
       </section>
@@ -120,11 +119,11 @@ <h3><em>{{ position }}</em>,
             {{ organization }}
             {{/if}}
             <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-          <p style="clear: both;">{{ summary }}</p>
+          <p style="clear: both;">{{{ summary }}}</p>
           {{#if highlights}}
             <ul>
             {{#each highlights}}
-              <li>{{ this }}</li>
+              <li>{{{ this }}}</li>
             {{/each}}
             </ul>
           {{/if}}
@@ -139,9 +138,9 @@ <h3><em>{{ position }}</em>,
         <h2><span class="fa fa-book"></span> Writing</h2><hr>
         </header>
         {{#each r.writing }}
-          <h3><em>{{#if url}}<a href="{{ url }}">{{ title }}</a>{{else}}{{ title }}{{/if}}</em>,
+          <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
             {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
-        {{# if summary}}{{ summary }}{{/if}}
+        {{# if summary}}{{{ summary }}}{{/if}}
         {{/each}}
       </section>
 {{/if}}