Permalink
Browse files

Merge branch 'master' of code.area17.com:a17/subfolio-kohana

  • Loading branch information...
nedbaldessin committed Mar 2, 2017
2 parents 2082e9a + b69bbf6 commit 867ada44c4574f19a655785ed7403a7d2d332ba4
Showing with 232 additions and 612 deletions.
  1. +1 −0 .gitignore
  2. +38 −1 README.md
  3. +50 −256 config/themes/default/css/icons.css
  4. 0 config/themes/default/css/info.css
  5. +19 −296 config/themes/default/css/main.css
  6. +1 −3 config/themes/default/grunt/aliases.yaml
  7. +5 −5 config/themes/default/grunt/scss/_mixins.scss
  8. +1 −1 config/themes/default/grunt/scss/main.scss
  9. +1 −17 config/themes/default/grunt/scss/modules/content/_features.scss
  10. +14 −0 config/themes/default/grunt/scss/modules/content/_grid.scss
  11. BIN config/themes/default/images/fallback/arrow_left.png
  12. BIN config/themes/default/images/fallback/arrow_right.png
  13. BIN config/themes/default/images/fallback/close.png
  14. BIN config/themes/default/images/fallback/dropdown_arrow.png
  15. BIN config/themes/default/images/fallback/filter_arrow.png
  16. BIN config/themes/default/images/fallback/grid_ae.png
  17. BIN config/themes/default/images/fallback/grid_ai.png
  18. BIN config/themes/default/images/fallback/grid_ase.png
  19. BIN config/themes/default/images/fallback/grid_cut.png
  20. BIN config/themes/default/images/fallback/grid_dir.png
  21. BIN config/themes/default/images/fallback/grid_dir_protected.png
  22. BIN config/themes/default/images/fallback/grid_dir_shared.png
  23. BIN config/themes/default/images/fallback/grid_dmg.png
  24. BIN config/themes/default/images/fallback/grid_doc.png
  25. BIN config/themes/default/images/fallback/grid_eps.png
  26. BIN config/themes/default/images/fallback/grid_fla.png
  27. BIN config/themes/default/images/fallback/grid_fnt.png
  28. BIN config/themes/default/images/fallback/grid_gen.png
  29. BIN config/themes/default/images/fallback/grid_html.png
  30. BIN config/themes/default/images/fallback/grid_img.png
  31. BIN config/themes/default/images/fallback/grid_indd.png
  32. BIN config/themes/default/images/fallback/grid_key.png
  33. BIN config/themes/default/images/fallback/grid_merlin.png
  34. BIN config/themes/default/images/fallback/grid_net.png
  35. BIN config/themes/default/images/fallback/grid_numbers.png
  36. BIN config/themes/default/images/fallback/grid_pages.png
  37. BIN config/themes/default/images/fallback/grid_pdf.png
  38. BIN config/themes/default/images/fallback/grid_ppt.png
  39. BIN config/themes/default/images/fallback/grid_psd.png
  40. BIN config/themes/default/images/fallback/grid_site.png
  41. BIN config/themes/default/images/fallback/grid_slide.png
  42. BIN config/themes/default/images/fallback/grid_snd.png
  43. BIN config/themes/default/images/fallback/grid_sql.png
  44. BIN config/themes/default/images/fallback/grid_swf.png
  45. BIN config/themes/default/images/fallback/grid_vid.png
  46. BIN config/themes/default/images/fallback/grid_xls.png
  47. BIN config/themes/default/images/fallback/grid_zip.png
  48. BIN config/themes/default/images/fallback/info.png
  49. BIN config/themes/default/images/fallback/info_close.png
  50. BIN config/themes/default/images/fallback/list_ae.png
  51. BIN config/themes/default/images/fallback/list_ai.png
  52. BIN config/themes/default/images/fallback/list_ase.png
  53. BIN config/themes/default/images/fallback/list_cut.png
  54. BIN config/themes/default/images/fallback/list_dir.png
  55. BIN config/themes/default/images/fallback/list_dir_protected.png
  56. BIN config/themes/default/images/fallback/list_dir_shared.png
  57. BIN config/themes/default/images/fallback/list_dmg.png
  58. BIN config/themes/default/images/fallback/list_doc.png
  59. BIN config/themes/default/images/fallback/list_eps.png
  60. BIN config/themes/default/images/fallback/list_fla.png
  61. BIN config/themes/default/images/fallback/list_fnt.png
  62. BIN config/themes/default/images/fallback/list_gen.png
  63. BIN config/themes/default/images/fallback/list_html.png
  64. BIN config/themes/default/images/fallback/list_img.png
  65. BIN config/themes/default/images/fallback/list_indd.png
  66. BIN config/themes/default/images/fallback/list_key.png
  67. BIN config/themes/default/images/fallback/list_merlin.png
  68. BIN config/themes/default/images/fallback/list_net.png
  69. BIN config/themes/default/images/fallback/list_num.png
  70. BIN config/themes/default/images/fallback/list_numbers.png
  71. BIN config/themes/default/images/fallback/list_pages.png
  72. BIN config/themes/default/images/fallback/list_pdf.png
  73. BIN config/themes/default/images/fallback/list_ppt.png
  74. BIN config/themes/default/images/fallback/list_psd.png
  75. BIN config/themes/default/images/fallback/list_site.png
  76. BIN config/themes/default/images/fallback/list_slide.png
  77. BIN config/themes/default/images/fallback/list_snd.png
  78. BIN config/themes/default/images/fallback/list_sql.png
  79. BIN config/themes/default/images/fallback/list_swf.png
  80. BIN config/themes/default/images/fallback/list_txt.png
  81. BIN config/themes/default/images/fallback/list_vid.png
  82. BIN config/themes/default/images/fallback/list_video.png
  83. BIN config/themes/default/images/fallback/list_xls.png
  84. BIN config/themes/default/images/fallback/list_zip.png
  85. +7 −7 config/themes/default/js/main.js
  86. +1 −2 config/themes/default/package.json
  87. +8 −0 config/themes/default/pages/filekinds/img.php
  88. +1 −1 config/themes/default/pages/listing/features.php
  89. +1 −0 engine/application/config/filebrowser.php
  90. +64 −23 engine/application/libraries/Filebrowser.php
  91. +20 −0 engine/application/libraries/Subfolio.php
