-
-
Save bangpound/77de3efa70c7e771da2b939734d93690 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/.idea/misc.xml b/.idea/misc.xml | |
index ed42289..385b261 100644 | |
--- a/.idea/misc.xml | |
+++ b/.idea/misc.xml | |
@@ -16,7 +16,6 @@ | |
<exe-path>/usr/local/bin/bower</exe-path> | |
<config-path /> | |
</component> | |
- <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | |
<component name="ProjectInspectionProfilesVisibleTreeState"> | |
<entry key="Project Default"> | |
<profile-state> | |
diff --git a/.idea/workspace.xml b/.idea/workspace.xml | |
index c8b2c67..65ddc13 100644 | |
--- a/.idea/workspace.xml | |
+++ b/.idea/workspace.xml | |
@@ -1,6 +1,34 @@ | |
<?xml version="1.0" encoding="UTF-8"?> | |
<project version="4"> | |
<component name="ChangeListManager"> | |
+ <list default="true" id="dd3a56d0-f535-4285-a446-4308c58b2ff3" name="Default" comment=""> | |
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/compiler.xml" /> | |
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/copyright/profiles_settings.xml" /> | |
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/fieldmuseum-website.iml" /> | |
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> | |
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" /> | |
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/config.codekit" afterPath="$PROJECT_DIR$/patternlab/config.codekit" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/01-extends/animations.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/01-extends/animations.scss" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/03-atoms/buttons.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/03-atoms/buttons.scss" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/03-atoms/links.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/03-atoms/links.scss" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/03-atoms/toggles.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/03-atoms/toggles.scss" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/blocks/person-summary.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/blocks/person-summary.scss" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/blocks/promos.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/blocks/promos.scss" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/components.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/components.scss" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/lists.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/lists.scss" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/media/gallery.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/media/gallery.scss" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/navigation/areas.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/navigation/areas.scss" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/navigation/breadcrumbs.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/navigation/breadcrumbs.scss" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/navigation/main.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/navigation/main.scss" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/navigation/target.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/04-molecules/navigation/target.scss" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/05-organisms/global.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/05-organisms/global.scss" /> | |
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patternlab/source/sass/style.scss" afterPath="$PROJECT_DIR$/patternlab/source/sass/style.scss" /> | |
+ </list> | |
+ <ignored path="fieldmuseum-website.iws" /> | |
+ <ignored path=".idea/workspace.xml" /> | |
+ <ignored path=".idea/dataSources.local.xml" /> | |
+ <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | |
<option name="TRACKING_ENABLED" value="true" /> | |
<option name="SHOW_DIALOG" value="false" /> | |
<option name="HIGHLIGHT_CONFLICTS" value="true" /> | |
@@ -10,6 +38,86 @@ | |
<component name="CreatePatchCommitExecutor"> | |
<option name="PATCH_PATH" value="" /> | |
</component> | |
+ <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> | |
+ <component name="FavoritesManager"> | |
+ <favorites_list name="fieldmuseum-website" /> | |
+ </component> | |
+ <component name="FileEditorManager"> | |
+ <leaf> | |
+ <file leaf-file-name=".gitignore" pinned="false" current-in-tab="false"> | |
+ <entry file="file://$PROJECT_DIR$/.gitignore"> | |
+ <provider selected="true" editor-type-id="text-editor"> | |
+ <state relative-caret-position="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="style.scss" pinned="false" current-in-tab="false"> | |
+ <entry file="file://$PROJECT_DIR$/patternlab/source/sass/style.scss"> | |
+ <provider selected="true" editor-type-id="text-editor"> | |
+ <state relative-caret-position="435"> | |
+ <caret line="29" column="35" selection-start-line="29" selection-start-column="35" selection-end-line="29" selection-end-column="35" /> | |
+ <folding /> | |
+ </state> | |
+ </provider> | |
+ </entry> | |
+ </file> | |
+ <file leaf-file-name="iCheckLoader.coffee" pinned="false" current-in-tab="false"> | |
+ <entry file="file://$PROJECT_DIR$/patternlab/source/js/build/application/defer/iCheckLoader.coffee"> | |
+ <provider selected="true" editor-type-id="text-editor"> | |
+ <state relative-caret-position="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="footer.coffee" pinned="false" current-in-tab="false"> | |
+ <entry file="file://$PROJECT_DIR$/patternlab/source/js/build/application/defer/footer.coffee"> | |
+ <provider selected="true" editor-type-id="text-editor"> | |
+ <state relative-caret-position="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="promos.scss" pinned="false" current-in-tab="true"> | |
+ <entry file="file://$PROJECT_DIR$/patternlab/source/sass/04-molecules/blocks/promos.scss"> | |
+ <provider selected="true" editor-type-id="text-editor"> | |
+ <state relative-caret-position="435"> | |
+ <caret line="93" column="17" selection-start-line="93" selection-start-column="17" selection-end-line="93" selection-end-column="17" /> | |
+ <folding /> | |
+ </state> | |
+ </provider> | |
+ </entry> | |
+ </file> | |
+ </leaf> | |
+ </component> | |
+ <component name="Git.Settings"> | |
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> | |
+ </component> | |
+ <component name="IdeDocumentHistory"> | |
+ <option name="CHANGED_PATHS"> | |
+ <list> | |
+ <option value="$PROJECT_DIR$/patternlab/source/sass/style.scss" /> | |
+ </list> | |
+ </option> | |
+ </component> | |
+ <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" /> | |
+ <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" /> | |
+ <component name="JsGulpfileManager"> | |
+ <detection-done>true</detection-done> | |
+ <sorting>DEFINITION_ORDER</sorting> | |
+ </component> | |
+ <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | |
+ <component name="ProjectFrameBounds"> | |
+ <option name="y" value="22" /> | |
+ <option name="width" value="1920" /> | |
+ <option name="height" value="1174" /> | |
+ </component> | |
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> | |
<OptionsSetting value="true" id="Add" /> | |
<OptionsSetting value="true" id="Remove" /> | |
@@ -20,6 +128,156 @@ | |
<ConfirmationsSetting value="0" id="Add" /> | |
<ConfirmationsSetting value="0" id="Remove" /> | |
</component> | |
+ <component name="ProjectView"> | |
+ <navigator currentView="ProjectPane" proportions="" version="1"> | |
+ <flattenPackages /> | |
+ <showMembers /> | |
+ <showModules /> | |
+ <showLibraryContents /> | |
+ <hideEmptyPackages /> | |
+ <abbreviatePackageNames /> | |
+ <autoscrollToSource /> | |
+ <autoscrollFromSource /> | |
+ <sortByType /> | |
+ <manualOrder /> | |
+ <foldersAlwaysOnTop value="true" /> | |
+ </navigator> | |
+ <panes> | |
+ <pane id="Scratches" /> | |
+ <pane id="ProjectPane"> | |
+ <subPane> | |
+ <PATH> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="fieldmuseum-website" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
+ </PATH_ELEMENT> | |
+ </PATH> | |
+ <PATH> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="fieldmuseum-website" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="fieldmuseum-website" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ </PATH> | |
+ <PATH> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="fieldmuseum-website" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="fieldmuseum-website" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="patternlab" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ </PATH> | |
+ <PATH> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="fieldmuseum-website" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="fieldmuseum-website" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="patternlab" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="source" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ </PATH> | |
+ <PATH> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="fieldmuseum-website" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="fieldmuseum-website" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="patternlab" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="source" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="sass" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ </PATH> | |
+ <PATH> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="fieldmuseum-website" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="fieldmuseum-website" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="patternlab" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="source" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="sass" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="04-molecules" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ </PATH> | |
+ <PATH> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="fieldmuseum-website" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="fieldmuseum-website" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="patternlab" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="source" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="sass" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="04-molecules" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ <PATH_ELEMENT> | |
+ <option name="myItemId" value="blocks" /> | |
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
+ </PATH_ELEMENT> | |
+ </PATH> | |
+ </subPane> | |
+ </pane> | |
+ <pane id="Scope" /> | |
+ <pane id="PackagesPane" /> | |
+ </panes> | |
+ </component> | |
<component name="PropertiesComponent"> | |
<property name="settings.editor.selected.configurable" value="preferences.remoteExternalTools" /> | |
<property name="nodejs_interpreter_path" value="/usr/local/bin/node" /> | |
@@ -28,6 +286,8 @@ | |
<property name="JavaScriptWeakerCompletionTypeGuess" value="true" /> | |
<property name="js-jscs-nodeInterpreter" value="/usr/local/bin/node" /> | |
<property name="settings.editor.splitter.proportion" value="0.2" /> | |
+ <property name="aspect.path.notification.shown" value="true" /> | |
+ <property name="WebServerToolWindowFactoryState" value="false" /> | |
</component> | |
<component name="RunManager"> | |
<configuration default="true" type="Applet" factoryName="Applet"> | |
@@ -82,13 +342,54 @@ | |
</component> | |
<component name="TaskManager"> | |
<task active="true" id="Default" summary="Default task"> | |
+ <changelist id="dd3a56d0-f535-4285-a446-4308c58b2ff3" name="Default" comment="" /> | |
<created>1478891215875</created> | |
<option name="number" value="Default" /> | |
<option name="presentableId" value="Default" /> | |
<updated>1478891215875</updated> | |
+ <workItem from="1478891217380" duration="1857000" /> | |
</task> | |
<servers /> | |
</component> | |
+ <component name="TimeTrackingManager"> | |
+ <option name="totallyTimeSpent" value="1857000" /> | |
+ </component> | |
+ <component name="ToolWindowManager"> | |
+ <frame x="0" y="22" width="1920" height="1174" extended-state="6" /> | |
+ <editor active="true" /> | |
+ <layout> | |
+ <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | |
+ <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="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" 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.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> | |
+ <window_info id="Version Control" 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="-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.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | |
+ <window_info id="Designer" 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="false" 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.24973376" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | |
+ <window_info id="Atlassian " 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="-1" side_tool="false" content_ui="tabs" /> | |
+ <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | |
+ <window_info id="Find" 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="1" 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="UI Designer" 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="false" content_ui="tabs" /> | |
+ <window_info id="Favorites" 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="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="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="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="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" 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="Run" 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="2" side_tool="false" content_ui="tabs" /> | |
+ <window_info id="Ant Build" 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="1" side_tool="false" content_ui="tabs" /> | |
+ <window_info id="Debug" 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="3" side_tool="false" content_ui="tabs" /> | |
+ </layout> | |
+ </component> | |
+ <component name="Vcs.Log.UiProperties"> | |
+ <option name="RECENTLY_FILTERED_USER_GROUPS"> | |
+ <collection /> | |
+ </option> | |
+ <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> | |
+ <collection /> | |
+ </option> | |
+ </component> | |
<component name="VcsContentAnnotationSettings"> | |
<option name="myLimit" value="2678400000" /> | |
</component> | |
@@ -96,4 +397,67 @@ | |
<breakpoint-manager /> | |
<watches-manager /> | |
</component> | |
+ <component name="atlassian-ide-plugin-workspace-issues"> | |
+ <option name="filtersMap"> | |
+ <map> | |
+ <entry> | |
+ <key> | |
+ <ServerIdImpl> | |
+ <option name="id" value="8115b0cb-ed6c-4f73-bdac-265eb4da94e6" /> | |
+ </ServerIdImpl> | |
+ </key> | |
+ <value> | |
+ <JiraCustomFilterMap /> | |
+ </value> | |
+ </entry> | |
+ </map> | |
+ </option> | |
+ <option name="view"> | |
+ <JiraViewConfigurationBean> | |
+ <option name="viewFilterId" value="" /> | |
+ </JiraViewConfigurationBean> | |
+ </option> | |
+ </component> | |
+ <component name="editorHistoryManager"> | |
+ <entry file="file://$PROJECT_DIR$/.gitignore"> | |
+ <provider selected="true" editor-type-id="text-editor"> | |
+ <state relative-caret-position="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$/patternlab/source/sass/style.scss"> | |
+ <provider selected="true" editor-type-id="text-editor"> | |
+ <state relative-caret-position="435"> | |
+ <caret line="29" column="35" selection-start-line="29" selection-start-column="35" selection-end-line="29" selection-end-column="35" /> | |
+ <folding /> | |
+ </state> | |
+ </provider> | |
+ </entry> | |
+ <entry file="file://$PROJECT_DIR$/patternlab/source/js/build/application/defer/iCheckLoader.coffee"> | |
+ <provider selected="true" editor-type-id="text-editor"> | |
+ <state relative-caret-position="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$/patternlab/source/js/build/application/defer/footer.coffee"> | |
+ <provider selected="true" editor-type-id="text-editor"> | |
+ <state relative-caret-position="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$/patternlab/source/sass/04-molecules/blocks/promos.scss"> | |
+ <provider selected="true" editor-type-id="text-editor"> | |
+ <state relative-caret-position="435"> | |
+ <caret line="93" column="17" selection-start-line="93" selection-start-column="17" selection-end-line="93" selection-end-column="17" /> | |
+ <folding /> | |
+ </state> | |
+ </provider> | |
+ </entry> | |
+ </component> | |
</project> | |
\ No newline at end of file | |
diff --git a/patternlab/config.codekit b/patternlab/config.codekit | |
index 792f85d..062b4a3 100644 | |
--- a/patternlab/config.codekit | |
+++ b/patternlab/config.codekit | |
@@ -1,16 +1,7 @@ | |
{ | |
"CodeKitInfo": "This is a CodeKit 2.x project configuration file. It is designed to sync project settings across multiple machines. MODIFYING THE CONTENTS OF THIS FILE IS A POOR LIFE DECISION. If you do so, you will likely cause CodeKit to crash. This file is not useful unless accompanied by the project that created it in CodeKit 2. This file is not backwards-compatible with CodeKit 1.x. For more information, see: http:\/\/incident57.com\/codekit", | |
-"creatorBuild": "19127", | |
+"creatorBuild": "19137", | |
"files": { | |
- "\/config.rb": { | |
- "fileType": 131072, | |
- "ignore": 0, | |
- "ignoreWasSetByUser": 0, | |
- "inputAbbreviatedPath": "\/config.rb", | |
- "outputAbbreviatedPath": "\/config.rb", | |
- "outputPathIsOutsideProject": 0, | |
- "outputPathIsSetByUser": 0 | |
- }, | |
"\/README.md": { | |
"criticStyle": 0, | |
"enableFootnotes": 0, | |
@@ -6808,7 +6799,7 @@ | |
}, | |
"hooks": [ | |
], | |
-"lastSavedByUser": "Graham Troyer-Joy", | |
+"lastSavedByUser": "Benjamin Doherty", | |
"manualImportLinks": { | |
}, | |
"projectAttributes": { | |
diff --git a/patternlab/source/sass/01-extends/animations.scss b/patternlab/source/sass/01-extends/animations.scss | |
index 73db82f..3827fac 100644 | |
--- a/patternlab/source/sass/01-extends/animations.scss | |
+++ b/patternlab/source/sass/01-extends/animations.scss | |
@@ -31,7 +31,8 @@ | |
$banner, | |
animationDuration); | |
perspective: 1200px; | |
- a:hover & { | |
+ a:hover &, | |
+ a:focus & { | |
visibility: visible; | |
opacity: 1; | |
transition: opacity map-get( | |
@@ -48,7 +49,8 @@ | |
$banner, | |
animationDuration); | |
transform: translateY(-25%) rotateX(35deg); | |
- a:hover & { | |
+ a:hover &, | |
+ a:focus & { | |
opacity: 1; | |
transform: rotateX(0deg); | |
} | |
diff --git a/patternlab/source/sass/03-atoms/buttons.scss b/patternlab/source/sass/03-atoms/buttons.scss | |
index 39c609a..d872295 100644 | |
--- a/patternlab/source/sass/03-atoms/buttons.scss | |
+++ b/patternlab/source/sass/03-atoms/buttons.scss | |
@@ -100,7 +100,8 @@ button { | |
@extend %button--special; | |
border: 0 !important; | |
background: map-get($button--special, bg--buy); /* Override inherited borders */ | |
- &:hover { | |
+ &:hover, | |
+ &:focus { | |
background: shade(map-get($button--special, bg--buy), map-get($button--special, shade)); | |
} | |
} | |
diff --git a/patternlab/source/sass/03-atoms/links.scss b/patternlab/source/sass/03-atoms/links.scss | |
index d1be48f..323b0aa 100644 | |
--- a/patternlab/source/sass/03-atoms/links.scss | |
+++ b/patternlab/source/sass/03-atoms/links.scss | |
@@ -50,7 +50,8 @@ a { | |
margin-left: 0.5em; | |
content: ''; | |
} | |
- &:hover:after { | |
+ &:hover:after, | |
+ &:focus:after { | |
@include sprite($rightArrow, blue); | |
} | |
.navFilters & { | |
@@ -75,7 +76,8 @@ a { | |
margin-left: 0.5em; | |
content: ''; | |
} | |
- &:hover:after { | |
+ &:hover:after, | |
+ &:focus:after { | |
@include sprite($upArrow, blue); | |
} | |
} | |
diff --git a/patternlab/source/sass/03-atoms/toggles.scss b/patternlab/source/sass/03-atoms/toggles.scss | |
index 5d8874d..d7eea36 100644 | |
--- a/patternlab/source/sass/03-atoms/toggles.scss | |
+++ b/patternlab/source/sass/03-atoms/toggles.scss | |
@@ -10,7 +10,8 @@ | |
color: map-get($toggle, color) !important; | |
padding: map-get($toggle, padding); | |
display: inline-block; | |
- &:hover { | |
+ &:hover, | |
+ &:focus { | |
background: shade(map-get($toggle, bg), map-get($toggle, shade)); | |
} | |
} | |
@@ -21,7 +22,8 @@ | |
border-radius: 0 $radius $radius 0; | |
} | |
.toggle__option--selected, | |
-.toggle__option--selected:hover, { | |
+.toggle__option--selected:hover, | |
+.toggle__option--selected:focus { | |
background: shade(map-get($toggle, bg), map-get($toggle, shadier)); | |
cursor: pointer; | |
} | |
diff --git a/patternlab/source/sass/04-molecules/blocks/person-summary.scss b/patternlab/source/sass/04-molecules/blocks/person-summary.scss | |
index 02aa85a..132e1a1 100644 | |
--- a/patternlab/source/sass/04-molecules/blocks/person-summary.scss | |
+++ b/patternlab/source/sass/04-molecules/blocks/person-summary.scss | |
@@ -52,7 +52,8 @@ | |
font-size: map-get($person__department, fontSize); | |
a { | |
color: map-get($person__department, color); | |
- &:hover { | |
+ &:hover, | |
+ &:focus { | |
color: map-get($links, hover); | |
} | |
} | |
diff --git a/patternlab/source/sass/04-molecules/blocks/promos.scss b/patternlab/source/sass/04-molecules/blocks/promos.scss | |
index 3832bff..98d5872 100644 | |
--- a/patternlab/source/sass/04-molecules/blocks/promos.scss | |
+++ b/patternlab/source/sass/04-molecules/blocks/promos.scss | |
@@ -19,7 +19,8 @@ | |
[data-useragent*="Trident"] & { | |
display: block; | |
} | |
- &:hover { | |
+ &:hover, | |
+ &:focus { | |
background: map-get($promo, bg--hover); | |
} | |
figure { | |
@@ -90,7 +91,8 @@ | |
font-size: map-get($promo__title, fontSize); | |
line-height: map-get($promo__title, lineHeight); | |
transition: map-get($transition, standard); | |
- .promo:hover & { | |
+ .promo:hover &, | |
+ .promo:focus & { | |
background: map-get($promo__title, bg--hover); | |
} | |
} | |
@@ -113,7 +115,8 @@ | |
white-space: nowrap; | |
font-weight: 700; | |
font-size: map-get($promo__category, fontSize); | |
- &:hover { | |
+ &:hover, | |
+ &:focus { | |
color: map-get($promo__category, hover); | |
} | |
&:after { | |
diff --git a/patternlab/source/sass/04-molecules/components.scss b/patternlab/source/sass/04-molecules/components.scss | |
index fd1fb29..75bacd3 100644 | |
--- a/patternlab/source/sass/04-molecules/components.scss | |
+++ b/patternlab/source/sass/04-molecules/components.scss | |
@@ -174,7 +174,8 @@ | |
transition: 0; | |
.ltie9 & { | |
text-decoration: none; | |
- &:hover { | |
+ &:hover, | |
+ &:focus { | |
&:before { | |
color: $white !important; | |
} | |
diff --git a/patternlab/source/sass/04-molecules/lists.scss b/patternlab/source/sass/04-molecules/lists.scss | |
index 2af9b66..affc454 100644 | |
--- a/patternlab/source/sass/04-molecules/lists.scss | |
+++ b/patternlab/source/sass/04-molecules/lists.scss | |
@@ -273,7 +273,8 @@ | |
transition: map-get($transition, standard); | |
fill: map-get($eventsList__icon, fill); | |
} | |
- &:hover { | |
+ &:hover, | |
+ &:focus { | |
.icon { | |
transition: none; | |
fill: map-get($links, hover); | |
diff --git a/patternlab/source/sass/04-molecules/media/gallery.scss b/patternlab/source/sass/04-molecules/media/gallery.scss | |
index 9b31b23..786459e 100644 | |
--- a/patternlab/source/sass/04-molecules/media/gallery.scss | |
+++ b/patternlab/source/sass/04-molecules/media/gallery.scss | |
@@ -30,7 +30,8 @@ | |
font-size: map-get($gallery__button, width); | |
opacity: .7; | |
cursor: pointer; | |
- &:hover { | |
+ &:hover, | |
+ &:focus { | |
opacity: 1; | |
} | |
} | |
@@ -38,7 +39,8 @@ | |
%gallery__button--left { | |
left: .25em; | |
border-right: .5em solid $green; | |
- &:hover { | |
+ &:hover, | |
+ &:focus { | |
border-right-color: $green--tint; | |
} | |
} | |
@@ -46,7 +48,8 @@ | |
%gallery__button--right { | |
right: .25em; | |
border-left: .5em solid $green; | |
- &:hover { | |
+ &:hover, | |
+ &:focus { | |
border-left-color: $green--tint; | |
} | |
} | |
@@ -125,7 +128,8 @@ | |
font-size: .825em; | |
font-family: map-get($viewer__caption, fontFamily); | |
transition: map-get($transition, standard); | |
- .viewer__item:hover & { | |
+ .viewer__item:hover &, | |
+ .viewer__item:focus & { | |
bottom: 0; | |
transition: none; | |
} | |
diff --git a/patternlab/source/sass/04-molecules/navigation/areas.scss b/patternlab/source/sass/04-molecules/navigation/areas.scss | |
index 7a73777..a2af7f3 100644 | |
--- a/patternlab/source/sass/04-molecules/navigation/areas.scss | |
+++ b/patternlab/source/sass/04-molecules/navigation/areas.scss | |
@@ -54,7 +54,8 @@ | |
font-size: map-get($navAreas, fontSize); | |
font-family: map-get($navList, fontFamily); | |
color: map-get($navList, color); | |
- &:hover { | |
+ &:hover, | |
+ &:focus { | |
background: map-get($navList, bg--hover); | |
color: map-get($navList, hover); | |
} | |
diff --git a/patternlab/source/sass/04-molecules/navigation/breadcrumbs.scss b/patternlab/source/sass/04-molecules/navigation/breadcrumbs.scss | |
index 9c0c264..db1e7a7 100644 | |
--- a/patternlab/source/sass/04-molecules/navigation/breadcrumbs.scss | |
+++ b/patternlab/source/sass/04-molecules/navigation/breadcrumbs.scss | |
@@ -76,7 +76,8 @@ | |
display: inline-block; | |
color: map-get($breadcrumb__link, color); | |
text-decoration: none; | |
- &:hover { | |
+ &:hover, | |
+ &:focus { | |
color: map-get($breadcrumb__link, hover); | |
} | |
} | |
diff --git a/patternlab/source/sass/04-molecules/navigation/main.scss b/patternlab/source/sass/04-molecules/navigation/main.scss | |
index cde47cd..4dc6078 100644 | |
--- a/patternlab/source/sass/04-molecules/navigation/main.scss | |
+++ b/patternlab/source/sass/04-molecules/navigation/main.scss | |
@@ -259,7 +259,8 @@ | |
@media #{map-get($bp--down, 2)} and #{$bp--landscape} { | |
flex-basis: 50%; | |
} | |
- a:hover { | |
+ a:hover, | |
+ a:focus { | |
background: map-get($navMain__primary, bg--hover); | |
@media #{map-get($bp--down, 2)} { | |
background: transparent; | |
diff --git a/patternlab/source/sass/04-molecules/navigation/target.scss b/patternlab/source/sass/04-molecules/navigation/target.scss | |
index 51eab52..533372e 100644 | |
--- a/patternlab/source/sass/04-molecules/navigation/target.scss | |
+++ b/patternlab/source/sass/04-molecules/navigation/target.scss | |
@@ -60,7 +60,8 @@ | |
visibility: hidden; | |
} | |
} | |
- &:hover { | |
+ &:hover, | |
+ &:focus { | |
background: map-get($navTarget__link, bg__hover); | |
color: map-get($navTarget__link, hover); | |
&:after { | |
diff --git a/patternlab/source/sass/05-organisms/global.scss b/patternlab/source/sass/05-organisms/global.scss | |
index 16a4576..8f61de4 100644 | |
--- a/patternlab/source/sass/05-organisms/global.scss | |
+++ b/patternlab/source/sass/05-organisms/global.scss | |
@@ -292,7 +292,8 @@ | |
@media #{map-get($bp--down, 2)} { | |
left: -(map-get($newsletter__icon, padding)*3); | |
} | |
- .newsletter:hover & { | |
+ .newsletter:hover &, | |
+ .newsletter:focus & { | |
transform: translate(0, #{map-get($newsletter__icon, padding)/2}); | |
} | |
.icon { | |
diff --git a/patternlab/source/sass/style.scss b/patternlab/source/sass/style.scss | |
index 25115fc..d94af3d 100644 | |
--- a/patternlab/source/sass/style.scss | |
+++ b/patternlab/source/sass/style.scss | |
@@ -53,7 +53,7 @@ | |
// !-- Load vendor libraries | |
// ---------------------------------------------------------------------------- | |
-@import "susy/sass/susy"; | |
+@import "susy"; | |
@import "../bower_components/scut/dist/_scut.scss"; | |
@import "../bower_components/select2/select2"; | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment