Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/workspace.xml
This commit is contained in:
Martin Donnelly
commit
6568c964e4
@ -3,7 +3,7 @@
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="c2fd5632-2143-4c7e-8b0d-96d7692b700b" name="Default" comment="">
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/js/app.v3.js" afterPath="$PROJECT_DIR$/html/js/app.v3.js" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/lifestyle.js" afterPath="$PROJECT_DIR$/lifestyle.js" />
|
||||
</list>
|
||||
<ignored path="rinser.iws" />
|
||||
<ignored path=".idea/workspace.xml" />
|
||||
@ -24,14 +24,14 @@
|
||||
<favorites_list name="rinser" />
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<splitter split-orientation="horizontal" split-proportion="0.5">
|
||||
<splitter split-orientation="horizontal" split-proportion="0.7724336">
|
||||
<split-first>
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/html/index.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-2.6626506">
|
||||
<caret line="43" column="4" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="4" />
|
||||
<state vertical-scroll-proportion="-10.4">
|
||||
<caret line="41" column="15" selection-start-line="41" selection-start-column="15" selection-end-line="41" selection-end-column="15" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -40,18 +40,8 @@
|
||||
<file leaf-file-name="lifestyle.js" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/lifestyle.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="193" column="29" selection-start-line="193" selection-start-column="29" selection-end-line="193" selection-end-column="29" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="manifest.json" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/html/icons/manifest.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="9.153846">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<state vertical-scroll-proportion="0.82804567">
|
||||
<caret line="250" column="53" selection-start-line="250" selection-start-column="53" selection-end-line="250" selection-end-column="53" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -60,7 +50,7 @@
|
||||
<file leaf-file-name="browserconfig.xml" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/html/icons/browserconfig.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-0.0">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
@ -70,7 +60,7 @@
|
||||
<file leaf-file-name="package.json" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/package.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-12.423077">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
|
||||
<folding />
|
||||
</state>
|
||||
@ -80,13 +70,25 @@
|
||||
<file leaf-file-name="app.css" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/html/css/app.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-16.346153">
|
||||
<caret line="178" column="29" selection-start-line="178" selection-start-column="29" selection-end-line="178" selection-end-column="29" />
|
||||
<state vertical-scroll-proportion="-29.114286">
|
||||
<caret line="190" column="1" selection-start-line="190" selection-start-column="1" selection-end-line="190" selection-end-column="1" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="jquery.unveil.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/html/js/jquery.unveil.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="40" column="77" selection-start-line="40" selection-start-column="77" selection-end-line="40" selection-end-column="77" />
|
||||
<folding>
|
||||
<element signature="n#!!doc" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="news.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/news.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
@ -97,23 +99,11 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="build.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/gulp/build.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="15" column="3" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
|
||||
<folding>
|
||||
<element signature="e#0#43#0" expanded="false" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="gulpfile.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/gulpfile.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="82" column="3" selection-start-line="82" selection-start-column="3" selection-end-line="82" selection-end-column="3" />
|
||||
<caret line="83" column="3" selection-start-line="83" selection-start-column="3" selection-end-line="83" selection-end-column="3" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -122,17 +112,27 @@
|
||||
<file leaf-file-name="tech.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/tech.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-21.0">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="131" column="2" selection-start-line="131" selection-start-column="0" selection-end-line="142" selection-end-column="5" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="fix_images.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/plugins/fix_images.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
</leaf>
|
||||
</split-first>
|
||||
<split-second>
|
||||
<leaf>
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
|
||||
<file leaf-file-name="paleo.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/paleo.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
@ -143,31 +143,21 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="gulpfile.js" pinned="false" current-in-tab="false">
|
||||
<file leaf-file-name="gulpfile.js" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/gulpfile.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="30" column="38" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="40" />
|
||||
<state vertical-scroll-proportion="0.18888889">
|
||||
<caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="app.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/dist/js/app.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="106" column="10" selection-start-line="106" selection-start-column="10" selection-end-line="106" selection-end-column="10" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="app.v3.js" pinned="false" current-in-tab="true">
|
||||
<file leaf-file-name="app.v3.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.35473517">
|
||||
<caret line="75" column="0" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" />
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="56" column="11" selection-start-line="56" selection-start-column="11" selection-end-line="56" selection-end-column="11" />
|
||||
<folding>
|
||||
<element signature="e#0#43#0" expanded="false" />
|
||||
</folding>
|
||||
@ -175,20 +165,10 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="vendor.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/dist/js/vendor.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name=".jshintrc" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/.jshintrc">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-7.1923075">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
|
||||
<folding />
|
||||
</state>
|
||||
@ -237,22 +217,23 @@
|
||||
<option value="$PROJECT_DIR$/.gitignore" />
|
||||
<option value="$PROJECT_DIR$/html/css/cards.css" />
|
||||
<option value="$PROJECT_DIR$/html/css/md.css" />
|
||||
<option value="$PROJECT_DIR$/html/css/app.css" />
|
||||
<option value="$PROJECT_DIR$/gulp/build.js" />
|
||||
<option value="$PROJECT_DIR$/package.json" />
|
||||
<option value="$PROJECT_DIR$/.jshintrc" />
|
||||
<option value="$PROJECT_DIR$/html/index.html" />
|
||||
<option value="$PROJECT_DIR$/pipes-server.js" />
|
||||
<option value="$PROJECT_DIR$/dist/index.html" />
|
||||
<option value="$PROJECT_DIR$/html/js/shell.js" />
|
||||
<option value="$PROJECT_DIR$/paleo.js" />
|
||||
<option value="$PROJECT_DIR$/tech.js" />
|
||||
<option value="$PROJECT_DIR$/news.js" />
|
||||
<option value="$PROJECT_DIR$/lifestyle.js" />
|
||||
<option value="$PROJECT_DIR$/dist/js/vendor.js" />
|
||||
<option value="$PROJECT_DIR$/gulpfile.js" />
|
||||
<option value="$PROJECT_DIR$/dist/js/app.js" />
|
||||
<option value="$PROJECT_DIR$/html/js/app.v3.js" />
|
||||
<option value="$PROJECT_DIR$/dist/js/app.js" />
|
||||
<option value="$PROJECT_DIR$/gulpfile.js" />
|
||||
<option value="$PROJECT_DIR$/html/css/app.css" />
|
||||
<option value="$PROJECT_DIR$/html/index.html" />
|
||||
<option value="$PROJECT_DIR$/html/js/jquery.unveil.js" />
|
||||
<option value="$PROJECT_DIR$/lifestyle.js" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@ -267,10 +248,9 @@
|
||||
</gulpfiles>
|
||||
</component>
|
||||
<component name="ProjectFrameBounds">
|
||||
<option name="x" value="-8" />
|
||||
<option name="y" value="-8" />
|
||||
<option name="width" value="1616" />
|
||||
<option name="height" value="876" />
|
||||
<option name="x" value="-10" />
|
||||
<option name="width" value="1940" />
|
||||
<option name="height" value="2110" />
|
||||
</component>
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
|
||||
<OptionsSetting value="true" id="Add" />
|
||||
@ -297,7 +277,7 @@
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scratches" />
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<PATH>
|
||||
@ -316,6 +296,20 @@
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
<PATH>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="rinser" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="Rinser" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="plugins" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
<PATH>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="rinser" />
|
||||
@ -358,7 +352,11 @@
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="dist" />
|
||||
<option name="myItemId" value="html" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="css" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
@ -372,26 +370,26 @@
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="dist" />
|
||||
<option name="myItemId" value="html" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="js" />
|
||||
<option name="myItemId" value="assets" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
<pane id="Scratches" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="HbShouldOpenHtmlAsHb" value="" />
|
||||
<property name="recentsLimit" value="5" />
|
||||
<property name="settings.editor.selected.configurable" value="settings.nodejs" />
|
||||
<property name="settings.editor.selected.configurable" value="reference.settings.ics" />
|
||||
<property name="settings.editor.splitter.proportion" value="0.2" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/gulpfile.js" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/../keeper" />
|
||||
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="157" />
|
||||
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
|
||||
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="186" />
|
||||
@ -677,24 +675,54 @@
|
||||
<updated>1458048832162</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00027" summary="Updating to Version 3">
|
||||
<created>1458052564781</created>
|
||||
<created>1458079238959</created>
|
||||
<option name="number" value="00027" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1458052564781</updated>
|
||||
<updated>1458079238959</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="28" />
|
||||
<task id="LOCAL-00028" summary="limit image size to 900px">
|
||||
<created>1458079725571</created>
|
||||
<option name="number" value="00028" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1458079725571</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00029" summary="force images through our image server">
|
||||
<created>1458080920265</created>
|
||||
<option name="number" value="00029" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1458080920265</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00030" summary="force images through our image server">
|
||||
<created>1458081206294</created>
|
||||
<option name="number" value="00030" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1458081206294</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00031" summary="Max images out at 1140px wide">
|
||||
<created>1458081399688</created>
|
||||
<option name="number" value="00031" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1458081399688</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00032" summary="Reduced jpeg image quality to 80%, reduces a lot of bandwidth with not much visible impact.">
|
||||
<created>1458081989835</created>
|
||||
<option name="number" value="00032" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1458081989835</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="33" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
|
||||
<frame x="-10" y="0" width="1940" height="2110" extended-state="0" />
|
||||
<editor active="false" />
|
||||
<layout>
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24904943" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Gulp" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26100796" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33551913" sideWeight="0.34785393" order="7" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32987553" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.125" sideWeight="0.48606148" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13652945" sideWeight="0.48606148" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33506224" sideWeight="0.65214604" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32896176" sideWeight="0.4838976" order="7" side_tool="false" content_ui="tabs" />
|
||||
@ -703,6 +731,7 @@
|
||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32987553" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32850778" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
@ -749,7 +778,11 @@
|
||||
<MESSAGE value="reverting" />
|
||||
<MESSAGE value="debugging" />
|
||||
<MESSAGE value="Updating to Version 3" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Updating to Version 3" />
|
||||
<MESSAGE value="limit image size to 900px" />
|
||||
<MESSAGE value="force images through our image server" />
|
||||
<MESSAGE value="Max images out at 1140px wide" />
|
||||
<MESSAGE value="Reduced jpeg image quality to 80%, reduces a lot of bandwidth with not much visible impact." />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Reduced jpeg image quality to 80%, reduces a lot of bandwidth with not much visible impact." />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
@ -758,7 +791,7 @@
|
||||
<watches-manager />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/bin/www">
|
||||
<entry file="file://$PROJECT_DIR$/paleo.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
@ -766,11 +799,43 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/gulpfile.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="82" column="3" selection-start-line="82" selection-start-column="3" selection-end-line="82" selection-end-column="3" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="56" column="11" selection-start-line="56" selection-start-column="11" selection-end-line="56" selection-end-column="11" />
|
||||
<folding>
|
||||
<element signature="e#0#43#0" expanded="false" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/.jshintrc">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/bin/www">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/.editorconfig">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.55510205">
|
||||
<caret line="16" column="20" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -778,7 +843,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="41" column="2" selection-start-line="41" selection-start-column="2" selection-end-line="41" selection-end-column="2" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -786,7 +850,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -794,7 +857,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="8" column="33" selection-start-line="0" selection-start-column="0" selection-end-line="130" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -802,7 +864,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="183" column="4" selection-start-line="183" selection-start-column="4" selection-end-line="183" selection-end-column="4" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -810,7 +871,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -818,7 +878,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-0.65384614">
|
||||
<caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -826,7 +885,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-3.2692308">
|
||||
<caret line="5" column="9" selection-start-line="5" selection-start-column="9" selection-end-line="5" selection-end-column="9" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -834,7 +892,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -842,7 +899,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="10" selection-start-line="0" selection-start-column="10" selection-end-line="133" selection-end-column="5" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -850,7 +906,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-1.9615384">
|
||||
<caret line="3" column="48" selection-start-line="3" selection-start-column="48" selection-end-line="3" selection-end-column="48" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -858,7 +913,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-9.807693">
|
||||
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -866,7 +920,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -874,7 +927,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-5.0">
|
||||
<caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -882,7 +934,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -890,7 +941,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-0.0">
|
||||
<caret line="0" column="12330" selection-start-line="0" selection-start-column="12330" selection-end-line="0" selection-end-column="12330" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -898,7 +948,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-17.346153">
|
||||
<caret line="55" column="24" selection-start-line="55" selection-start-column="24" selection-end-line="55" selection-end-column="24" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -911,7 +960,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-2.3076923">
|
||||
<caret line="32" column="0" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -957,20 +1005,12 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/html/icons/manifest.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="9.153846">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/html/css/app.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-16.346153">
|
||||
<caret line="178" column="29" selection-start-line="178" selection-start-column="29" selection-end-line="178" selection-end-column="29" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/gulp/build.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
@ -983,7 +1023,7 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/package.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-12.423077">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
|
||||
<folding />
|
||||
</state>
|
||||
@ -997,27 +1037,10 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/dist/index.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/pipes-server.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="28" column="53" selection-start-line="28" selection-start-column="53" selection-end-line="28" selection-end-column="53" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/dist/index.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="4.923077">
|
||||
<caret line="0" column="39" selection-start-line="0" selection-start-column="39" selection-end-line="0" selection-end-column="39" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -1025,7 +1048,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="35" column="44" selection-start-line="35" selection-start-column="44" selection-end-line="35" selection-end-column="44" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -1037,22 +1059,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/html/index.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-2.6626506">
|
||||
<caret line="43" column="4" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="4" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/tech.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-21.0">
|
||||
<caret line="131" column="2" selection-start-line="131" selection-start-column="0" selection-end-line="142" selection-end-column="5" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/news.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
@ -1061,10 +1067,38 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/dist/js/vendor.js">
|
||||
<entry file="file://$PROJECT_DIR$/.jshintrc">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="56" column="11" selection-start-line="56" selection-start-column="11" selection-end-line="56" selection-end-column="11" />
|
||||
<folding>
|
||||
<element signature="e#0#43#0" expanded="false" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/html/assets/fm.png">
|
||||
<provider selected="true" editor-type-id="images">
|
||||
<state />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/html/assets/tf.png">
|
||||
<provider selected="true" editor-type-id="images">
|
||||
<state />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/html/css/app.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-29.114286">
|
||||
<caret line="190" column="1" selection-start-line="190" selection-start-column="1" selection-end-line="190" selection-end-column="1" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -1072,44 +1106,52 @@
|
||||
<entry file="file://$PROJECT_DIR$/gulpfile.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="30" column="38" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="40" />
|
||||
<caret line="83" column="3" selection-start-line="83" selection-start-column="3" selection-end-line="83" selection-end-column="3" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/.jshintrc">
|
||||
<entry file="file://$PROJECT_DIR$/html/index.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-7.1923075">
|
||||
<caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
|
||||
<state vertical-scroll-proportion="-10.4">
|
||||
<caret line="41" column="15" selection-start-line="41" selection-start-column="15" selection-end-line="41" selection-end-column="15" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/html/js/jquery.unveil.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="40" column="77" selection-start-line="40" selection-start-column="77" selection-end-line="40" selection-end-column="77" />
|
||||
<folding>
|
||||
<element signature="n#!!doc" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/tech.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="131" column="2" selection-start-line="131" selection-start-column="0" selection-end-line="142" selection-end-column="5" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/plugins/fix_images.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/lifestyle.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="193" column="29" selection-start-line="193" selection-start-column="29" selection-end-line="193" selection-end-column="29" />
|
||||
<state vertical-scroll-proportion="0.82804567">
|
||||
<caret line="250" column="53" selection-start-line="250" selection-start-column="53" selection-end-line="250" selection-end-column="53" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/dist/js/app.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="106" column="10" selection-start-line="106" selection-start-column="10" selection-end-line="106" selection-end-column="10" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.35473517">
|
||||
<caret line="75" column="0" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" />
|
||||
<folding>
|
||||
<element signature="e#0#43#0" expanded="false" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
</project>
|
||||
@ -56,6 +56,7 @@ gulp.task('styles', function() {
|
||||
gulp.task('partials', function() {
|
||||
gulp.src(['html/ejs/**/*']).pipe(gulp.dest('dist/ejs'));
|
||||
gulp.src(['html/icons/**/*']).pipe(gulp.dest('dist/icons'));
|
||||
gulp.src(['html/assets/fm.png']).pipe(gulp.dest('dist/assets'));
|
||||
});
|
||||
|
||||
|
||||
|
||||
@ -178,3 +178,14 @@ float:right;
|
||||
#footer, .mui-appbar {
|
||||
background-color: #775585;
|
||||
}
|
||||
|
||||
.card{
|
||||
padding-bottom:5PX;
|
||||
border-bottom:1px solid silver;
|
||||
}
|
||||
|
||||
div.content img {
|
||||
display: block;
|
||||
float: none !important;
|
||||
max-width: 1140px !important;
|
||||
}
|
||||
|
||||
@ -39,6 +39,8 @@
|
||||
|
||||
<script src="//cdn.muicss.com/mui-0.4.6/js/mui.min.js"></script>
|
||||
<script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
|
||||
<script src="//cdn.rawgit.com/jprichardson/string.js/master/dist/string.min.js"></script>
|
||||
|
||||
|
||||
<!-- build:vendor -->
|
||||
<script src="libs/microevent.js"></script>
|
||||
|
||||
@ -32,7 +32,14 @@
|
||||
flag = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (source && !flag) {
|
||||
|
||||
if (!S(source).startsWith('http')) {
|
||||
source = 'http://' + S(source).stripLeft('/').s;
|
||||
}
|
||||
source = 'http://image.silvrtree.co.uk/1140,fit,q80/' + source;
|
||||
|
||||
this.setAttribute("src", source);
|
||||
if (typeof callback === "function") callback.call(this);
|
||||
}
|
||||
|
||||
407
lifestyle.js
407
lifestyle.js
@ -1,225 +1,310 @@
|
||||
var outputFile = 'lifestyle',
|
||||
RssBraider = require('rss-braider'),
|
||||
fs = require('fs'),
|
||||
ejs = require('ejs'),
|
||||
read = require('fs').readFileSync,
|
||||
join = require('path').join,
|
||||
str = read(join(__dirname, '/templates/rss.ejs'), 'utf8'),
|
||||
feeds = {};
|
||||
var outputFile = 'lifestyle', RssBraider = require('rss-braider'), fs = require(
|
||||
'fs'), ejs = require('ejs'), read = require('fs').readFileSync, join = require(
|
||||
'path').join, str = read(join(__dirname, '/templates/rss.ejs'),
|
||||
'utf8'), feeds = {};
|
||||
|
||||
// Pull feeds from config files: ,
|
||||
// feeds.simple_test_feed = require("./config/feed").feed;
|
||||
// Or define in-line
|
||||
feeds.simple_test_feed = {
|
||||
"feed_name": "feed",
|
||||
"default_count": 1,
|
||||
"no_cdata_fields": [], // Don't wrap these fields in CDATA tags
|
||||
"meta": {
|
||||
"title": "Lifestyle",
|
||||
"description": "Combined Lifestyle Feed",
|
||||
'site_url': 'http://pipes.silvrtree.co.uk/lifestyle.xml'
|
||||
"feed_name": "feed", "default_count": 1, "no_cdata_fields": [], // Don't wrap these fields in CDATA tags
|
||||
"meta": {
|
||||
"title": "Lifestyle",
|
||||
"description": "Combined Lifestyle Feed",
|
||||
'site_url': 'http://pipes.silvrtree.co.uk/lifestyle.xml'
|
||||
}, "plugins": ['filter_last_week', 'fix_images', 'fix_scripts'], "sources": [
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds2.feedburner.com/acquire"
|
||||
},
|
||||
"plugins": ['filter_last_week', 'fix_images', 'fix_scripts'],
|
||||
"sources": [{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds2.feedburner.com/acquire"
|
||||
},
|
||||
{
|
||||
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "http://www.fhm.com/category/style/feed"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://www.fhm.com/category/style/feed"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://www.askmen.com/style.rss"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://www.askmen.com/style.rss"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://www.askmen.com/fine_living.rss"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://www.askmen.com/fine_living.rss"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://www.askmen.com/money.rss"
|
||||
}
|
||||
/*,
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://www.askmen.com/money.rss"
|
||||
}
|
||||
/*,
|
||||
{
|
||||
"count" : 100,
|
||||
"feed_url" : "http://abetterguy.com/feed/"
|
||||
}*/,
|
||||
|
||||
"count" : 100,
|
||||
"feed_url" : "http://abetterguy.com/feed/"
|
||||
}*/
|
||||
,
|
||||
{
|
||||
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "http://www.dmarge.com/feed"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://www.dmarge.com/feed"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://www.esquire.com/rss/all.xml"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://www.esquire.com/rss/all.xml"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/gearpatrol"
|
||||
},
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/gearpatrol"
|
||||
},
|
||||
{
|
||||
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "http://www.getkempt.com/rss.xml"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://www.getkempt.com/rss.xml"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/kinowear"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/kinowear"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://www.mensfitness.co.uk/feeds/all"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://www.mensfitness.co.uk/feeds/all"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/TheArtOfManliness"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/TheArtOfManliness"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://www.trunkclub.com/blog/feed"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://www.trunkclub.com/blog/feed"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/acontinuouslean/"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/acontinuouslean/"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://www.fashionbeans.com/feed/"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://www.fashionbeans.com/feed/"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/MensFlair?format=xml"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/MensFlair?format=xml"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/TheChoosyBeggar"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/TheChoosyBeggar"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://www.valetmag.com/distribution/rss_all.xml"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://www.valetmag.com/distribution/rss_all.xml"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://putthison.com/rss"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://putthison.com/rss"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://dieworkwear.com/rss"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://dieworkwear.com/rss"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://menofhabit.tumblr.com/rss"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://menofhabit.tumblr.com/rss"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://www.hodinkee.com/blog/rss.xml"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://www.hodinkee.com/blog/rss.xml"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/firstinwatches"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/firstinwatches"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds2.feedburner.com/primermagazine/otzU"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds2.feedburner.com/primermagazine/otzU"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://chrisguillebeau.com/3x5/feed/"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://chrisguillebeau.com/3x5/feed/"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/TheAwesomer"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/TheAwesomer"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://bondclothes.blogspot.com/feeds/posts/default"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://bondclothes.blogspot.com/feeds/posts/default"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://affordablebond007.tumblr.com/rss"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://affordablebond007.tumblr.com/rss"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://thecozyspace.tumblr.com/rss"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://thecozyspace.tumblr.com/rss"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://www.gentlemansgazette.com/feed/"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://www.gentlemansgazette.com/feed/"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/wellspent"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/wellspent"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://hespokestyle.com/feed/"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://hespokestyle.com/feed/"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "http://effortlessgent.com/feed/"
|
||||
},
|
||||
{
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "http://effortlessgent.com/feed/"
|
||||
}, {
|
||||
"count": 100,
|
||||
"feed_url": "https://feeds.feedburner.com/thisfits"
|
||||
},
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "http://www.businessoffashion.com/syndication/feed"
|
||||
},
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "http://dieworkwear.com/rss"
|
||||
},
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "http://georgehahn.com/feed/"
|
||||
},
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "http://www.mensjournal.com/services/rss/gear"
|
||||
}
|
||||
|
||||
"count": 100,
|
||||
"feed_url": "https://feeds.feedburner.com/thisfits"
|
||||
}
|
||||
]
|
||||
,
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "http://www.mensjournal.com/services/rss/food-drink"
|
||||
}
|
||||
|
||||
,
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "http://www.mensjournal.com/services/rss/travel"
|
||||
}
|
||||
|
||||
,
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "http://www.mensjournal.com/services/rss/adventure"
|
||||
}
|
||||
|
||||
,
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "http://www.mensjournal.com/services/rss/health-fitness"
|
||||
}
|
||||
|
||||
,
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "http://www.mensjournal.com/services/rss/style"
|
||||
},
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "https://feeds.feedburner.com/uncrate"
|
||||
},
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "https://feeds.feedburner.com/ManOfMany"
|
||||
},
|
||||
{
|
||||
"count": 100,
|
||||
"feed_url": "http://www.mantelligence.com/feed/"
|
||||
}
|
||||
|
||||
]
|
||||
};
|
||||
var braider_options = {
|
||||
feeds: feeds,
|
||||
indent: " ",
|
||||
date_sort_order: "desc", // Newest first
|
||||
log_level: "warn",
|
||||
dedupe_fields: ['link', 'guid'],
|
||||
plugins_directories: [__dirname + "/plugins/"]
|
||||
feeds: feeds,
|
||||
indent: " ",
|
||||
date_sort_order: "desc", // Newest first
|
||||
log_level: "warn",
|
||||
dedupe_fields: ['link', 'guid'],
|
||||
plugins_directories: [__dirname + "/plugins/"]
|
||||
};
|
||||
var rss_braider = RssBraider.createClient(braider_options);
|
||||
|
||||
// Override logging level (debug, info, warn, err, off)
|
||||
//rss_braider.logger.level('off');
|
||||
|
||||
rss_braider.processFeed('simple_test_feed', 'json', function (err, data) {
|
||||
if (err) {
|
||||
rss_braider.processFeed('simple_test_feed', 'json', function(err, data) {
|
||||
if (err) {
|
||||
return console.log(err);
|
||||
}
|
||||
|
||||
var j = JSON.parse(data);
|
||||
var ejsOutput = ejs.compile(str)(j);
|
||||
|
||||
fs.writeFile(__dirname + "/dist/" + outputFile + ".json",
|
||||
data,
|
||||
function(err) {
|
||||
if (err) {
|
||||
return console.log(err);
|
||||
}
|
||||
}
|
||||
|
||||
var j = JSON.parse(data);
|
||||
var ejsOutput = ejs.compile(str)(j);
|
||||
|
||||
fs.writeFile(__dirname + "/dist/" + outputFile + ".json", data, function (err) {
|
||||
if (err) {
|
||||
return console.log(err);
|
||||
}
|
||||
|
||||
console.log("The file was saved!");
|
||||
console.log("The file was saved!");
|
||||
});
|
||||
|
||||
fs.writeFile(__dirname + "/dist/" + outputFile + ".html", ejsOutput, function (err) {
|
||||
fs.writeFile(__dirname + "/dist/" + outputFile + ".html",
|
||||
ejsOutput,
|
||||
function(err) {
|
||||
|
||||
if (err) {
|
||||
return console.log(err);
|
||||
}
|
||||
if (err) {
|
||||
return console.log(err);
|
||||
}
|
||||
|
||||
console.log("The file was saved!");
|
||||
console.log("The file was saved!");
|
||||
});
|
||||
});
|
||||
|
||||
/*
|
||||
rss_braider.processFeed('simple_test_feed', 'rss', function (err, data) {
|
||||
rss_braider.processFeed('simple_test_feed', 'rss', function (err, data) {
|
||||
|
||||
fs.writeFile(__dirname + "/html/" + outputFile + ".xml", data, function (err) {
|
||||
if (err) {
|
||||
return console.log(err);
|
||||
}
|
||||
fs.writeFile(__dirname + "/html/" + outputFile + ".xml", data, function (err) {
|
||||
if (err) {
|
||||
return console.log(err);
|
||||
}
|
||||
|
||||
console.log("The file was saved!");
|
||||
});
|
||||
});
|
||||
*/
|
||||
console.log("The file was saved!");
|
||||
});
|
||||
});
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user