Moved frontend code from dist/ to src/
We no longer compile it, so it’s technically the “source” now
Ingo Schommer
6
.gitattributes
vendored
@ -2,9 +2,3 @@ docs/ export-ignore
|
||||
|
||||
# Line endings
|
||||
sake text eol=lf
|
||||
|
||||
# Hide diffs
|
||||
admin/client/dist/js/ -diff
|
||||
admin/client/dist/css/ -diff
|
||||
client/dist/js/ -diff
|
||||
client/dist/css/ -diff
|
||||
|
||||
|
Before Width: | Height: | Size: 666 B After Width: | Height: | Size: 666 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 655 B After Width: | Height: | Size: 655 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 495 B After Width: | Height: | Size: 495 B |
|
Before Width: | Height: | Size: 575 B After Width: | Height: | Size: 575 B |
|
Before Width: | Height: | Size: 653 B After Width: | Height: | Size: 653 B |
|
Before Width: | Height: | Size: 709 B After Width: | Height: | Size: 709 B |
@ -1,3 +1,5 @@
|
||||
/* This file is manually maintained, it is not generated from SCSS sources */
|
||||
|
||||
body{
|
||||
background:#eee !important;
|
||||
margin:0;
|
||||
@ -925,16 +925,16 @@ class File extends DataObject implements ShortcodeHandler, AssetContainer, Thumb
|
||||
$extension = strtolower($extension);
|
||||
|
||||
// Check if exact extension has an icon
|
||||
if (!file_exists(FRAMEWORK_PATH ."/client/dist/images/app_icons/{$extension}_92.png")) {
|
||||
if (!file_exists(FRAMEWORK_PATH ."/client/src/images/app_icons/{$extension}_92.png")) {
|
||||
$extension = static::get_app_category($extension);
|
||||
|
||||
// Fallback to category specific icon
|
||||
if (!file_exists(FRAMEWORK_PATH ."/client/dist/images/app_icons/{$extension}_92.png")) {
|
||||
if (!file_exists(FRAMEWORK_PATH ."/client/src/images/app_icons/{$extension}_92.png")) {
|
||||
$extension ="generic";
|
||||
}
|
||||
}
|
||||
|
||||
return FRAMEWORK_DIR ."/client/dist/images/app_icons/{$extension}_92.png";
|
||||
return FRAMEWORK_DIR ."/client/src/images/app_icons/{$extension}_92.png";
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -104,7 +104,7 @@ class Folder extends File
|
||||
*/
|
||||
public function getIcon()
|
||||
{
|
||||
return FRAMEWORK_DIR . "/client/dist/images/app_icons/folder_icon_large.png";
|
||||
return FRAMEWORK_DIR . "/client/src/images/app_icons/folder_icon_large.png";
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -216,7 +216,7 @@ class DebugView extends Object
|
||||
$debugCSS = Controller::join_links(
|
||||
Director::absoluteBaseURL(),
|
||||
FRAMEWORK_DIR,
|
||||
'client/dist/styles/debug.css'
|
||||
'client/src/styles/debug.css'
|
||||
);
|
||||
|
||||
$output = '<!DOCTYPE html><html><head><title>' . $url . '</title>';
|
||||
|
||||
|
Before Width: | Height: | Size: 741 B After Width: | Height: | Size: 741 B |
@ -1,3 +1,5 @@
|
||||
/* This file is manually maintained, it is not generated from SCSS sources */
|
||||
|
||||
body{
|
||||
font-family:Arial,san-serif;
|
||||
margin-bottom:18px;
|
||||
@ -7,8 +7,8 @@
|
||||
<title>SilverStripe CMS / Framework Installation</title>
|
||||
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
|
||||
<script type="application/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script>
|
||||
<script type="application/javascript" src="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/dist/js/install.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/dist/styles/install.css">
|
||||
<script type="application/javascript" src="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/src/js/install.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/src/styles/install.css">
|
||||
<link rel="shortcut icon" href="favicon.ico">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@ -1315,7 +1315,7 @@ class Installer extends InstallRequirements {
|
||||
<head>
|
||||
<meta charset="utf-8"/>
|
||||
<title>Installing SilverStripe...</title>
|
||||
<link rel="stylesheet" type="text/css" href="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/dist/styles/install.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/src/styles/install.css"/>
|
||||
<script src="//code.jquery.com/jquery-1.7.2.min.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<html>
|
||||
<head>
|
||||
<title>PHP 5.5.0 is required</title>
|
||||
<link rel="stylesheet" type="text/css" href="framework/src/Dev/Install/client/dist/styles/install.css">
|
||||
<link rel="stylesheet" type="text/css" href="framework/src/Dev/Install/client/src/styles/install.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="BgContainer">
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
$MetaTags
|
||||
|
||||
<% require themedCSS('client/dist/styles/debug') %>
|
||||
<% require themedCSS('client/src/styles/debug') %>
|
||||
</head>
|
||||
<body>
|
||||
<div class="info">
|
||||
|
||||