Revize 4a535717

Fix: merge-fix (content alignment style)

application/manual.php

@@ -27 +27 @@
     <?php include "./view/menu.php" ?>
 
     <div class="row app-content">
-        <div class="col-xs-12 col-sm-10 p-4 content d-flex">
+        <div class="col-xs-12 col-sm-12 p-4 content d-flex">
             <?php include "./view/manualContent.php" ?>
         </div>
     </div>

application/view/menu.php

@@ -2 +2 @@
     <div class="d-flex mx-auto">
         <a class="px-4 py-1 <?php echo (strstr($_SERVER['PHP_SELF'], '/index.php') ? 'active' : '');?>" href="index.php">Úvodní info</a>
         <a class="px-4 py-1 <?php echo (strstr($_SERVER['PHP_SELF'],'/search.php') ? 'active' : '');?>" href="search.php">Vyhledávání</a>
+        <a class="px-4 py-1 <?php echo (strstr($_SERVER['PHP_SELF'],'/manual.php') ? 'active' : '');?>" href="manual.php">Manuál</a>
         <a class="px-4 py-1 <?php echo (strstr($_SERVER['PHP_SELF'],'/login.php') ? 'active' : '');?>" href="#" data-toggle="modal" data-target="#login-modal">Přihlášení</a>
         <?php
             if (isset($_SESSION['role']) && $_SESSION['role'] == "admin") {
@@ -11 +12 @@
             }
         ?>
         <a class="my-auto px-4 py-1 <?php echo (strstr($_SERVER['PHP_SELF'],'/settings.php') ? 'active' : '');?>" href="#" data-toggle="modal" data-target="#settings-modal" id="modalSettingsHref">Nastavení</a>
-        <a class="px-4 py-1 <?php echo (strstr($_SERVER['PHP_SELF'],'/manual.php') ? 'active' : '');?>" href="manual.php">Manuál</a>
     </div>
 </div>

application/view/style.css

@@ -84 +84 @@
   max-width: none !important;
 }
 
+.app-content .content {
+  height: 100%;
+  overflow: auto;
+}
+
 .app-content .content .search-results {
   height: 100%;
   overflow: auto;