Commit cea90ac5 authored by liaili's avatar liaili

7

parent 7854e4d3
......@@ -62,7 +62,6 @@
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Application Support/AddressBook/Sources/5EF29C29-149E-44E1-8A41-242FAA140D9E/OfflineDeletedItems.plist.lockfile" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Application Support/AddressBook/Sources/5EF29C29-149E-44E1-8A41-242FAA140D9E/Sync.lockfile" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Application Support/AddressBook/Sources/5EF29C29-149E-44E1-8A41-242FAA140D9E/SyncOperations.plist.lockfile" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Application Support/Adobe/Adobe Photoshop CC/CT Font Cache/AdobeFnt_OSFonts.lst" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Application Support/Adobe/CEPServiceManager4/cache/ExtensionManifest/PHSP_14_0_0_zh_CN.cache" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Application Support/Adobe/OOBE/opm.db" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Application Support/App Store/updatejournal.plist" />
......@@ -875,9 +874,6 @@
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_00001e" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_000021" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_000022" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_000023" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_000024" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_000025" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_000027" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_000028" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_00002a" />
......@@ -961,7 +957,6 @@
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_0000e3" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_0000ea" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_0000eb" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_0000ec" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_0000ed" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_0000ee" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_0000ef" />
......@@ -1021,8 +1016,6 @@
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_00015c" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_00015e" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_000163" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_000168" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_000169" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_00016a" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_000170" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Caches/Google/Chrome/Default/Cache/f_000171" />
......@@ -5865,8 +5858,6 @@
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Containers/com.tencent.xinWeChat/Data/Library/Application Support/Wechat/1.2/017b772a82317c8d251c61651812c6dd/Account/userinfo.data" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Containers/com.tencent.xinWeChat/Data/Library/Application Support/Wechat/1.2/017b772a82317c8d251c61651812c6dd/Contact/wccontact_new2.db" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Containers/com.tencent.xinWeChat/Data/Library/Application Support/Wechat/1.2/017b772a82317c8d251c61651812c6dd/Group/group_new.db" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Containers/com.tencent.xinWeChat/Data/Library/Application Support/Wechat/1.2/017b772a82317c8d251c61651812c6dd/Message/MessageTemp/13be832462989665bc25ae635591ae5d/Image/1.pic.jpg" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Containers/com.tencent.xinWeChat/Data/Library/Application Support/Wechat/1.2/017b772a82317c8d251c61651812c6dd/Message/MessageTemp/13be832462989665bc25ae635591ae5d/Image/1.pic_thumb.jpg" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Containers/com.tencent.xinWeChat/Data/Library/Application Support/Wechat/1.2/017b772a82317c8d251c61651812c6dd/Sync/oplog_1.1.db" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Containers/com.tencent.xinWeChat/Data/Library/Application Support/Wechat/1.2/017b772a82317c8d251c61651812c6dd/Sync/sync.data" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Containers/com.tencent.xinWeChat/Data/Library/Application Support/Wechat/1.2/CGI/ServerId.dat" />
......@@ -6032,7 +6023,6 @@
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/FontCollections/网页.collection" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/FontCollections/趣味.collection" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Google/Google Chrome Brand.plist" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Google/GoogleSoftwareUpdate/Actives/com.google.Chrome" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Frameworks/KeystoneCommon.framework/KeystoneCommon" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Frameworks/KeystoneCommon.framework/Resources" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Frameworks/KeystoneCommon.framework/Versions/A/KeystoneCommon" />
......@@ -6328,6 +6318,7 @@
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Saved Application State/com.apple.finder.savedState/data.data" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Saved Application State/com.apple.finder.savedState/windows.plist" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Saved Application State/com.google.Chrome.savedState/data.data" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Saved Application State/com.google.Chrome.savedState/window_1.data" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Saved Application State/com.google.Chrome.savedState/windows.plist" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Saved Application State/com.jetbrains.WebStorm.savedState/data.data" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Saved Application State/com.jetbrains.WebStorm.savedState/windows.plist" />
......@@ -6428,6 +6419,7 @@
<change type="NEW" beforePath="" afterPath="$USER_HOME$/.viminfo" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Application Support/Adobe/AAMUpdater/1.0/AdobeUpdaterPrefs.dat" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Application Support/Adobe/AAMUpdater/1.0/aamul.log" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Application Support/Adobe/Adobe Photoshop CC/CT Font Cache/AdobeFnt_OSFonts.lst" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Application Support/Adobe/CEPServiceManager4/logs/CEPServiceManager_native.log" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Application Support/Adobe/CEPServiceManager4/logs/Vulcan.log" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Application Support/CallHistoryDB/com.apple.callhistory.databaseInfo.plist" />
......@@ -6843,7 +6835,6 @@
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Resources/com.google.keystone.daemon.plist" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Resources/com.google.keystone.daemon4.plist" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/_CodeSignature/CodeResources" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Google/GoogleSoftwareUpdate/Reports/com.google.Chrome" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Google/GoogleSoftwareUpdate/Stats/Keystone.stats" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/LanguageModeling/en-dynamic.lm/Info.plist" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/LanguageModeling/tr-dynamic.lm/Info.plist" />
......@@ -6874,6 +6865,7 @@
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Logs/talagent.log.3" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Logs/talagent.log.4" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Mobile Documents/com~apple~TextInput/Dictionaries/.cdmetadata/metadata.nosync/liaili~C7E30D5D-188E-59B2-9372-1715096FE3F7/UserDictionary/CDF55559-CBA9-4A60-A62A-79EC5329EE9B.cid" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Preferences/Adobe Photoshop CC Settings/WorkSpaces (Modified)/Essentials" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Preferences/Adobe/.3EF9131FF223" />
<change type="NEW" beforePath="" afterPath="$USER_HOME$/Library/Preferences/Macromedia/Flash Player/#Security/FlashPlayerTrust/air.1.0.trust.cfg" />
<change type="NEW" beforePath="" afterPath="$APPLICATION_CONFIG_DIR$/inspection/Default.xml" />
......@@ -6940,42 +6932,22 @@
<favorites_list name="antd-test" />
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="navitation-record.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/entries/navitation-record.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="454">
<caret line="81" column="46" selection-start-line="81" selection-start-column="46" selection-end-line="81" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="register-info.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/entries/register-info.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="385">
<caret line="46" column="42" selection-start-line="46" selection-start-column="42" selection-end-line="46" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/entries/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="32" column="34" selection-start-line="32" selection-start-column="34" selection-end-line="32" selection-end-column="34" />
<state relative-caret-position="195">
<caret line="13" column="43" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="navitation-friend.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/entries/navitation-friend.html">
<file leaf-file-name="navitation-record.less" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/entries/navitation-record.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="46" selection-start-line="17" selection-start-column="46" selection-end-line="17" selection-end-column="46" />
<state relative-caret-position="220">
<caret line="23" column="22" selection-start-line="23" selection-start-column="22" selection-end-line="23" selection-end-column="22" />
<folding />
</state>
</provider>
......@@ -7024,11 +6996,11 @@
<option value="$PROJECT_DIR$/src/entries/index.less" />
<option value="$PROJECT_DIR$/src/entries/navitation-friend.less" />
<option value="$PROJECT_DIR$/src/entries/register-info.less" />
<option value="$PROJECT_DIR$/src/entries/navitation-record.less" />
<option value="$PROJECT_DIR$/src/entries/index.html" />
<option value="$PROJECT_DIR$/src/entries/navitation-friend.html" />
<option value="$PROJECT_DIR$/src/entries/navitation-record.html" />
<option value="$PROJECT_DIR$/src/entries/register-info.html" />
<option value="$PROJECT_DIR$/src/entries/navitation-record.html" />
<option value="$PROJECT_DIR$/src/entries/navitation-record.less" />
</list>
</option>
</component>
......@@ -7135,14 +7107,14 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="settings.editor.selected.configurable" value="watcher.settings" />
<property name="settings.editor.splitter.proportion" value="0.2" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../nodejs" />
<property name="FullScreen" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="HbShouldOpenHtmlAsHb" value="" />
......@@ -7223,6 +7195,9 @@
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="8143d641-9336-4eba-b50a-fb6b69e30a62" name="Default" comment="" />
......@@ -7238,12 +7213,15 @@
<workItem from="1470275862178" duration="15200000" />
<workItem from="1470296488985" duration="633000" />
<workItem from="1470297368067" duration="57845000" />
<workItem from="1470560509731" duration="52000" />
<workItem from="1470560509731" duration="126000" />
<workItem from="1470575158224" duration="4000" />
<workItem from="1470576321437" duration="678000" />
<workItem from="1470617092646" duration="1320000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="88850000" />
<option name="totallyTimeSpent" value="90926000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -7516,7 +7494,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="164">
<caret line="243" column="12" selection-start-line="243" selection-start-column="2" selection-end-line="243" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
......@@ -7531,7 +7508,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="394">
<caret line="27" column="48" selection-start-line="27" selection-start-column="48" selection-end-line="27" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
......@@ -7539,18 +7515,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="409">
<caret line="70" column="9" selection-start-line="67" selection-start-column="9" selection-end-line="70" selection-end-column="9" />
<folding>
<element signature="e#42#80#0" expanded="false" />
<element signature="e#90#121#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/entries/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="30" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
......@@ -7558,7 +7522,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="23" selection-start-line="7" selection-start-column="23" selection-end-line="7" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
......@@ -7566,31 +7529,33 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
<folding>
<element signature="e#158#456#0" expanded="false" />
<element signature="e#476#1620#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/entries/navitation-record.less">
<entry file="file://$PROJECT_DIR$/src/entries/register-info.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
<folding>
<element signature="e#3236#3572#0" expanded="false" />
</folding>
<state relative-caret-position="690">
<caret line="46" column="42" selection-start-line="46" selection-start-column="42" selection-end-line="46" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/entries/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<state relative-caret-position="480">
<caret line="32" column="34" selection-start-line="32" selection-start-column="34" selection-end-line="32" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/entries/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="30" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/entries/navitation-friend.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
......@@ -7601,16 +7566,16 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/entries/navitation-record.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="454">
<caret line="81" column="46" selection-start-line="81" selection-start-column="46" selection-end-line="81" selection-end-column="46" />
<state relative-caret-position="195">
<caret line="13" column="43" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/entries/register-info.html">
<entry file="file://$PROJECT_DIR$/src/entries/navitation-record.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="385">
<caret line="46" column="42" selection-start-line="46" selection-start-column="42" selection-end-line="46" selection-end-column="42" />
<state relative-caret-position="220">
<caret line="23" column="22" selection-start-line="23" selection-start-column="22" selection-end-line="23" selection-end-column="22" />
<folding />
</state>
</provider>
......@@ -12,8 +12,8 @@
<div class="navitation">
<h1>尊敬的维基,您好!</h1>
<div class="navitation-amount">
<a href="javascript:;">绑定成功:2人</a>
<a href="javascript:;">邀请人数:10人</a>
<span>邀请人数:10人</span>
<span>绑定成功:2人</span>
</div>
</div>
<div class="user-list">
......
......@@ -21,7 +21,7 @@
display: block;
clear: both;
}
a {
span {
padding: 8px 10px;
border-radius: 4px;
text-decoration: none;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment