diff --git a/.gitattributes b/.gitattributes index 2733a3b5c..9612f64ef 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/client/dist/images/app_icons/archive_92.png b/client/src/images/app_icons/archive_92.png similarity index 100% rename from client/dist/images/app_icons/archive_92.png rename to client/src/images/app_icons/archive_92.png diff --git a/client/dist/images/app_icons/audio_92.png b/client/src/images/app_icons/audio_92.png similarity index 100% rename from client/dist/images/app_icons/audio_92.png rename to client/src/images/app_icons/audio_92.png diff --git a/client/dist/images/app_icons/document_92.png b/client/src/images/app_icons/document_92.png similarity index 100% rename from client/dist/images/app_icons/document_92.png rename to client/src/images/app_icons/document_92.png diff --git a/client/dist/images/app_icons/folder_32.png b/client/src/images/app_icons/folder_32.png similarity index 100% rename from client/dist/images/app_icons/folder_32.png rename to client/src/images/app_icons/folder_32.png diff --git a/client/dist/images/app_icons/folder_icon_large.png b/client/src/images/app_icons/folder_icon_large.png similarity index 100% rename from client/dist/images/app_icons/folder_icon_large.png rename to client/src/images/app_icons/folder_icon_large.png diff --git a/client/dist/images/app_icons/generic_92.png b/client/src/images/app_icons/generic_92.png similarity index 100% rename from client/dist/images/app_icons/generic_92.png rename to client/src/images/app_icons/generic_92.png diff --git a/client/dist/images/app_icons/video_92.png b/client/src/images/app_icons/video_92.png similarity index 100% rename from client/dist/images/app_icons/video_92.png rename to client/src/images/app_icons/video_92.png diff --git a/client/dist/images/logo_small.png b/client/src/images/logo_small.png similarity index 100% rename from client/dist/images/logo_small.png rename to client/src/images/logo_small.png diff --git a/client/dist/styles/debug.css b/client/src/styles/debug.css similarity index 97% rename from client/dist/styles/debug.css rename to client/src/styles/debug.css index f0b21168b..f0772a492 100644 --- a/client/dist/styles/debug.css +++ b/client/src/styles/debug.css @@ -1,3 +1,5 @@ +/* This file is manually maintained, it is not generated from SCSS sources */ + body{ background:#eee !important; margin:0; diff --git a/src/Assets/File.php b/src/Assets/File.php index 1482b6992..383615ab3 100644 --- a/src/Assets/File.php +++ b/src/Assets/File.php @@ -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"; } /** diff --git a/src/Assets/Folder.php b/src/Assets/Folder.php index c40b52005..580c4b17f 100644 --- a/src/Assets/Folder.php +++ b/src/Assets/Folder.php @@ -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"; } /** diff --git a/src/Dev/DebugView.php b/src/Dev/DebugView.php index a77e042a8..9f986144a 100644 --- a/src/Dev/DebugView.php +++ b/src/Dev/DebugView.php @@ -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 = '' . $url . ''; diff --git a/src/Dev/Install/client/dist/images/ss-logo.png b/src/Dev/Install/client/src/images/ss-logo.png similarity index 100% rename from src/Dev/Install/client/dist/images/ss-logo.png rename to src/Dev/Install/client/src/images/ss-logo.png diff --git a/src/Dev/Install/client/dist/js/install.js b/src/Dev/Install/client/src/js/install.js similarity index 100% rename from src/Dev/Install/client/dist/js/install.js rename to src/Dev/Install/client/src/js/install.js diff --git a/src/Dev/Install/client/dist/styles/install.css b/src/Dev/Install/client/src/styles/install.css similarity index 99% rename from src/Dev/Install/client/dist/styles/install.css rename to src/Dev/Install/client/src/styles/install.css index 093047c21..f701014bb 100644 --- a/src/Dev/Install/client/dist/styles/install.css +++ b/src/Dev/Install/client/src/styles/install.css @@ -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; diff --git a/src/Dev/Install/config-form.html b/src/Dev/Install/config-form.html index 0e64707f0..ae5064927 100644 --- a/src/Dev/Install/config-form.html +++ b/src/Dev/Install/config-form.html @@ -7,8 +7,8 @@ SilverStripe CMS / Framework Installation - - + + diff --git a/src/Dev/Install/install.php5 b/src/Dev/Install/install.php5 index ac0bf503c..80da844bf 100755 --- a/src/Dev/Install/install.php5 +++ b/src/Dev/Install/install.php5 @@ -1315,7 +1315,7 @@ class Installer extends InstallRequirements { Installing SilverStripe... - + diff --git a/src/Dev/Install/php5-required.html b/src/Dev/Install/php5-required.html index a535fb61a..fe565748c 100644 --- a/src/Dev/Install/php5-required.html +++ b/src/Dev/Install/php5-required.html @@ -1,7 +1,7 @@ PHP 5.5.0 is required - +
diff --git a/templates/SilverStripe/Control/Controller.ss b/templates/SilverStripe/Control/Controller.ss index fb92a1903..b7aee1dab 100644 --- a/templates/SilverStripe/Control/Controller.ss +++ b/templates/SilverStripe/Control/Controller.ss @@ -6,7 +6,7 @@ $MetaTags - <% require themedCSS('client/dist/styles/debug') %> + <% require themedCSS('client/src/styles/debug') %>