Merge pull request #1 from fluentdesk/dev

Interim release changes
This commit is contained in:
JD committed 2015-10-26 04:54:52 -04:00
commit a30395cf29
21 files changed
+20 -20

No files matched your search

+1
View File
@@ -1 +1,2 @@
# It is pitch black. You are likely to be eaten by a grue. # It is pitch black. You are likely to be eaten by a grue.
informatic-new/
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "watermark", "name": "watermark",
"version": "0.2.0-alpha", "version": "0.3.0-alpha",
"description": "Themes and exemplars for FluentCV.", "description": "Themes and exemplars for FluentCV.",
"private": true, "private": true,
"repository": { "repository": {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
{# <!--
[[[
modern/doc.xml title: Modern (PDF)
An XML-driven Microsoft Word resume template for FluentCV's "modern" theme. description: An HTML-driven PDF resume template for FluentCV's "modern" theme.
Uses the MS Word 2003 XML format. engine: Underscore
]]]
#} -->
<?mso-application progid="Word.Document"?> <?mso-application progid="Word.Document"?>
<w:wordDocument xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve"> <w:wordDocument xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve">
<w:ignoreSubtree w:val="http://schemas.microsoft.com/office/word/2003/wordml/sp2"/> <w:ignoreSubtree w:val="http://schemas.microsoft.com/office/word/2003/wordml/sp2"/>
File renamed without changes.
@@ -1,10 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
{# <!-- [[[
title: Modern (HTML)
modern/md.txt description: An HTML resume template for FluentCV's "modern" theme.
An HTML resume template for FluentCV's "modern" theme. engine: Underscore
]]] -->
#}
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
@@ -13,6 +12,7 @@
<title>{{ r.basics.name }}</title> <title>{{ r.basics.name }}</title>
<link href='https://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
{{ headFragment }}
{% if( cssInfo.file ) { %} {% if( cssInfo.file ) { %}
<link href="{{ cssInfo.file }}" rel="stylesheet" type="text/css"> <link href="{{ cssInfo.file }}" rel="stylesheet" type="text/css">
{% } else { %} {% } else { %}
File renamed without changes.
@@ -1,10 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
{# <!-- [[[
title: Modern (PDF)
modern/pdf.html description: An HTML-driven PDF resume template for FluentCV's "modern" theme.
An HTML-driven PDF resume template for FluentCV's "modern" theme. engine: Underscore
]]] -->
#}
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
File renamed without changes.
View File
Whitespace-only changes.