hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Security/Firewall.php
This commit is contained in:
Nicolas Le Goff
2014-02-04 11:30:23 +01:00
parent 8f9745d874 f9523ff1d8
commit 4596bf5d30
7 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/skins/account/variables.less
View File

@@ -190,8 +190,8 @@
// Sprite icons path
// -------------------------
@iconSpritePath: "../img/glyphicons-halflings.png";
@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
@iconSpritePath: "/skins/build/bootstrap/img/glyphicons-halflings.png";
@iconWhiteSpritePath: "/skins/build/bootstrap/img/glyphicons-halflings-white.png";
// Input placeholder text color

4
www/skins/login/less/variables.less
View File

@@ -194,8 +194,8 @@
// Sprite icons path
// -------------------------
@iconSpritePath: "../img/glyphicons-halflings.png";
@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
@iconSpritePath: "/skins/build/bootstrap/img/glyphicons-halflings.png";
@iconWhiteSpritePath: "/skins/build/bootstrap/img/glyphicons-halflings-white.png";
// Input placeholder text color