Merge branch 'release/4.1.15'

* release/4.1.15: work compile assets and cleanup annotations Fixed a but with textarea autosizing fixed the svg line fills updated the changelog compiling assets Apply fixes from StyleCI (#449) wip
austintoddj · Mar 23, 2019 · 084acaa · 084acaa
2 parents c54d9e4 + 8f44752
commit 084acaa
Show file tree

Hide file tree

Showing 33 changed files with 491 additions and 108 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,10 @@
 # Release Notes
 
+## [v4.1.15](https://github.com/cnvs/canvas/compare/v4.1.14...v4.1.15)
+
+### Added
+- Added a dark mode ([e3723ac](https://github.com/cnvs/canvas/commit/e3723ac6523ef000b0901f3c073a94bcad7cfebf))
+
 ## [v4.1.14](https://github.com/cnvs/canvas/compare/v4.1.13...v4.1.14)
 
 ### Fixed

diff --git a/config/canvas.php b/config/canvas.php
@@ -7,9 +7,9 @@
     | Route Middleware
     |--------------------------------------------------------------------------
     |
-    | Assign any custom middleware to limit access to the admin interface.
-    | If your app needs roles or permissions that allow for specific
-    | users to manage the blog, create and add a middleware here.
+    | These middleware will be attached to each route in Canvas, giving you
+    | the chance to add your own middleware to this list or change any of
+    | the existing middleware. Or, you can simply stick with this list.
     |
     */
 

diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "sass": "^1.15.2",
     "sass-loader": "^7.1.0",
     "vue": "^2.5.7",
-    "vue-multiselect": "^2.1.3",
+    "vue-multiselect": "^2.1.4",
     "vue-template-compiler": "^2.5.21",
     "vue-textarea-autosize": "^1.0.4",
     "vue2-frappe": "^1.0"

diff --git a/public/css/app-dark.css b/public/css/app-dark.css
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/app.js.map b/public/js/app.js.map
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,6 +1,7 @@
 {
-    "/js/app.js": "/js/app.js?id=490deb75e999a7466efb",
-    "/css/app.css": "/css/app.css?id=a2c0da91701ff768556b",
-    "/js/app.js.map": "/js/app.js.map?id=9e83587ea744b07c733e",
+    "/js/app.js": "/js/app.js?id=e14eab4148aca57fd14d",
+    "/css/app.css": "/css/app.css?id=30702a620a23ba741c32",
+    "/css/app-dark.css": "/css/app-dark.css?id=1fb783dd9139fe579906",
+    "/js/app.js.map": "/js/app.js.map?id=cac20b4e6af75f105d50",
     "/favicon.png": "/favicon.png?id=39d853e8c2bdbc38fde3"
 }
diff --git a/readme.md b/readme.md
@@ -17,8 +17,6 @@ A [Laravel](https://laravel.com) publishing platform. Canvas is a fully open sou
 application and get you up-and-running with a blog in just a few minutes. In addition to a distraction-free 
 writing experience, you can view monthly trends on your content, get insights into reader traffic and more!
 
-<img src="https://cnvs.io/img/zDTOCfMeOf2pr1sHax9KqNzWsnF8KOa55CPPyppc.png#1">
-
 ## Installation
 
 > **Note:** Canvas requires you to have user authentication in place prior to installation. You may run the `make:auth` Artisan command to satisfy this requirement.
@@ -73,10 +71,10 @@ Run any new migrations using the `migrate` Artisan command:
 php artisan migrate
 ```
 
-You may also want to run this command to re-publish the assets:
+Re-publish the assets using the `canvas:publish` Artisan command:
 
 ```bash
-php artisan vendor:publish --tag=canvas-assets --force
+php artisan canvas:publish
 ```
 
 ## Testing

diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js
@@ -1,4 +1,3 @@
-
 window._ = require('lodash');
 
 /**
@@ -12,15 +11,35 @@ try {
     window.$ = window.jQuery = require('jquery');
     window.autosize = window.autosize ? window.autosize : require('autosize');
 
-    // Apply auto-sizing to textarea inputs
-    $(function () {autosize($('textarea'))});
+    /**
+     * Current workaround for using the Autosize library which will only resize
+     * elements when clicked, not on the initial page load.
+     *
+     * @link http://www.jacklmoore.com/autosize/#faq-hidden
+     */
+    $(function () {
+        let textarea = $('textarea');
+
+        autosize(textarea);
+
+        textarea.focus(function () {
+            autosize.update(textarea);
+        });
+    });
 
-    // Opt-in to tooltip functionality
-    $(function () {$('[data-toggle="tooltip"]').tooltip()});
+    /**
+     * Initialize all tooltips on a page by manually opting in.
+     *
+     * @link https://getbootstrap.com/docs/4.3/components/tooltips/#example-enable-tooltips-everywhere
+     */
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    });
 
     require('bootstrap');
     require('@fortawesome/fontawesome-free');
-} catch (e) {}
+} catch (e) {
+}
 
 /**
  * We'll load the axios HTTP library which allows us to easily issue requests

diff --git a/resources/js/components/DateTimePicker.vue b/resources/js/components/DateTimePicker.vue
@@ -4,7 +4,7 @@
     /**
      * Create the default date/time picker.
      *
-     * @source https://github.com/writingink/wink
+     * @author Mohamed Said <themsaid@gmail.com>
      */
     export default {
         props: ['value'],

diff --git a/resources/js/components/Editor.vue b/resources/js/components/Editor.vue
@@ -10,7 +10,7 @@
     /**
      * Create an instance of the QuillJS editor.
      *
-     * @source https://github.com/writingink/wink
+     * @author Mohamed Said <themsaid@gmail.com>
      */
     export default {
         components: {
@@ -70,7 +70,7 @@
                 /**
                  * Temporary workaround for customizing the link tooltip.
                  *
-                 * @source: https://github.com/quilljs/quill/issues/1107#issuecomment-259938173
+                 * @link https://github.com/quilljs/quill/issues/1107#issuecomment-259938173
                  */
                 let tooltip = quill.theme.tooltip;
                 let input = tooltip.root.querySelector("input[data-link]");

diff --git a/resources/js/components/FeaturedImageUploader.vue b/resources/js/components/FeaturedImageUploader.vue
@@ -3,7 +3,7 @@
     /**
      * Upload a featured image.
      *
-     * @source https://github.com/writingink/wink
+     * @author Mohamed Said <themsaid@gmail.com>
      */
     export default {
         props: ['post', 'url', 'caption', 'unsplash'],

diff --git a/resources/js/components/ImagePicker.vue b/resources/js/components/ImagePicker.vue
@@ -4,7 +4,7 @@
     /**
      * Create the default image picker.
      *
-     * @source https://github.com/writingink/wink
+     * @author Mohamed Said <themsaid@gmail.com>
      */
     export default {
         props: ['unsplash'],

diff --git a/resources/js/components/editorComponents/DividerBlot.js b/resources/js/components/editorComponents/DividerBlot.js
@@ -1,7 +1,7 @@
 /**
  * Create the divider blot.
  *
- * @source https://github.com/writingink/wink
+ * @author Mohamed Said <themsaid@gmail.com>
  */
 
 import Quill from 'quill';

diff --git a/resources/js/components/editorComponents/HTMLBlot.js b/resources/js/components/editorComponents/HTMLBlot.js
@@ -1,7 +1,7 @@
 /**
  * Create the HTML blot.
  *
- * @source https://github.com/writingink/wink
+ * @author Mohamed Said <themsaid@gmail.com>
  */
 
 import Quill from 'quill'

diff --git a/resources/js/components/editorComponents/HTMLEmbedder.vue b/resources/js/components/editorComponents/HTMLEmbedder.vue
@@ -2,7 +2,7 @@
     /**
      * Embed a block of HTML.
      *
-     * @source https://github.com/writingink/wink
+     * @author Mohamed Said <themsaid@gmail.com>
      */
     export default {
         data() {

diff --git a/resources/js/components/editorComponents/ImageBlot.js b/resources/js/components/editorComponents/ImageBlot.js
@@ -1,7 +1,7 @@
 /**
  * Create the divider blot.
  *
- * @source https://github.com/writingink/wink
+ * @author Mohamed Said <themsaid@gmail.com>
  */
 
 import Quill from 'quill';

diff --git a/resources/js/components/editorComponents/ImageUploader.vue b/resources/js/components/editorComponents/ImageUploader.vue
@@ -4,7 +4,7 @@
     /**
      * Upload an image from the editor.
      *
-     * @source https://github.com/writingink/wink
+     * @author Mohamed Said <themsaid@gmail.com>
      */
     export default {
         props: ['unsplash'],

diff --git a/resources/sass/app-dark.scss b/resources/sass/app-dark.scss
@@ -0,0 +1,174 @@
+
+// Fonts
+@import url("https://fonts.googleapis.com/css?family=Nunito|Merriweather:300,400,700");
+@import "~@fortawesome/fontawesome-free/scss/regular";
+@import "~@fortawesome/fontawesome-free/scss/solid";
+@import "~@fortawesome/fontawesome-free/scss/fontawesome";
+
+// Typography
+$font-family-sans-serif: "Nunito", sans-serif;
+$font-family-serif: "Merriweather", serif;
+$fa-font-path: "../fonts" !default;
+$font-size-base: 0.9rem;
+$line-height-base: 1.6;
+
+@import "base";
+
+body {
+  background-color: #252830;
+  color: #cfd2da;
+}
+
+a {
+  color: #cfd2da;
+}
+
+a.nav-link {
+  color: #cfd2da !important;
+}
+
+a:hover {
+  color: #434857 !important;
+}
+
+blockquote {
+  border-left: 4px solid #434857 !important;
+
+  span {
+    color: #cfd2da !important;
+  }
+}
+
+.btn-outline-primary {
+  color: #cfd2da;
+  border-color: #cfd2da;
+}
+
+.btn-outline-primary:hover {
+  color: #252830 !important;
+  background-color: #cfd2da;
+  border-color: #cfd2da;
+}
+
+.btn-primary,
+.btn-danger {
+  color: #cfd2da !important;
+}
+
+.btn-primary:hover,
+.btn-danger:hover {
+  color: #252830 !important;
+}
+
+.border-bottom {
+  border-bottom: 1px solid #434857 !important;
+}
+
+.border-top {
+  border-top: 1px solid #434857 !important;
+}
+
+.card {
+  background: transparent;
+  border: 1px solid #434857;
+}
+
+.custom-select {
+  background-color: transparent !important;
+  color: #cfd2da !important;
+}
+
+.dropdown-menu {
+  background-color: #252830 !important;
+  border: 1px solid #434857 !important;
+}
+
+.dropdown-menu a {
+  color: #cfd2da !important;
+}
+
+.dropdown-menu a:hover {
+  color: #252830 !important;
+  background-color: #cfd2da;
+}
+
+.dropdown-divider {
+  border-top: 1px solid #434857 !important;
+}
+
+div.controls {
+  background-color: #252830 !important;
+}
+
+input, textarea {
+  background: transparent !important;
+  color: #cfd2da !important;
+}
+
+.line-chart {
+  line.line-horizontal,
+  line.line-vertical {
+    stroke: #434857 !important;
+  }
+}
+
+.logo i {
+  font-size: 20px;
+  color: #cfd2da;
+}
+
+.modal-content {
+  background-color: #252830 !important;
+  border: 1px solid #434857 !important;
+}
+
+.modal-footer {
+  border-top: 1px solid #434857 !important;
+}
+
+.multiselect__content-wrapper {
+  background-color: #252830 !important;
+  border: 1px solid #434857 !important;
+}
+
+.multiselect__element {
+  color: #cfd2da !important;
+}
+
+.multiselect__option--selected, .multiselect__option--selected::after {
+  color: #252830 !important;
+  background-color: #cfd2da !important;
+}
+
+.multiselect__single {
+  background: none !important;
+  color: #cfd2da !important;
+}
+
+.multiselect__tags {
+  background: none !important;
+}
+
+.ql-editor {
+  color: #cfd2da !important;
+
+  .bg-white {
+    background-color: transparent !important;
+  }
+
+  hr {
+    color: #434857 !important;
+  }
+}
+
+.ql-editor.ql-blank::before {
+  color: #59616A !important;
+}
+
+select.input {
+  color: #cfd2da !important;
+}
+
+text {
+  fill: #cfd2da !important;
+}