View
@@ -2,3 +2,4 @@ engine/application/logs/*
engine/info/disabled.php
.DS_Store
.htaccess
+directory/*
View
@@ -1,3 +1,40 @@
+# Default Theme Development
+
+## Front-end Workflow
+
+FE workflow is using Grunt.
+Default theme is located here : config/themes/default/
+
+First time working on the project run :
+
+```
+grunt init
+```
+
+When doings devs run :
+
+```
+grunt dev
+```
+
+Main CSS file is main.css, this one is versioned unminified.
+
+## Deploying to staging
+
+```
+grunt staging
+```
+
+This task will create a /dist folder inside the theme/default folder.
+This /dist folder will contain everything that should be send to production : images, fonts, JS, CSS, PHP.
+At last, the task will sftp the content of this dist folder to staging using SFTP-DEPLOY task : https://github.com/thrashr888/grunt-sftp-deploy
+
+If you only want to create the dist folder (without sftp the content) :
+
+```
+grunt before_deploy
+```
+
# About Subfolio
Subfolio provides an elegant, practical and customizable web interface to your file system. Super fast to set-up and use, you’ll be up and running in minutes. Flexible and feature-rich, you’ll soon be inventing new ways to use it.
@@ -29,4 +66,4 @@ If you have a problem, question, suggestion or to see full documentation, please
To download Subfolio Enhancers, please visit:
https://github.com/area17/subfolio-enhancers
-(c) 2009-2016 Subfolio by AREA 17. All rights reserved.
+(c) 2009-2017 Subfolio by AREA 17. All rights reserved.

Large diffs are not rendered by default.

Oops, something went wrong.
No changes.
Oops, something went wrong.

0 comments on commit 867ada4

Please sign in to comment.