Skip to content

Commit

Permalink
Mise à jour pour la version alpha6 du CMS.
Browse files Browse the repository at this point in the history
  • Loading branch information
mathieu-noel committed Jun 7, 2019
1 parent 6d8e7b1 commit a4a2056
Show file tree
Hide file tree
Showing 12 changed files with 154 additions and 2,703 deletions.
132 changes: 131 additions & 1 deletion assets/css/admin.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,68 @@
.btn.btn-action {
margin-right: 5px;
}
.btn-toogle-password {
background: none;
color: #337ab7;
font-weight: 600;
padding: 0 8px;
z-index: 9;
}
.btn-toogle-password i {
width: 22px;
}
.sticky nav{
position: initial;
top: 4em;
}
.form-group-flex{
display: initial;
}
@media (min-width: 992px){
.sticky nav{
position: -webkit-sticky;
position: sticky;
}
.form-group-flex{
display: flex;
}
}

/* --------------------------- */
/* ---------- FILE ----------- */
/* --------------------------- */
.input-file-img {
width: auto;
max-height: 200px;
width: auto;
}
input.form-file-name,
input.form-file-reset{
vertical-align: middle;
}
input.form-file-name{
-webkit-border-top-right-radius: 0;
-webkit-border-bottom-right-radius: 0;
-moz-border-radius-topright: 0;
-moz-border-radius-bottomright: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-right: 0;
}
input.form-file-reset{
-webkit-border-top-left-radius: 0;
-webkit-border-bottom-left-radius: 0;
-moz-border-radius-topleft: 0;
-moz-border-radius-bottomleft: 0;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
font-weight: bold;
}
input.form-file-reset[disabled] {
cursor: not-allowed;
pointer-events: visible;
}


/* --------------------------- */
/* ---------- USER ----------- */
/* --------------------------- */
Expand Down Expand Up @@ -133,4 +188,79 @@
text-align: center;
padding: .75em;
}
}


/* --------------------------- */
/* -------- TOOLTIP ---------- */
/* --------------------------- */
label[data-tooltip] {
display: block;
}
label[data-tooltip] {
cursor: help;
position: relative;
}
label[data-tooltip]:before,
label[data-tooltip]:after {
opacity: 0;
visibility: hidden;
z-index: 9999;
}
label[data-tooltip]:before {
bottom: 100%;
background: #20222d;
background: rgba(32, 34, 45, 0.8);
color: #fff;
content: attr(data-tooltip);
font-size: 14px;
left: -10px;
margin-bottom: 9px;
padding: 8px 10px;
position: absolute;
}
label[data-tooltip]:before {
transform: none;
}
/* Triangle */
label[data-tooltip]:after {
border-top: 10px solid #20222d;
border-right: 10px solid transparent;
border-left: 10px solid transparent;
bottom: 100%;
content: "";
left: 0;
position: absolute;
}
label[data-tooltip]:hover:before,
label[data-tooltip]:hover:after {
opacity: 1;
transition: opacity .5s;
visibility: visible;
}

/* --------------------------- */
/* -------- MODULES ---------- */
/* --------------------------- */
.module-icon {
width: 4em;
background: #e6e7f4;
background-color: rgb(230, 231, 244);
color: #666999;
font-size: 1em;
display: inline-block;
line-height: 2em;
text-align: center;
padding: 1em;
border-radius: 4em;
font-size: 1em;
}
.table > tbody > tr > th{
padding: 0;
}
@media (max-width: 768px) {
.module-icon {
width: 100%;
border-radius: 0;
}
}
4 changes: 0 additions & 4 deletions assets/css/font-awesome.min.css

This file was deleted.

22 changes: 1 addition & 21 deletions assets/css/main.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import url(font-awesome.min.css);
@import "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400";

