Skip to content
Permalink
Browse files

fix navbar on phones

  • Loading branch information...
guigur committed Nov 19, 2018
1 parent c91829e commit 3247a89a2ab5e8eeb8decdcafed06ebb84f784ec
Showing with 46 additions and 77 deletions.
  1. +41 −70 guigur.com/.idea/workspace.xml
  2. +5 −7 guigur.com/app/Resources/views/base.html.twig
@@ -2,19 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="aaaad929-e14e-4a5b-b12c-a47b4746f5d8" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/web/css/bootstrap_dark.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/img/article_default.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/js/jquery-3.3.1.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/js/js.cookie.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Resources/views/Article_min_display.html.twig" beforeDir="false" afterPath="$PROJECT_DIR$/app/Resources/views/Article_min_display.html.twig" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Resources/views/base.html.twig" beforeDir="false" afterPath="$PROJECT_DIR$/app/Resources/views/base.html.twig" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GuigurFrontBundle/Controller/DefaultController.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/GuigurFrontBundle/Controller/DefaultController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GuigurFrontBundle/Controller/ProjectController.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/GuigurFrontBundle/Controller/ProjectController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GuigurFrontBundle/Resources/views/Default/index.html.twig" beforeDir="false" afterPath="$PROJECT_DIR$/src/GuigurFrontBundle/Resources/views/Default/index.html.twig" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GuigurFrontBundle/Service/ProjectsService.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/GuigurFrontBundle/Service/ProjectsService.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/web/css/custom.css" beforeDir="false" afterPath="$PROJECT_DIR$/web/css/custom.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/web/js/jquery.js" beforeDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -62,7 +51,7 @@
<entry key="css" value="1886" />
<entry key="dummy" value="5" />
<entry key="php" value="3999" />
<entry key="twig" value="7711" />
<entry key="twig" value="7766" />
<entry key="yml" value="163" />
</counts>
</usages-collector>
@@ -71,7 +60,7 @@
<entry key="CSS" value="1886" />
<entry key="PHP" value="3999" />
<entry key="PLAIN_TEXT" value="5" />
<entry key="Twig" value="7711" />
<entry key="Twig" value="7766" />
<entry key="YAML" value="163" />
</counts>
</usages-collector>
@@ -104,34 +93,14 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/Resources/views/base.html.twig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1547">
<caret line="108" column="47" selection-start-line="108" selection-start-column="47" selection-end-line="108" selection-end-column="47" />
<state relative-caret-position="457">
<caret line="103" column="5" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />
<folding>
<element signature="n#script#1;n#head#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/GuigurFrontBundle/Controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="18" column="66" selection-start-line="18" selection-start-column="66" selection-end-line="18" selection-end-column="66" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/GuigurFrontBundle/Controller/DefaultController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="867">
<caret line="51" column="64" selection-start-line="51" selection-start-column="64" selection-end-line="51" selection-end-column="64" />
<folding>
<element signature="e#48#84#0#PHP" expanded="true" />
<element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
@@ -155,11 +124,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/GuigurFrontBundle/Resources/views/Default/index.html.twig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="680">
<caret line="58" column="10" lean-forward="true" selection-start-line="58" selection-start-column="10" selection-end-line="58" selection-end-column="10" />
<caret line="58" column="10" selection-start-line="58" selection-start-column="10" selection-end-line="58" selection-end-column="10" />
</state>
</provider>
</entry>
@@ -218,10 +187,11 @@
<find>coo</find>
<find>cloudf</find>
<find>poil</find>
<find>default</find>
<find>projec</find>
<find>\{\{ dump\(Project\) \}\}\n</find>
<find>projec</find>
<find>default</find>
<find>jque</find>
<find>collapse</find>
</findStrings>
<replaceStrings>
<replace />
@@ -278,13 +248,13 @@
<option value="$PROJECT_DIR$/web/css/bootstrap_dark.css" />
<option value="$PROJECT_DIR$/web/css/custom.css" />
<option value="$PROJECT_DIR$/app/Resources/views/Article_min_display.html.twig" />
<option value="$PROJECT_DIR$/app/Resources/views/base.html.twig" />
<option value="$PROJECT_DIR$/src/GuigurFrontBundle/Controller/ArchivesController.php" />
<option value="$PROJECT_DIR$/src/GuigurFrontBundle/Controller/DefaultController.php" />
<option value="$PROJECT_DIR$/src/GuigurFrontBundle/Controller/ProjectController.php" />
<option value="$PROJECT_DIR$/src/GuigurFrontBundle/Service/ProjectsService.php" />
<option value="$PROJECT_DIR$/src/GuigurFrontBundle/Resources/views/Default/project.html.twig" />
<option value="$PROJECT_DIR$/src/GuigurFrontBundle/Resources/views/Default/index.html.twig" />
<option value="$PROJECT_DIR$/app/Resources/views/base.html.twig" />
</list>
</option>
</component>
@@ -563,12 +533,12 @@
<workItem from="1541451835076" duration="2543000" />
<workItem from="1541807246803" duration="675000" />
<workItem from="1541831994517" duration="44000" />
<workItem from="1542607744734" duration="11873000" />
<workItem from="1542607744734" duration="14443000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="132517000" />
<option name="totallyTimeSpent" value="135087000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -592,7 +562,7 @@
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Database" order="3" visible="true" weight="0.16151386" />
<window_info anchor="right" id="Database" order="3" weight="0.16151386" />
</layout>
<layout-to-restore>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15618336" />
@@ -878,61 +848,62 @@
<entry file="file://$PROJECT_DIR$/web/img/Projects/borne_d_arcade.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/web/css/custom.css">
<entry file="file://$PROJECT_DIR$/src/GuigurFrontBundle/Resources/views/Default/project.html.twig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-10">
<caret line="294" column="13" selection-start-line="294" selection-start-column="13" selection-end-line="294" selection-end-column="13" />
<state relative-caret-position="119">
<caret line="7" column="17" lean-forward="true" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/GuigurFrontBundle/Controller/ProjectController.php">
<entry file="file://$PROJECT_DIR$/src/GuigurFrontBundle/Service/ProjectsService.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="18" column="66" selection-start-line="18" selection-start-column="66" selection-end-line="18" selection-end-column="66" />
<state relative-caret-position="459">
<caret line="29" column="5" selection-start-line="29" selection-start-column="5" selection-end-line="29" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Resources/views/base.html.twig">
<entry file="file://$PROJECT_DIR$/web/css/custom.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1547">
<caret line="108" column="47" selection-start-line="108" selection-start-column="47" selection-end-line="108" selection-end-column="47" />
<folding>
<element signature="n#script#1;n#head#0;n#html#0;n#!!top" />
</folding>
<state relative-caret-position="-10">
<caret line="294" column="13" selection-start-line="294" selection-start-column="13" selection-end-line="294" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/GuigurFrontBundle/Controller/DefaultController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="867">
<state relative-caret-position="744">
<caret line="51" column="64" selection-start-line="51" selection-start-column="64" selection-end-line="51" selection-end-column="64" />
<folding>
<element signature="e#48#84#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/GuigurFrontBundle/Resources/views/Default/project.html.twig">
<entry file="file://$PROJECT_DIR$/src/GuigurFrontBundle/Controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" column="17" lean-forward="true" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="299">
<caret line="18" column="66" selection-start-line="18" selection-start-column="66" selection-end-line="18" selection-end-column="66" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/GuigurFrontBundle/Service/ProjectsService.php">
<entry file="file://$PROJECT_DIR$/src/GuigurFrontBundle/Resources/views/Default/index.html.twig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="29" column="5" selection-start-line="29" selection-start-column="5" selection-end-line="29" selection-end-column="5" />
<state relative-caret-position="680">
<caret line="58" column="10" selection-start-line="58" selection-start-column="10" selection-end-line="58" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/GuigurFrontBundle/Resources/views/Default/index.html.twig">
<entry file="file://$PROJECT_DIR$/app/Resources/views/base.html.twig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="680">
<caret line="58" column="10" lean-forward="true" selection-start-line="58" selection-start-column="10" selection-end-line="58" selection-end-column="10" />
<state relative-caret-position="457">
<caret line="103" column="5" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />
<folding>
<element signature="n#script#1;n#head#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
@@ -42,17 +42,17 @@
<!-- reCAPTCHA -->
<script src='https://www.google.com/recaptcha/api.js'></script>
</head>

