Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb
This commit is contained in:
sidya82
commit
c8af84859d
Binary file not shown.
|
|
@ -1,9 +1,13 @@
|
|||
html
|
||||
{
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
body
|
||||
{
|
||||
background-image:url("../pictures/setting_picture/fond.jpg");
|
||||
background-attachment:fixed;
|
||||
background-repeat:no-repeat;
|
||||
background-position:100% 100%;
|
||||
background-size:cover;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,15 +21,18 @@ body {
|
|||
height: 40%;
|
||||
}
|
||||
|
||||
.imgSearch /* image de la loupe */
|
||||
.divRecherche
|
||||
{
|
||||
height: 25px;
|
||||
width : 25px;
|
||||
margin-top: 2%;
|
||||
}
|
||||
|
||||
.form-group
|
||||
.inpSear
|
||||
{
|
||||
margin-top : 0.5%;
|
||||
background-image: url(/pictures/homePic/search.png);
|
||||
background-size: 30px;
|
||||
background-repeat: no-repeat;
|
||||
text-indent: 15%;
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
.imgRef
|
||||
|
|
@ -38,24 +41,31 @@ body {
|
|||
box-shadow: 0px 0px 3px black;
|
||||
max-height : 250px;
|
||||
max-width : 250px;
|
||||
background: #ffffff; /* Old browsers */
|
||||
background: #ffffff; /* Old browsers */
|
||||
background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); /* FF3.6+ */
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#e5e5e5)); /* Chrome,Safari4+ */
|
||||
background: -webkit-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* Chrome10+,Safari5.1+ */
|
||||
background: -o-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* Opera 11.10+ */
|
||||
background: -ms-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* IE10+ */
|
||||
background: linear-gradient(to bottom, #ffffff 0%,#e5e5e5 100%); /* W3C */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5',GradientType=0 );
|
||||
}
|
||||
|
||||
.well, .well-lg /* le nom du referent */
|
||||
.nomRef /* le nom du referent */
|
||||
{
|
||||
margin : 1%;
|
||||
width : 40%;
|
||||
padding : 2% 4% 2% 4%;
|
||||
width: 40%;
|
||||
box-shadow: 0 0 6px black inset;
|
||||
border: 1px solid dimgrey;
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
font-size: 1.5em;
|
||||
>>>>>>> 407a955444da6207f59c5f05d283275510b2169c
|
||||
}
|
||||
|
||||
.carousel-indicators
|
||||
{
|
||||
position: fixed;
|
||||
bottom : 8%;
|
||||
width: 60%;
|
||||
position:absolute;
|
||||
top : 102%;
|
||||
}
|
||||
|
||||
.carousel-indicators li { /*tous les cercles */
|
||||
|
|
|
|||
|
|
@ -23,6 +23,12 @@ table thead tr th
|
|||
text-align: center;
|
||||
}
|
||||
|
||||
tbody tr
|
||||
{
|
||||
background: green;
|
||||
color:red;
|
||||
}
|
||||
|
||||
.listg
|
||||
{
|
||||
background: #a7cfdf; /* Old browsers */
|
||||
|
|
@ -33,12 +39,13 @@ background: -o-linear-gradient(top, #a7cfdf 0%,#23538a 100%); /* Opera 11.10+ */
|
|||
background: -ms-linear-gradient(top, #a7cfdf 0%,#23538a 100%); /* IE10+ */
|
||||
background: linear-gradient(to bottom, #a7cfdf 0%,#23538a 100%); /* W3C */
|
||||
|
||||
margin: 1%;
|
||||
padding: 1%;
|
||||
|
||||
border-radius: 7px;
|
||||
border: 1px solid grey;
|
||||
box-shadow: 0px 0px 2px dimgrey;
|
||||
width : 25%;
|
||||
margin-left:1%;
|
||||
margin-right: 0.5%;
|
||||
padding: 3%;
|
||||
}
|
||||
|
||||
.tablethead
|
||||
|
|
@ -56,6 +63,7 @@ background: linear-gradient(to bottom, #a7cfdf 0%,#23538a 100%); /* W3C */
|
|||
color: white;
|
||||
}
|
||||
|
||||
|
||||
.listRecherche
|
||||
{
|
||||
margin: 1%;
|
||||
|
|
@ -84,13 +92,14 @@ background: linear-gradient(to bottom, #a7cfdf 0%,#23538a 100%); /* W3C */
|
|||
|
||||
.princ
|
||||
{
|
||||
margin: 1%;
|
||||
padding: 1%;
|
||||
|
||||
background: white;
|
||||
border-radius: 7px;
|
||||
border: 1px solid grey;
|
||||
box-shadow: 0px 0px 2px dimgrey;
|
||||
width : 70%;
|
||||
margin-left:0.5%;
|
||||
margin-right: 1%;
|
||||
padding: 2%;
|
||||
}
|
||||
|
||||
.jeux
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
function hideIcon(self) {
|
||||
self.style.backgroundImage = 'none';
|
||||
}
|
||||
Binary file not shown.
|
|
@ -7,10 +7,9 @@
|
|||
<img style="height:auto; width:auto; max-width:100px;" alt="" src="./pictures/homePic/home.png">
|
||||
<nav>
|
||||
<form class="form-inline navbar">
|
||||
<div class="form-group">
|
||||
<img alt="" class="imgSearch" src="./pictures/homePic/search.png">
|
||||
<div class="input-group">
|
||||
</span><input type="text" class="form-control" placeholder="Rechercher un Référant">
|
||||
<div class="row divRecherche">
|
||||
<div class="col-xs-12">
|
||||
<input class="form-control inpSear" placeholder="Rechercher un Référant" name="search" onchange="hideIcon(this);" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
@ -42,7 +41,7 @@
|
|||
@endif
|
||||
<br>
|
||||
<a href="/referents/vive.linux/games"><img class="imgRef" src="{{$ref -> image}}" width="300px" alt="{{ $ref -> name }}-Nom"></a>
|
||||
<a href="/referents/vive.linux/games"><div class="well well-lg ">{{$ref -> firstname}}, {{$ref -> lastname}}</div></a>
|
||||
<a href="/referents/vive.linux/games"><div class="well well-lg nomRef">{{$ref -> firstname}}, {{$ref -> lastname}}</div></a>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
|
|
@ -66,6 +65,11 @@ blabla LOL
|
|||
|
||||
<script type="text/javascript">
|
||||
document.oncontextmenu = new Function("return false");
|
||||
|
||||
function hideIcon(self) {
|
||||
self.style.backgroundImage = 'none';
|
||||
}
|
||||
|
||||
</script>
|
||||
</center>
|
||||
@endsection
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
<link href="css/referent.css" rel="stylesheet" type="text/css"/>
|
||||
<br>
|
||||
<!-- Navbar left -->
|
||||
<div class="col-md-2 listg">
|
||||
<div class=" col-md-3">
|
||||
<div class="listg">
|
||||
<legend>Créer une liste oeuvre:</legend>
|
||||
<form class="form-inline" method="POST" role="form" action="addListeOeuvre">
|
||||
<input type="hidden" name="idUser" value="{{ $me->id }}">
|
||||
|
|
@ -48,9 +49,10 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-9 princ">
|
||||
<div class="col-md-9">
|
||||
<div class="princ">
|
||||
<!-- switch a rajouté -->
|
||||
<legend id="sessionName"></legend>
|
||||
|
||||
|
|
@ -76,7 +78,6 @@
|
|||
<br><br>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- TAKE ALL THAT'S INSIDE THIS DIV FOR "ADD PICTURES" -->
|
||||
<div id="addpicture" style="display:none">
|
||||
|
||||
|
|
@ -200,10 +201,5 @@
|
|||
</div>
|
||||
<br><br><br>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
@endsection
|
||||
|
|
|
|||
Reference in New Issue