/*
Expand Down Expand Up @@ -2080,16 +2079,6 @@ input[type="radio"] + label {
position: relative;
}

input[type="checkbox"] + label:before,
input[type="radio"] + label:before {
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
font-family: FontAwesome;
font-style: normal;
font-weight: normal;
text-transform: none !important;
}

input[type="checkbox"] + label:before,
input[type="radio"] + label:before {
border-radius: 8px;
Expand All @@ -2107,7 +2096,7 @@ input[type="radio"] + label:before {

input[type="checkbox"]:checked + label:before,
input[type="radio"]:checked + label:before {
content: '\f00c';
content: '\2714';
}

input[type="checkbox"] + label:before {
Expand Down Expand Up @@ -2221,15 +2210,6 @@ input[type="radio"]:focus + label:before {
position: relative;
}

.icon:before {
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
font-family: FontAwesome;
font-style: normal;
font-weight: normal;
text-transform: none !important;
}

.icon > .label {
display: none;
}
Expand Down
Binary file removed assets/fonts/FontAwesome.otf
Binary file not shown.
Binary file removed assets/fonts/fontawesome-webfont.eot
Binary file not shown.
2,671 changes: 0 additions & 2,671 deletions assets/fonts/fontawesome-webfont.svg

This file was deleted.

Binary file removed assets/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file removed assets/fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file removed assets/fonts/fontawesome-webfont.woff2
Binary file not shown.
14 changes: 8 additions & 6 deletions html.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,30 @@
-->
<html>
<head>
<title><?php echo $title ?></title>
<?php if( $favicon ): ?>
<meta charset="utf-8" />
<title><?php echo $title; ?></title>
<?php if ($favicon): ?>
<link rel="shortcut icon" type="image/png" href="<?php echo $favicon; ?>"/>
<?php endif; ?>
<meta charset="utf-8" />
<meta name="description" content="<?php echo $description ?>"/>
<meta name="keywords" content="<?php echo $keyboard ?>"/>
<meta name="description" content="<?php echo $description; ?>"/>
<meta name="keywords" content="<?php echo $keyboard; ?>"/>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
<link rel="stylesheet" href="<?php echo $base_theme; ?>assets/css/main.css" />
<link rel="stylesheet" href="<?php echo $base_theme; ?>assets/css/layout.css" />
<link rel="stylesheet" href="<?php echo $base_theme; ?>assets/css/style.css" />
<link rel="stylesheet" href="<?php echo $base_theme; ?>assets/css/admin.css" />
<noscript><link rel="stylesheet" href="<?php echo $base_theme; ?>assets/css/noscript.css" /></noscript>
<?php echo $styles ?>
<script src="<?php echo $base_theme; ?>assets/js/jquery.min.js"></script>
</head>
<body class="is-preload">
<!-- Wrapper -->
<div id="wrapper">
<?php echo $block[ 'page' ] ?>
</div>
<!-- Scripts -->
<script src="<?php echo $base_theme; ?>assets/js/jquery.min.js"></script>
<script src="https://code.jquery.com/ui/1.12.0/jquery-ui.min.js" integrity="sha256-eGE6blurk5sHj+rmkfsGYeKyZx3M4bG+ZlFyA7Kns7E=" crossorigin="anonymous"></script>
<script src="<?php echo $base_theme; ?>assets/js/jquery.scrollex.min.js"></script>
<script src="<?php echo $base_theme; ?>assets/js/jquery.scrolly.min.js"></script>
<script src="<?php echo $base_theme; ?>assets/js/browser.min.js"></script>
Expand Down
7 changes: 7 additions & 0 deletions page-front.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@
<dt>Email</dt>
<dd><a href="#">[email protected]</a></dd>
</dl>
<ul class="icons">
<li><a href="#" class="icon fab fa-twitter alt"><span class="label">Twitter</span></a></li>
<li><a href="#" class="icon fab fa-facebook alt"><span class="label">Facebook</span></a></li>
<li><a href="#" class="icon fab fa-instagram alt"><span class="label">Instagram</span></a></li>
<li><a href="#" class="icon fab fa-github alt"><span class="label">GitHub</span></a></li>
<li><a href="#" class="icon fab fa-dribbble alt"><span class="label">Dribbble</span></a></li>
</ul>
<?php echo $block[ 'second_menu' ]; ?>
</section>

Expand Down
7 changes: 7 additions & 0 deletions page.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@
<dt>Email</dt>
<dd><a href="#">[email protected]</a></dd>
</dl>
<ul class="icons">
<li><a href="#" class="icon fab fa-twitter alt"><span class="label">Twitter</span></a></li>
<li><a href="#" class="icon fab fa-facebook alt"><span class="label">Facebook</span></a></li>
<li><a href="#" class="icon fab fa-instagram alt"><span class="label">Instagram</span></a></li>
<li><a href="#" class="icon fab fa-github alt"><span class="label">GitHub</span></a></li>
<li><a href="#" class="icon fab fa-dribbble alt"><span class="label">Dribbble</span></a></li>
</ul>
<?php echo $block[ 'second_menu' ]; ?>
</section>
<p class="copyright">
Expand Down

0 comments on commit a4a2056

Please sign in to comment.