Jelajahi Sumber

Correction design / interface

Marien Fressinaud 13 tahun lalu
induk
melakukan
225fdf2295
3 mengubah file dengan 8 tambahan dan 6 penghapusan
  1. 1 1
      app/layout/aside.phtml
  2. 5 5
      app/layout/configure_aside.phtml
  3. 2 0
      public/theme/base.css

+ 1 - 1
app/layout/aside.phtml

@@ -13,7 +13,7 @@
 		
 		<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
 		<li <?php echo Request::controllerName () == 'configure' ? 'class="active"' : ''; ?>>
-			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'feed')); ?>">Configurer</a>
+			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'display')); ?>">Configurer</a>
 		</li>
 		<?php } ?>
 		

+ 5 - 5
app/layout/configure_aside.phtml

@@ -1,20 +1,20 @@
 <div class="aside">
 	<ul id="menu">
 		<li><h2>Configuration</h2></li>
+		<li <?php echo Request::actionName () == 'display' ? 'class="active"' : ''; ?>>
+			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'display')); ?>">Général et affichage</a>
+		</li>
 		<li <?php echo Request::actionName () == 'feed' ? 'class="active"' : ''; ?>>
 			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'feed')); ?>">Flux RSS</a>
 		</li>
 		<li <?php echo Request::actionName () == 'categorize' ? 'class="active"' : ''; ?>>
 			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'categorize')); ?>">Catégories</a>
 		</li>
-		<li <?php echo Request::actionName () == 'display' ? 'class="active"' : ''; ?>>
-			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'display')); ?>">Général et affichage</a>
+		<li <?php echo Request::actionName () == 'shortcut' ? 'class="active"' : ''; ?>>
+			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'shortcut')); ?>">Raccourcis</a>
 		</li>
 		<li <?php echo Request::actionName () == 'importExport' ? 'class="active"' : ''; ?>>
 			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'importExport')); ?>">Import / Export OPML</a>
 		</li>
-		<li <?php echo Request::actionName () == 'shortcut' ? 'class="active"' : ''; ?>>
-			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'shortcut')); ?>">Raccourcis</a>
-		</li>
 	</ul>
 </div>

+ 2 - 0
public/theme/base.css

@@ -4,6 +4,8 @@
 }
 html, body {
 	height: 100%;
+	font-size: 95%;
+	font-family: "Cantarell", "sans-serif";
 }
 
 /* LIENS */