<body>
<nav class="navbar navbar navbar-expand-md sticky-top navbar-dark bg-darker">

<nav class="navbar navbar-expand-md navbar-inverse sticky-top navbar-dark bg-darker">
<div class="container">
<a class="navbar-brand" href="{{ path('Homepage') }}">
<img src="{{ asset('img/guigur_.com_green_small.png') }}" height="50em" alt="">
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavDropdown">
<div class="collapse navbar-collapse justify-content-between" id="navbar">
<ul class="navbar-nav">
<li class="nav-item {% if app.request.get('_route') == 'Homepage' %}active{% endif %}">
<a class="nav-link" href="{{ path('Homepage') }}"><span class="fa fa-home" aria-hidden="true"></span> Accueil</a>
@@ -79,8 +79,6 @@
<a class="nav-link" href="{{ path('Contact') }}"><span class="fa fa-envelope" aria-hidden="true"></span> Contact</a>
</li>
</ul>
</div>
<div class="collapse navbar-collapse justify-content-end" id="nav-content">
<ul class="navbar-nav">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -103,7 +101,7 @@
</div>
</div>
</nav>
<div class="container" style="margin-top:2em;">
<div class="container" style="margin-top:2em;">
<div class="modal fade" id="guigurModal" tabindex="-1" role="dialog" aria-labelledby="guigurModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">

0 comments on commit 3247a89

Please sign in to comment.
You can’t perform that action at this time.