Commit 0f83f57f authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'charte_comue_et_cosmetique' into release-1.4.0

parents ceb52bc4 32a487ec
Loading
Loading
Loading
Loading
+5 −5
Changes for module/Application/view/layout/layout.phtml: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -49,11 +49,11 @@
                    <p class="navbar-text navbar-right">
                        <?php echo $this->appConnection(); ?>
                    </p>
                    <p class="navbar-text navbar-right">
                        <?php
                            //echo $this->languageSelector();
                        ?>
                    </p>
<!--                    <p class="navbar-text navbar-right">-->
<!--                        --><?php
//                            //echo $this->languageSelector();
//                        ?>
<!--                    </p>-->
                </div><!--/.nav-collapse -->
            </div>
        </div>
+5 −5
Changes for public/css/app.css: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -97,12 +97,12 @@ h2.modal-title {
  border-color: #d23544; }

.panel-warning {
  border-color: #F19A2E; }
  border-color: #f1732d; }

.panel-warning > .panel-heading {
  color: white;
  background-color: #F19A2E;
  border-color: #F19A2E; }
  background-color: #f1732d;
  border-color: #f1732d; }

.panel.panel-md {
  font-size: 90%; }
@@ -448,8 +448,8 @@ form input[type='submit'] {
  border-color: #d23544; }

.btn-warning {
  background-color: #F19A2E;
  border-color: #F19A2E; }
  background-color: #f1732d;
  border-color: #f1732d; }

.btn.btn-xs span.glyphicon {
  margin-right: 2px; }
+1 −1
Changes for public/css/app.scss: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ $uploadedFileFontSize: 80%;

$infoColor: #009ce4;
$successColor: #2EA662;
$warningColor: #F19A2E;
$warningColor: #f1732d;
$dangerColor: #d23544;

h1, h2, h3 {