]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
merge
authorThomas Citharel <tcit@tcit.fr>
Sat, 31 Jan 2015 22:50:40 +0000 (23:50 +0100)
committerThomas Citharel <tcit@tcit.fr>
Sat, 31 Jan 2015 22:50:40 +0000 (23:50 +0100)
1  2 
install/index.php

index 73c594cdc11abbeb6d7787bd76d46031ade2afcd,54f7f7f2ae15d4a62dfc3f866d462754429040c9..68ed1326a5d2bf9866a4513a5a6648982ab98562
@@@ -275,19 -275,27 +275,40 @@@ background-color:#FF9500
  .detail {
  cursor: pointer;
  }
 +.descriptions {
 +    margin-left: 10%;
 +    position: relative;
 +    top: 50%;
 +}
 +.database_inputs {
 +    float: left;
 +    width: 50%
 +}
 +.database_info {
 +    width: 100%;
 +    overflow: auto;
 +}
+ .compatibity_result {
+       margin: auto;
+       max-width: 300px;
+       min-height: 50px;
+       line-height: 50px;
+       text-align: center;
+ }
+ h2, legend {
+       font-size: 30px;
+       text-transform: uppercase;
+       font-family: "PT Sans",sans-serif;
+ }
+ legend:after {
+     content: "";
+     height: 4px;
+     width: 70px;
+     background-color: #000;
+     display: block;
+ }
  
  </style>
  
@@@ -507,9 -521,8 +534,9 @@@ php composer.phar install</code></pre><
                      </ul>
                      </div>
                  <?php endif; ?>
 -                <fieldset>
 +                <div class="database_info">
 +                <fieldset class="database_inputs">
-                     <legend><strong>Technical settings</strong></legend>
+                     <legend><strong>Database settings</strong></legend>
                      <p>
                          Database engine:
                          <ul>