Skip to content

Руслан Ибрагимов / yescenter

Go to a project
Commit 40e4ec2d by Ruha
Options

еще прислали правки, делаем слайдеры

1 parent 64a22a9e
Pipeline #2690 for 40e4ec2d skipped in 0 seconds
Inline Side-by-side
Showing 11 changed files with 128 additions and 69 deletions
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="BookmarkManager"> <component name="BookmarkManager">
<bookmark url="file://$PROJECT_DIR$/index.html" line="158" /> <bookmark url="file://$PROJECT_DIR$/index.html" line="159" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f27ea491-44a7-4742-b6b4-1d473d258e2e" name="Default" comment=""> <list default="true" id="f27ea491-44a7-4742-b6b4-1d473d258e2e" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/css/additional.min.css" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/additional.css" afterPath="$PROJECT_DIR$/css/additional.css" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/additional.css" afterPath="$PROJECT_DIR$/css/additional.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/style.css" afterPath="$PROJECT_DIR$/css/style.css" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/style.css" afterPath="$PROJECT_DIR$/css/style.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/common.js" afterPath="$PROJECT_DIR$/js/common.js" />
</list> </list>
<ignored path="yescenter.iws" /> <ignored path="yescenter.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -31,12 +31,14 @@ ...@@ -31,12 +31,14 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="true"> <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="192"> <state relative-caret-position="350">
<caret line="8" column="47" selection-start-line="8" selection-start-column="47" selection-end-line="8" selection-end-column="47" /> <caret line="168" column="114" selection-start-line="168" selection-start-column="114" selection-end-line="168" selection-end-column="114" />
<folding /> <folding>
<marker date="1495809356138" expanded="true" signature="120:196" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -51,11 +53,11 @@ ...@@ -51,11 +53,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="additional.css" pinned="false" current-in-tab="false"> <file leaf-file-name="additional.css" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/css/additional.css"> <entry file="file://$PROJECT_DIR$/css/additional.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="87"> <state relative-caret-position="240">
<caret line="267" column="24" selection-start-line="267" selection-start-column="24" selection-end-line="267" selection-end-column="24" /> <caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -64,8 +66,8 @@ ...@@ -64,8 +66,8 @@
<file leaf-file-name="style.css" pinned="false" current-in-tab="false"> <file leaf-file-name="style.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/style.css"> <entry file="file://$PROJECT_DIR$/css/style.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="490"> <state relative-caret-position="2496">
<caret line="190" column="7" selection-start-line="190" selection-start-column="7" selection-end-line="190" selection-end-column="7" /> <caret line="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -74,8 +76,8 @@ ...@@ -74,8 +76,8 @@
<file leaf-file-name="common.js" pinned="false" current-in-tab="false"> <file leaf-file-name="common.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/common.js"> <entry file="file://$PROJECT_DIR$/js/common.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459"> <state relative-caret-position="360">
<caret line="71" column="36" selection-start-line="71" selection-start-column="36" selection-end-line="71" selection-end-column="36" /> <caret line="65" column="19" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
</folding> </folding>
...@@ -109,11 +111,11 @@ ...@@ -109,11 +111,11 @@
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/handler.php" /> <option value="$PROJECT_DIR$/handler.php" />
<option value="$PROJECT_DIR$/css/additional.min.css" />
<option value="$PROJECT_DIR$/js/common.js" /> <option value="$PROJECT_DIR$/js/common.js" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/css/style.css" /> <option value="$PROJECT_DIR$/css/style.css" />
<option value="$PROJECT_DIR$/css/additional.css" /> <option value="$PROJECT_DIR$/css/additional.css" />
<option value="$PROJECT_DIR$/css/additional.min.css" />
<option value="$PROJECT_DIR$/index.html" />
</list> </list>
</option> </option>
</component> </component>
...@@ -158,7 +160,6 @@ ...@@ -158,7 +160,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="Scratches" /> <pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
...@@ -178,8 +179,23 @@ ...@@ -178,8 +179,23 @@
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="yescenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="yescenter" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="css" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -241,15 +257,14 @@ ...@@ -241,15 +257,14 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="38" width="1936" height="1050" extended-state="6" /> <frame x="-8" y="38" width="1936" height="1050" extended-state="7" />
<editor active="false" /> <editor active="true" />
<layout> <layout>
<window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2835821" sideWeight="0.4956427" order="1" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28997868" sideWeight="0.4956427" order="1" 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.32897604" sideWeight="0.5" order="6" 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.32897604" sideWeight="0.5" order="6" 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.32897604" sideWeight="0.5" order="7" side_tool="true" 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.32897604" sideWeight="0.5" order="7" side_tool="true" 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="3" 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="3" 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="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3278867" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3278867" sideWeight="0.5" order="11" side_tool="false" 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="8" side_tool="false" 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="8" 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="0" 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="0" side_tool="false" content_ui="tabs" />
...@@ -262,6 +277,7 @@ ...@@ -262,6 +277,7 @@
<window_info id="Command Line Tools Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293348" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Command Line Tools Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293348" sideWeight="0.5" order="10" 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="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="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="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="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" 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="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" /> <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> </layout>
...@@ -286,7 +302,9 @@ ...@@ -286,7 +302,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding>
<marker date="1495809356138" expanded="true" signature="120:196" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -328,7 +346,9 @@ ...@@ -328,7 +346,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding>
<marker date="1495809356138" expanded="true" signature="120:196" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -370,7 +390,9 @@ ...@@ -370,7 +390,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2064"> <state relative-caret-position="2064">
<caret line="86" column="113" selection-start-line="86" selection-start-column="113" selection-end-line="86" selection-end-column="113" /> <caret line="86" column="113" selection-start-line="86" selection-start-column="113" selection-end-line="86" selection-end-column="113" />
<folding /> <folding>
<marker date="1495809356138" expanded="true" signature="120:196" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -412,7 +434,9 @@ ...@@ -412,7 +434,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding>
<marker date="1495809356138" expanded="true" signature="120:196" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -446,7 +470,9 @@ ...@@ -446,7 +470,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3768"> <state relative-caret-position="3768">
<caret line="157" column="14" selection-start-line="157" selection-start-column="14" selection-end-line="157" selection-end-column="14" /> <caret line="157" column="14" selection-start-line="157" selection-start-column="14" selection-end-line="157" selection-end-column="14" />
<folding /> <folding>
<marker date="1495809356138" expanded="true" signature="120:196" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -480,7 +506,9 @@ ...@@ -480,7 +506,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding>
<marker date="1495809356138" expanded="true" signature="120:196" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -514,7 +542,9 @@ ...@@ -514,7 +542,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="192"> <state relative-caret-position="192">
<caret line="8" column="60" selection-start-line="8" selection-start-column="60" selection-end-line="8" selection-end-column="60" /> <caret line="8" column="60" selection-start-line="8" selection-start-column="60" selection-end-line="8" selection-end-column="60" />
<folding /> <folding>
<marker date="1495809356138" expanded="true" signature="120:196" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -548,7 +578,9 @@ ...@@ -548,7 +578,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2472"> <state relative-caret-position="2472">
<caret line="103" column="36" selection-start-line="103" selection-start-column="36" selection-end-line="103" selection-end-column="36" /> <caret line="103" column="36" selection-start-line="103" selection-start-column="36" selection-end-line="103" selection-end-column="36" />
<folding /> <folding>
<marker date="1495809356138" expanded="true" signature="120:196" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -592,7 +624,9 @@ ...@@ -592,7 +624,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7656"> <state relative-caret-position="7656">
<caret line="319" column="49" selection-start-line="319" selection-start-column="49" selection-end-line="319" selection-end-column="49" /> <caret line="319" column="49" selection-start-line="319" selection-start-column="49" selection-end-line="319" selection-end-column="49" />
<folding /> <folding>
<marker date="1495809356138" expanded="true" signature="120:196" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -636,7 +670,9 @@ ...@@ -636,7 +670,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6336"> <state relative-caret-position="6336">
<caret line="264" column="26" selection-start-line="264" selection-start-column="16" selection-end-line="264" selection-end-column="26" /> <caret line="264" column="26" selection-start-line="264" selection-start-column="16" selection-end-line="264" selection-end-column="26" />
<folding /> <folding>
<marker date="1495809356138" expanded="true" signature="120:196" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -676,44 +712,46 @@ ...@@ -676,44 +712,46 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/js/common.js"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459"> <state relative-caret-position="350">
<caret line="71" column="36" selection-start-line="71" selection-start-column="36" selection-end-line="71" selection-end-column="36" /> <caret line="168" column="114" selection-start-line="168" selection-start-column="114" selection-end-line="168" selection-end-column="114" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <marker date="1495809356138" expanded="true" signature="120:196" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/css/style.css"> <entry file="file://$PROJECT_DIR$/css/additional.min.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="490"> <state relative-caret-position="0">
<caret line="190" column="7" selection-start-line="190" selection-start-column="7" selection-end-line="190" selection-end-column="7" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/css/additional.css"> <entry file="file://$PROJECT_DIR$/js/common.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="87"> <state relative-caret-position="360">
<caret line="267" column="24" selection-start-line="267" selection-start-column="24" selection-end-line="267" selection-end-column="24" /> <caret line="65" column="19" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
<folding /> <folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/css/additional.min.css"> <entry file="file://$PROJECT_DIR$/css/style.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="2496">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/css/additional.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="192"> <state relative-caret-position="240">
<caret line="8" column="47" selection-start-line="8" selection-start-column="47" selection-end-line="8" selection-end-column="47" /> <caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
css/additional.css
/* slider */
/*.photo-slide:nth-of-type() {margin-left:-34px;}*/
/*.photo-slide img {*/
/*-webkit-border-radius: 14px;*/
/*border-radius: 14px;*/
/*display: block;*/
/*margin-bottom: 18px;*/
/*height: auto;*/
/*}*/
.photo-slider {
width: 104%;
}
/* styles */
.nowrap { .nowrap {
white-space: nowrap; white-space: nowrap;
display: inline !important; display: inline !important;
...@@ -265,6 +280,7 @@ input.valid { ...@@ -265,6 +280,7 @@ input.valid {
} }
.map-ct1 { max-height:712px!important; } .map-ct1 { max-height:712px!important; }
@media (max-width: 320px) { @media (max-width: 320px) {
.b5 .ll1 img {padding-bottom:15px;}
.btn-320 {width: 270px!important;} .btn-320 {width: 270px!important;}
#callback-form .error {left:122px;} #callback-form .error {left:122px;}
#order-form .input, #callback-form #phone { #order-form .input, #callback-form #phone {
......
css/style.css
...@@ -91,7 +91,7 @@ table { border-spacing: 0; border-collapse: collapse; width: 100%; } ...@@ -91,7 +91,7 @@ table { border-spacing: 0; border-collapse: collapse; width: 100%; }
.slick-prev:before, .slick-next:before { height: 30px; line-height: 30px; content: "prev"; display: inline-block; vertical-align: middle; font-size: 15px; color: #fff; background: #000; } .slick-prev:before, .slick-next:before { height: 30px; line-height: 30px; content: "prev"; display: inline-block; vertical-align: middle; font-size: 15px; color: #fff; background: #000; }
.slick-next { right: 0; left: auto; } .slick-next { right: 34px; left: auto; }
.slick-next:before { content: "next"; display: inline-block; } .slick-next:before { content: "next"; display: inline-block; }
......
img/av2.jpg 0 → 100644
img/av2.jpg

56.9 KB
img/w10.jpg 0 → 100644
img/w10.jpg

223 KB
img/w6.jpg 0 → 100644
img/w6.jpg

243 KB
img/w7.jpg 0 → 100644
img/w7.jpg

218 KB
img/w8.jpg 0 → 100644
img/w8.jpg

244 KB
img/w9.jpg 0 → 100644
img/w9.jpg

285 KB
index.html
...@@ -3,11 +3,12 @@ ...@@ -3,11 +3,12 @@
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<!--[if IE]> <!--[if IE]>
<!--<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>--><![endif]--> <!--<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<title></title> <title></title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="css/additional.min.css" type="text/css"> <link rel="stylesheet" href="css/additional.css" type="text/css">
<link rel="stylesheet" href="css/style.min.css" type="text/css" media="screen, projection"/> <link rel="stylesheet" href="css/style.css" type="text/css" media="screen, projection"/>
<script type="text/javascript" src="js/app.js"></script> <script type="text/javascript" src="js/app.js"></script>
<script type="text/javascript" src="js/jquery.validate.min.js"></script> <script type="text/javascript" src="js/jquery.validate.min.js"></script>
<script type="text/javascript" src="js/moment.min.js"></script> <script type="text/javascript" src="js/moment.min.js"></script>
...@@ -163,30 +164,28 @@ ...@@ -163,30 +164,28 @@
<div class="b4"> <div class="b4">
<div class="ct"> <div class="ct">
<div class="t1">Яркий и узнаваемый бренд</div> <div class="t1">Яркий и узнаваемый бренд</div>
<div class="ov1"> <div class="ov1 photo-slider">
<div class="ll1"><img src="img/w4.jpg" alt=""><span></span></div> <div class="ll1 photo-slide"><img src="img/w4.jpg" alt=""><span>Офис-франчайзи в Санкт-Петербурге</span></div>
<div class="ll1"><img src="img/w5.jpg" alt=""><span></span></div> <div class="ll1 photo-slide"><img src="img/w5.jpg" alt=""><span>Офис-франчайзи в Туле</span></div>
<div class="sl3"> <div class="ll1 photo-slide"><img src="img/w10.jpg" alt=""><span>5</span></div>
<div> <div class="ll1 photo-slide"><img src="img/w6.jpg" alt=""><span>1</span></div>
<div class="ll1"><img src="img/w1.jpg" alt=""><span>Офис-франчайзи в Санкт-Петербурге</span> <div class="ll1 photo-slide"><img src="img/w7.jpg" alt=""><span>2</span></div>
</div> <div class="ll1 photo-slide"><img src="img/w8.jpg" alt=""><span>3</span></div>
</div> <div class="ll1 photo-slide"><img src="img/w9.jpg" alt=""><span>4</span></div>
<div>
<div class="ll1"><img src="img/w2.jpg" alt=""><span>Офис-франчайзи в Туле</span></div>
</div>
</div>
</div> </div>
<p class="p1">Логотип Школы иностранных языков YES — не просто фирменный знак, это знак качества. <p class="p1">Логотип Школы иностранных языков YES — не просто фирменный знак, это знак качества.
Изображенный в форме круглой печати, он символизирует многолетний успешный опыт обучения иностранным Изображенный в форме круглой печати, он символизирует многолетний успешный опыт обучения иностранным
языкам, подтвержденный тысячами сертификатов наших выпускников.</p> языкам, подтвержденный тысячами сертификатов наших выпускников.</p>
<a href="" class=" btn-320">Получить план открытия школы</a> <a href="" class="ord3 btn-320">Получить план открытия школы</a>
</div> </div>
</div> </div>
<div class="b5"> <div class="b5">
<div class="ct"> <div class="ct">
<div class="t1">Языковые школы YES</div> <div class="t1">Языковые школы YES</div>
<div class="ll1"> <div class="ll1">
<img src="img/av1.png" alt=""> <img src="img/av2.jpg" alt="">
<span>Сергей Афанаскин</span> <span>Сергей Афанаскин</span>
<p>Основатель и генеральный директор <br>сети Центров иностранных языков YES</p> <p>Основатель и генеральный директор <br>сети Центров иностранных языков YES</p>
</div> </div>
...@@ -515,7 +514,6 @@ ...@@ -515,7 +514,6 @@
} }
myMap.geoObjects.add(myCollection); myMap.geoObjects.add(myCollection);
myMap.behaviors.disable("scrollZoom"); myMap.behaviors.disable("scrollZoom");
myMap.controls.remove('searchControl'); myMap.controls.remove('searchControl');
myMap.controls.remove('typeSelector'); myMap.controls.remove('typeSelector');
...@@ -525,10 +523,9 @@ ...@@ -525,10 +523,9 @@
myMap.controls.remove('fullscreenControl'); myMap.controls.remove('fullscreenControl');
myMap.controls.remove('geolocationControl'); myMap.controls.remove('geolocationControl');
myMap.controls.remove('rulerControl'); myMap.controls.remove('rulerControl');
} };
;
ymaps.ready(init); ymaps.ready(init);
</script> </script>
<script type="text/javascript" src="js/common.min.js"></script> <script type="text/javascript" src="js/common.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file \ No newline at end of file
js/common.js
...@@ -59,6 +59,13 @@ $(document).ready(function () { ...@@ -59,6 +59,13 @@ $(document).ready(function () {
$(this).attr('data-place', $(this).val()); $(this).attr('data-place', $(this).val());
}); });
}); });
$('.photo-slider').slick({
slidesToShow: 2,
slidesToScroll:2,
arrows: true,
dots: false,
adaptiveHeight: true
});
$('.sl1').slick({ $('.sl1').slick({
arrows: false, arrows: false,
slidesToShow: 4, slidesToShow: 4,
...@@ -86,6 +93,7 @@ $(document).ready(function () { ...@@ -86,6 +93,7 @@ $(document).ready(function () {
dots: true, dots: true,
adaptiveHeight: true adaptiveHeight: true
}); });
$('.sl-con .item-poss a').fancybox({ $('.sl-con .item-poss a').fancybox({
helpers: { helpers: {
overlay: { overlay: {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!