Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Support for composer-created themes dir structure

Due to git limitations, we can't check out the blackcandy
"parent" theme into themes/blackcandy/ directly, since that
would require sharing paths with git repositories of other themes.
  • Loading branch information...
commit d1e65b5657020f05803bee20ea40d9f76c64800a 1 parent f86bd97
@chillu chillu authored
Showing with 16 additions and 0 deletions.
  1. +8 −0 dev/install/config-form.html
  2. +8 −0 dev/install/php5-required.html
View
8 dev/install/config-form.html
@@ -5,9 +5,17 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<script type="text/javascript" src="sapphire/thirdparty/jquery/jquery.js"></script>
<script type="text/javascript" src="sapphire/dev/install/install.js"></script>
+
+ <!-- Support for theme directory structure created through composer -->
+ <link rel="stylesheet" type="text/css" href="themes/blackcandy/blackcandy/css/layout.css">
+ <link rel="stylesheet" type="text/css" href="themes/blackcandy/blackcandy/css/typography.css">
+ <link rel="stylesheet" type="text/css" href="themes/blackcandy/blackcandy/css/form.css">
+
+ <!-- Support for legacy theme directory structure -->
<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/layout.css">
<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/typography.css">
<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/form.css">
+
<link rel="stylesheet" type="text/css" href="sapphire/dev/install/install.css">
<link rel="shortcut icon" href="favicon.ico">
</head>
View
8 dev/install/php5-required.html
@@ -1,9 +1,17 @@
<html>
<head>
<title>PHP 5 is required</title>
+
+ <!-- Support for theme directory structure created through composer -->
+ <link rel="stylesheet" type="text/css" href="themes/blackcandy/css/layout.css" />
+ <link rel="stylesheet" type="text/css" href="themes/blackcandy/css/typography.css" />
+ <link rel="stylesheet" type="text/css" href="themes/blackcandy/css/form.css" />
+
+ <!-- Support for legacy theme directory structure -->
<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/layout.css" />
<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/typography.css" />
<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/form.css" />
+
<link rel="stylesheet" type="text/css" href="sapphire/dev/install/install.css" />
</head>
<body>
Please sign in to comment.
Something went wrong with that request. Please try again.