QRouland/ModuleWeb
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	SRC/public/css/referent.css
	SRC/resources/views/referent.blade.php
This commit is contained in:
Jerome Morjon
2015-02-19 23:02:35 +01:00
parent d80d18f9f0 dd4f2c8241
commit 6b88d2c9cd
14 changed files with 1525 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
SRC/public/css/chosen-sprite.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 538 B

BIN
SRC/public/css/chosen-sprite@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 738 B

3
SRC/public/css/chosen.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
SRC/public/css/referent.css
View File

@ -57,8 +57,12 @@ background: linear-gradient(to bottom, #a7cfdf 0%,#23538a 100%); /* W3C */
background: white;
border-radius: 7px;
border: 1px solid grey;
<<<<<<< HEAD
box-shadow: 0px 0px 2px dimgrey;
width : 40%;
=======
box-shadow: 1px 1px 2px dimgrey;
>>>>>>> origin/master
}
.jeux