Skip to content

F
fazo
Commit 6d311c21 authored by Ruslan's avatar Ruslan
Browse files
Options

Fixed styles for fonts

parent eb42ea1c
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 37 deletions
.idea/workspace.xml
View file @ 6d311c21
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment=""> <list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/public/frontend/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/frontend/css/style.css" afterDir="false" /> <change beforePath="$PROJECT_DIR$/public/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/style.css" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -26,21 +26,22 @@ ...@@ -26,21 +26,22 @@
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="css" value="2" /> <entry key="css" value="3" />
<entry key="env" value="1" /> <entry key="env" value="1" />
<entry key="ico" value="1" /> <entry key="ico" value="1" />
<entry key="php" value="78" /> <entry key="php" value="78" />
<entry key="png" value="4" /> <entry key="png" value="4" />
<entry key="svg" value="1" /> <entry key="svg" value="1" />
<entry key="woff2" value="1" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="Blade" value="31" /> <entry key="Blade" value="31" />
<entry key="CSS" value="2" /> <entry key="CSS" value="3" />
<entry key="Image" value="5" /> <entry key="Image" value="5" />
<entry key="PHP" value="47" /> <entry key="PHP" value="47" />
<entry key="PLAIN_TEXT" value="1" /> <entry key="PLAIN_TEXT" value="2" />
<entry key="SVG" value="1" /> <entry key="SVG" value="1" />
</counts> </counts>
</usages-collector> </usages-collector>
...@@ -77,15 +78,6 @@ ...@@ -77,15 +78,6 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/templates/declaration.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3485">
<caret line="205" column="25" selection-start-line="205" selection-start-column="25" selection-end-line="205" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/contacts.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/contacts.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -114,8 +106,8 @@ ...@@ -114,8 +106,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="468"> <state relative-caret-position="436">
<caret line="32" column="34" lean-forward="true" selection-start-line="32" selection-start-column="34" selection-end-line="32" selection-end-column="34" /> <caret line="32" column="34" selection-start-line="32" selection-start-column="34" selection-end-line="32" selection-end-column="34" />
<folding> <folding>
<element signature="e#6#91#0#PHP" expanded="true" /> <element signature="e#6#91#0#PHP" expanded="true" />
<element signature="e#126#150#0#PHP" expanded="true" /> <element signature="e#126#150#0#PHP" expanded="true" />
...@@ -124,10 +116,10 @@ ...@@ -124,10 +116,10 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/frontend/css/style.css"> <entry file="file://$PROJECT_DIR$/public/frontend/css/style.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="-488">
<caret column="96929" selection-start-column="96924" selection-end-column="96929" /> <caret column="96929" selection-start-column="96924" selection-end-column="96929" />
<folding> <folding>
<element signature="e#282780#356263#2" expanded="true" /> <element signature="e#282780#356263#2" expanded="true" />
...@@ -138,6 +130,25 @@ ...@@ -138,6 +130,25 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/frontend/fonts/fontawesome-webfont.woff2">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199">
<caret column="153397" selection-start-column="153392" selection-end-column="153397" />
<folding>
<element signature="e#282780#356263#2" expanded="true" />
<element signature="e#441261#442630#2" expanded="true" />
<element signature="e#442785#444150#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -215,6 +226,7 @@ ...@@ -215,6 +226,7 @@
<option value="$PROJECT_DIR$/resources/views/main.blade.php" /> <option value="$PROJECT_DIR$/resources/views/main.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php" />
<option value="$PROJECT_DIR$/public/frontend/css/style.css" /> <option value="$PROJECT_DIR$/public/frontend/css/style.css" />
<option value="$PROJECT_DIR$/public/css/style.css" />
</list> </list>
</option> </option>
</component> </component>
...@@ -380,6 +392,12 @@ ...@@ -380,6 +392,12 @@
<item name="fazoshop" type="462c0819:PsiDirectoryNode" /> <item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" /> <item name="public" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" /> <item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" /> <item name="fazoshop" type="462c0819:PsiDirectoryNode" />
...@@ -450,6 +468,9 @@ ...@@ -450,6 +468,9 @@
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" /> <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\frontend\fonts" />
</key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles" /> <recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles" />
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles\css" /> <recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles\css" />
...@@ -481,15 +502,16 @@ ...@@ -481,15 +502,16 @@
<workItem from="1559392286763" duration="1822000" /> <workItem from="1559392286763" duration="1822000" />
<workItem from="1559405496483" duration="10478000" /> <workItem from="1559405496483" duration="10478000" />
<workItem from="1560035206797" duration="23000" /> <workItem from="1560035206797" duration="23000" />
<workItem from="1560092291448" duration="10714000" /> <workItem from="1560092291448" duration="11406000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="84911000" /> <option name="totallyTimeSpent" value="85603000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1912" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24946696" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24946696" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
...@@ -546,20 +568,6 @@ ...@@ -546,20 +568,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/vendor/autoload.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="7" selection-start-line="7" selection-end-line="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="685">
<caret line="230" column="6" selection-start-line="230" selection-start-column="6" selection-end-line="230" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/User.php"> <entry file="file://$PROJECT_DIR$/app/User.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72"> <state relative-caret-position="72">
...@@ -853,8 +861,8 @@ ...@@ -853,8 +861,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="468"> <state relative-caret-position="436">
<caret line="32" column="34" lean-forward="true" selection-start-line="32" selection-start-column="34" selection-end-line="32" selection-end-column="34" /> <caret line="32" column="34" selection-start-line="32" selection-start-column="34" selection-end-line="32" selection-end-column="34" />
<folding> <folding>
<element signature="e#6#91#0#PHP" expanded="true" /> <element signature="e#6#91#0#PHP" expanded="true" />
<element signature="e#126#150#0#PHP" expanded="true" /> <element signature="e#126#150#0#PHP" expanded="true" />
...@@ -864,7 +872,7 @@ ...@@ -864,7 +872,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/frontend/css/style.css"> <entry file="file://$PROJECT_DIR$/public/frontend/css/style.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="-488">
<caret column="96929" selection-start-column="96924" selection-end-column="96929" /> <caret column="96929" selection-start-column="96924" selection-end-column="96929" />
<folding> <folding>
<element signature="e#282780#356263#2" expanded="true" /> <element signature="e#282780#356263#2" expanded="true" />
...@@ -874,5 +882,20 @@ ...@@ -874,5 +882,20 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/frontend/fonts/fontawesome-webfont.woff2">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199">
<caret column="153397" selection-start-column="153392" selection-end-column="153397" />
<folding>
<element signature="e#282780#356263#2" expanded="true" />
<element signature="e#441261#442630#2" expanded="true" />
<element signature="e#442785#444150#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
public/css/style.css
View file @ 6d311c21
This source diff could not be displayed because it is too large. You can view the blob instead.
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