From 8f80498c2e4e4a384bfd8711920b5029eb4c19ff Mon Sep 17 00:00:00 2001 From: James Brooks Date: Mon, 21 Mar 2016 20:28:01 +0000 Subject: [PATCH] Implement Github Markdown CSS. Closes #1643 --- app/Console/Commands/DemoSeederCommand.php | 18 +++++++++ bower.json | 41 +++++++++++---------- gulpfile.js | 1 + resources/views/partials/incident.blade.php | 2 +- 4 files changed, 41 insertions(+), 21 deletions(-) diff --git a/app/Console/Commands/DemoSeederCommand.php b/app/Console/Commands/DemoSeederCommand.php index 0fe720e6..906eb2af 100644 --- a/app/Console/Commands/DemoSeederCommand.php +++ b/app/Console/Commands/DemoSeederCommand.php @@ -159,7 +159,25 @@ class DemoSeederCommand extends Command */ protected function seedIncidents() { + $incidentMessage = << 'Cachet supports Markdown!', + 'message' => $incidentMessage, + 'status' => 4, + 'component_id' => 0, + 'scheduled_at' => null, + 'visible' => 1, + ], [ 'name' => 'Awesome', 'message' => ':+1: We totally nailed the fix.', diff --git a/bower.json b/bower.json index 987d012e..31e09051 100644 --- a/bower.json +++ b/bower.json @@ -1,22 +1,23 @@ { - "name": "Cachet", - "dependencies": { - "animate-sass": "~0.6", - "autosize": "~3.0.15", - "bootstrap-sass": "~3.3", - "chartjs": "~2.0.0-beta2", - "eonasdan-bootstrap-datetimepicker": "~3.1", - "humane-js": "~3.2", - "ionicons": "~2.0", - "jquery": "~2.2", - "jquery-minicolors": "~2.2", - "jquery-serialize-object": "~2.5", - "jquery-sparkline": "~2.1", - "livestampjs": "~1.1", - "lodash": "~4.5.1", - "messenger": "~1.4", - "moment": "~2.11.2", - "Sortable": "~1.4", - "sweetalert": "~1.1" - } + "name": "Cachet", + "dependencies": { + "animate-sass": "~0.6", + "autosize": "~3.0.15", + "bootstrap-sass": "~3.3", + "chartjs": "~2.0.0-beta2", + "eonasdan-bootstrap-datetimepicker": "~3.1", + "humane-js": "~3.2", + "ionicons": "~2.0", + "jquery": "~2.2", + "jquery-minicolors": "~2.2", + "jquery-serialize-object": "~2.5", + "jquery-sparkline": "~2.1", + "livestampjs": "~1.1", + "lodash": "~4.5.1", + "messenger": "~1.4", + "moment": "~2.11.2", + "Sortable": "~1.4", + "sweetalert": "~1.1", + "github-markdown-css": "^2.2.1" + } } diff --git a/gulpfile.js b/gulpfile.js index 8c117484..2ec60175 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -9,6 +9,7 @@ elixir(function (mix) { .styles([ 'vendor/bower_components/jquery-minicolors/jquery.minicolors.css', 'vendor/bower_components/sweetalert/dist/sweetalert.css', + 'vendor/bower_components/github-markdown-css/github-markdown.css', 'public/dist/css/app.css' ], 'public/dist/css/all.css', './') .scripts([ diff --git a/resources/views/partials/incident.blade.php b/resources/views/partials/incident.blade.php index 67e59856..0d4ea113 100644 --- a/resources/views/partials/incident.blade.php +++ b/resources/views/partials/incident.blade.php @@ -19,7 +19,7 @@ @endif -
+
{!! $incident->formattedMessage !!}