spina 1.1.1 → 2.0.0.alpha

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of spina might be problematic. Click here for more details.

Files changed (204) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +23 -244
  3. data/app/assets/fonts/spina/Metropolis-Black.woff2 +0 -0
  4. data/app/assets/fonts/spina/Metropolis-BlackItalic.woff2 +0 -0
  5. data/app/assets/fonts/spina/Metropolis-Bold.woff2 +0 -0
  6. data/app/assets/fonts/spina/Metropolis-BoldItalic.woff2 +0 -0
  7. data/app/assets/fonts/spina/Metropolis-ExtraBold.woff2 +0 -0
  8. data/app/assets/fonts/spina/Metropolis-ExtraBoldItalic.woff2 +0 -0
  9. data/app/assets/fonts/spina/Metropolis-ExtraLight.woff2 +0 -0
  10. data/app/assets/fonts/spina/Metropolis-ExtraLightItalic.woff2 +0 -0
  11. data/app/assets/fonts/spina/Metropolis-Light.woff2 +0 -0
  12. data/app/assets/fonts/spina/Metropolis-LightItalic.woff2 +0 -0
  13. data/app/assets/fonts/spina/Metropolis-Medium.woff2 +0 -0
  14. data/app/assets/fonts/spina/Metropolis-MediumItalic.woff2 +0 -0
  15. data/app/assets/fonts/spina/Metropolis-Regular.woff2 +0 -0
  16. data/app/assets/fonts/spina/Metropolis-RegularItalic.woff2 +0 -0
  17. data/app/assets/fonts/spina/Metropolis-SemiBold.woff2 +0 -0
  18. data/app/assets/fonts/spina/Metropolis-SemiBoldItalic.woff2 +0 -0
  19. data/app/assets/fonts/spina/Metropolis-Thin.woff2 +0 -0
  20. data/app/assets/fonts/spina/Metropolis-ThinItalic.woff2 +0 -0
  21. data/app/assets/fonts/spina/ics_spina.eot +0 -0
  22. data/app/assets/fonts/spina/ics_spina.svg +285 -267
  23. data/app/assets/fonts/spina/ics_spina.ttf +0 -0
  24. data/app/assets/fonts/spina/ics_spina.woff +0 -0
  25. data/app/assets/fonts/spina/ics_spina.woff2 +0 -0
  26. data/app/assets/icons/spina/bold.svg +1 -1
  27. data/app/assets/icons/spina/code.svg +1 -1
  28. data/app/assets/icons/spina/image.svg +1 -10
  29. data/app/assets/icons/spina/indent.svg +1 -0
  30. data/app/assets/icons/spina/italic.svg +1 -1
  31. data/app/assets/icons/spina/link.svg +1 -1
  32. data/app/assets/icons/spina/list-ol.svg +1 -0
  33. data/app/assets/icons/spina/list.svg +1 -0
  34. data/app/assets/icons/spina/outdent.svg +1 -0
  35. data/app/assets/icons/spina/preview/ics_spina-preview.html +121 -1
  36. data/app/assets/icons/spina/quote-right.svg +1 -0
  37. data/app/assets/icons/spina/redo.svg +1 -0
  38. data/app/assets/icons/spina/strikethrough.svg +1 -0
  39. data/app/assets/icons/spina/undo.svg +1 -0
  40. data/app/assets/images/spina/favicon.png +0 -0
  41. data/app/assets/javascripts/spina/admin/application.js +1 -2
  42. data/app/assets/javascripts/spina/admin/controllers/attachment_picker_controller.js +15 -0
  43. data/app/assets/javascripts/spina/admin/controllers/image_form_controller.js +5 -4
  44. data/app/assets/javascripts/spina/admin/controllers/infinite_scroll_controller.js +20 -22
  45. data/app/assets/javascripts/spina/admin/controllers/media_picker_controller.js +171 -0
  46. data/app/assets/javascripts/spina/admin/controllers/modal_controller.js +18 -0
  47. data/app/assets/javascripts/spina/admin/controllers/repeater_form_controller.js +38 -0
  48. data/app/assets/javascripts/spina/admin/media_gallery.coffee +0 -3
  49. data/app/assets/javascripts/spina/admin/notifications.coffee +1 -1
  50. data/app/assets/javascripts/spina/admin/pages.coffee.erb +3 -20
  51. data/app/assets/javascripts/spina/admin/scaffold.coffee +0 -3
  52. data/app/assets/javascripts/spina/admin/trix.coffee.erb +14 -18
  53. data/app/assets/stylesheets/spina.sass +10 -10
  54. data/app/assets/stylesheets/spina/_buttons.sass +58 -32
  55. data/app/assets/stylesheets/spina/_configuration.sass.erb +2 -2
  56. data/app/assets/stylesheets/spina/_fonts.sass +32 -0
  57. data/app/assets/stylesheets/spina/_forms.sass +65 -76
  58. data/app/assets/stylesheets/spina/_gallery.sass +22 -4
  59. data/app/assets/stylesheets/spina/_ics_spina.scss +8 -0
  60. data/app/assets/stylesheets/spina/_media_picker.sass +133 -0
  61. data/app/assets/stylesheets/spina/_modal.sass +35 -2
  62. data/app/assets/stylesheets/spina/_notifications.sass +20 -14
  63. data/app/assets/stylesheets/spina/_pages.sass +131 -0
  64. data/app/assets/stylesheets/spina/_sortable_lists.sass +14 -8
  65. data/app/assets/stylesheets/spina/_tables.sass +7 -4
  66. data/app/assets/stylesheets/spina/_trix_custom.sass +15 -28
  67. data/app/controllers/concerns/spina/frontend.rb +9 -0
  68. data/app/controllers/spina/admin/accounts_controller.rb +9 -13
  69. data/app/controllers/spina/admin/attachments_controller.rb +0 -22
  70. data/app/controllers/spina/admin/images_controller.rb +1 -1
  71. data/app/controllers/spina/admin/media_folders_controller.rb +10 -0
  72. data/app/controllers/spina/admin/media_picker_controller.rb +18 -19
  73. data/app/controllers/spina/admin/pages_controller.rb +3 -7
  74. data/app/controllers/spina/admin/resources_controller.rb +9 -4
  75. data/app/controllers/spina/application_controller.rb +1 -1
  76. data/app/helpers/spina/admin/pages_helper.rb +22 -20
  77. data/app/helpers/spina/{files_helper.rb → attachments_helper.rb} +1 -1
  78. data/app/helpers/spina/images_helper.rb +14 -0
  79. data/app/helpers/spina/pages_helper.rb +23 -4
  80. data/app/models/concerns/spina/partable.rb +19 -7
  81. data/app/models/concerns/spina/translated_content.rb +19 -0
  82. data/app/models/spina/account.rb +3 -10
  83. data/app/models/spina/attachment.rb +0 -4
  84. data/app/models/spina/current.rb +1 -0
  85. data/app/models/spina/image.rb +0 -4
  86. data/app/models/spina/page.rb +19 -20
  87. data/app/models/spina/parts/attachment.rb +17 -0
  88. data/app/models/spina/parts/base.rb +12 -0
  89. data/app/models/spina/parts/image.rb +30 -0
  90. data/app/models/spina/parts/image_collection.rb +23 -0
  91. data/app/models/spina/parts/line.rb +7 -0
  92. data/app/models/spina/parts/option.rb +13 -0
  93. data/app/models/spina/parts/repeater.rb +10 -0
  94. data/app/models/spina/parts/repeater_content.rb +15 -0
  95. data/app/models/spina/parts/text.rb +7 -0
  96. data/app/models/spina/resource.rb +4 -12
  97. data/app/presenters/spina/content_presenter.rb +58 -0
  98. data/app/presenters/spina/menu_presenter.rb +2 -1
  99. data/app/views/layouts/spina/admin/admin.html.haml +3 -4
  100. data/app/views/layouts/spina/admin/pages.html.haml +5 -4
  101. data/app/views/spina/admin/accounts/_form.html.haml +13 -7
  102. data/app/views/spina/admin/accounts/analytics.html.haml +5 -3
  103. data/app/views/spina/admin/accounts/style.html.haml +26 -21
  104. data/app/views/spina/admin/images/index.html.haml +7 -5
  105. data/app/views/spina/admin/media_folders/_form.html.haml +5 -2
  106. data/app/views/spina/admin/media_folders/edit.js.erb +1 -0
  107. data/app/views/spina/admin/media_folders/show.html.haml +2 -1
  108. data/app/views/spina/admin/media_picker/_image.html.haml +3 -0
  109. data/app/views/spina/admin/media_picker/_media_picker.html.haml +32 -0
  110. data/app/views/spina/admin/media_picker/_media_picker_grid.html.haml +25 -0
  111. data/app/views/spina/admin/media_picker/infinite_scroll.js.erb +4 -4
  112. data/app/views/spina/admin/media_picker/select.js.erb +2 -0
  113. data/app/views/spina/admin/media_picker/show.html.haml +1 -0
  114. data/app/views/spina/admin/media_picker/show.js.erb +1 -1
  115. data/app/views/spina/admin/pages/_form.html.haml +10 -8
  116. data/app/views/spina/admin/pages/_form_advanced.html.haml +19 -17
  117. data/app/views/spina/admin/pages/_form_page_content.html.haml +14 -13
  118. data/app/views/spina/admin/pages/_form_page_seo.html.haml +15 -4
  119. data/app/views/spina/admin/pages/_page.html.haml +5 -3
  120. data/app/views/spina/admin/pages/_page_nested_list.html.haml +2 -3
  121. data/app/views/spina/admin/pages/index.html.haml +5 -4
  122. data/app/views/spina/admin/parts/attachments/_form.html.haml +6 -0
  123. data/app/views/spina/admin/parts/image_collections/_fields.html.haml +7 -0
  124. data/app/views/spina/admin/parts/image_collections/_form.html.haml +12 -0
  125. data/app/views/spina/admin/parts/images/_form.html.haml +18 -0
  126. data/app/views/spina/admin/parts/lines/_form.html.haml +2 -0
  127. data/app/views/spina/admin/parts/options/_form.html.haml +3 -0
  128. data/app/views/spina/admin/parts/repeaters/_fields.html.haml +15 -0
  129. data/app/views/spina/admin/parts/repeaters/_form.html.haml +18 -0
  130. data/app/views/spina/admin/parts/texts/_form.html.haml +6 -0
  131. data/app/views/spina/admin/resources/edit.html.haml +28 -12
  132. data/app/views/spina/admin/resources/show.html.haml +6 -3
  133. data/app/views/spina/admin/shared/_notifications.html.haml +4 -4
  134. data/config/locales/TH.yml +220 -205
  135. data/config/locales/bg.yml +219 -211
  136. data/config/locales/de.yml +218 -190
  137. data/config/locales/en.yml +218 -208
  138. data/config/locales/es.yml +219 -206
  139. data/config/locales/fr.yml +219 -190
  140. data/config/locales/id.yml +219 -189
  141. data/config/locales/it.yml +225 -152
  142. data/config/locales/nl.yml +220 -197
  143. data/config/locales/pl.yml +218 -185
  144. data/config/locales/pt-BR.yml +218 -205
  145. data/config/locales/ro.yml +258 -225
  146. data/config/locales/ru.yml +231 -171
  147. data/config/locales/sv.yml +218 -183
  148. data/config/locales/tr.yml +224 -151
  149. data/config/locales/zh-CN.yml +225 -175
  150. data/db/migrate/11_create_spina_resources.rb +0 -2
  151. data/db/migrate/12_add_url_title_to_spina_page_translations.rb +5 -0
  152. data/db/migrate/13_add_json_attributes_to_spina_accounts.rb +5 -0
  153. data/db/migrate/14_add_json_attributes_to_spina_pages.rb +5 -0
  154. data/db/migrate/15_add_slug_to_spina_resources.rb +5 -0
  155. data/lib/generators/spina/templates/app/views/demo/pages/demo.html.haml +13 -21
  156. data/lib/generators/spina/templates/app/views/demo/pages/homepage.html.haml +1 -1
  157. data/lib/generators/spina/templates/config/initializers/themes/default.rb +4 -4
  158. data/lib/generators/spina/templates/config/initializers/themes/demo.rb +32 -44
  159. data/lib/spina.rb +2 -0
  160. data/lib/spina/attr_json_spina_parts_model.rb +29 -0
  161. data/lib/spina/engine.rb +13 -3
  162. data/lib/spina/part.rb +19 -0
  163. data/lib/spina/theme.rb +1 -1
  164. data/lib/spina/version.rb +1 -1
  165. data/vendor/assets/javascripts/spina/sortable.js +2 -2
  166. metadata +71 -45
  167. data/app/assets/javascripts/spina/admin/account.coffee +0 -16
  168. data/app/models/concerns/spina/image_collectable.rb +0 -23
  169. data/app/models/concerns/spina/optionable.rb +0 -12
  170. data/app/models/concerns/spina/part.rb +0 -38
  171. data/app/models/spina/attachment_collection.rb +0 -20
  172. data/app/models/spina/image_collection.rb +0 -23
  173. data/app/models/spina/image_collections_image.rb +0 -6
  174. data/app/models/spina/layout_part.rb +0 -22
  175. data/app/models/spina/line.rb +0 -10
  176. data/app/models/spina/option.rb +0 -17
  177. data/app/models/spina/page_part.rb +0 -22
  178. data/app/models/spina/structure.rb +0 -14
  179. data/app/models/spina/structure_item.rb +0 -22
  180. data/app/models/spina/structure_part.rb +0 -20
  181. data/app/models/spina/text.rb +0 -10
  182. data/app/views/dummy/show.html.haml +0 -1
  183. data/app/views/spina/admin/attachments/_attachment_collection.html.haml +0 -2
  184. data/app/views/spina/admin/attachments/_select.html.haml +0 -17
  185. data/app/views/spina/admin/attachments/_select_collection.html.haml +0 -18
  186. data/app/views/spina/admin/attachments/insert.js.erb +0 -5
  187. data/app/views/spina/admin/attachments/insert_collection.js.coffee +0 -7
  188. data/app/views/spina/admin/attachments/select.js.erb +0 -2
  189. data/app/views/spina/admin/attachments/select_collection.js.erb +0 -2
  190. data/app/views/spina/admin/image_collections/_image_collection.html.haml +0 -5
  191. data/app/views/spina/admin/layout_partables/lines/_form.html.haml +0 -2
  192. data/app/views/spina/admin/partables/attachment_collections/_form.html.haml +0 -14
  193. data/app/views/spina/admin/partables/attachments/_form.html.haml +0 -13
  194. data/app/views/spina/admin/partables/image_collections/_form.html.haml +0 -16
  195. data/app/views/spina/admin/partables/images/_form.html.haml +0 -21
  196. data/app/views/spina/admin/partables/lines/_form.html.haml +0 -5
  197. data/app/views/spina/admin/partables/options/_form.html.haml +0 -7
  198. data/app/views/spina/admin/partables/photo_collections/_form.html.haml +0 -4
  199. data/app/views/spina/admin/partables/photos/_form.html.haml +0 -4
  200. data/app/views/spina/admin/partables/structures/_form.html.haml +0 -21
  201. data/app/views/spina/admin/partables/texts/_form.html.haml +0 -8
  202. data/app/views/spina/admin/structure_items/_fields.html.haml +0 -15
  203. data/app/views/spina/admin/structure_partables/attachment_collections/_form.html.haml +0 -14
  204. data/app/views/spina/admin/structure_partables/attachments/_form.html.haml +0 -13
@@ -8,15 +8,42 @@
8
8
  width: 100%
9
9
  z-index: 999
10
10
 
11
+ .modal-container
12
+ align-items: center
13
+ background: rgba(0, 0, 0, .6)
14
+ display: flex
15
+ height: 100%
16
+ justify-content: center
17
+ left: 0px
18
+ position: fixed
19
+ top: 0px
20
+ width: 100%
21
+ z-index: 999
22
+
23
+ .modal
24
+ display: block
25
+
26
+ .modal-close-cross
27
+ color: #999
28
+ font-size: 11px
29
+ padding: 15px
30
+ position: absolute
31
+ top: 0px
32
+ right: 0px
33
+
34
+ &:hover
35
+ color: #333
36
+
11
37
  .modal
12
38
  animation-duration: .4s
13
39
  background: #fff
14
- border-radius: 3px
40
+ border-radius: 10px
15
41
  display: none
16
42
  margin: 0 auto
17
43
  max-width: 480px
44
+ max-height: 90%
18
45
  min-height: 100px
19
- overflow: hidden
46
+ overflow: scroll
20
47
  position: relative
21
48
 
22
49
  @media screen and (max-width: 480px)
@@ -35,6 +62,12 @@
35
62
  footer a
36
63
  padding: 18px 0
37
64
 
65
+ header
66
+ background: white
67
+ position: sticky
68
+ top: 0px
69
+ z-index: 10
70
+
38
71
  header h3
39
72
  border-radius: 2px 2px 0 0
40
73
  color: #232323
@@ -1,25 +1,29 @@
1
1
  // Notifications
2
2
 
3
3
  aside#notifications
4
- bottom: 0
4
+ bottom: 50px
5
5
  padding: 16px
6
6
  position: fixed
7
- right: 0
7
+ left: 0
8
8
  z-index: 100
9
9
 
10
10
  .notification
11
11
  animation-duration: .4s
12
12
  align-items: center
13
- background: $primary-color
14
- border-radius: 3px
13
+ background: rgba(0, 0, 0, .3)
14
+ backdrop-filter: blur(3px)
15
+ -webkit-backdrop-filter: blur(3px)
16
+ border-radius: 7px
17
+ box-shadow: 3px 6px 3px rgba(0, 0, 0, .075)
15
18
  color: #fff
16
19
  display: flex
17
- font-size: 16px
18
- line-height: 24px
20
+ font-size: 14px
21
+ font-weight: 600
22
+ line-height: 18px
19
23
  margin-top: 16px
20
24
  padding: 16px 0
21
25
  position: relative
22
- width: 400px
26
+ width: 290px
23
27
 
24
28
  .notification-message
25
29
  flex: 1
@@ -27,19 +31,21 @@ aside#notifications
27
31
 
28
32
  .icon
29
33
  text-align: center
30
- min-width: 50px
31
- width: 50px
34
+ margin-left: 4px
35
+ min-width: 40px
36
+ width: 40px
32
37
 
33
38
  a
34
- color: #000
39
+ color: white
35
40
  display: block
36
41
  font-size: 11px
37
42
  opacity: .2
38
43
  text-align: center
44
+ transition: opacity .2s ease
39
45
  width: 50px
40
46
 
41
47
  &:hover
42
- color: #000
48
+ color: white
43
49
  opacity: .4
44
50
 
45
51
  strong
@@ -53,10 +59,10 @@ aside#notifications
53
59
  opacity: .6
54
60
 
55
61
  &.notification-error
56
- background: $error-color
62
+ // background: $error-color
57
63
 
58
64
  &.notification-danger
59
- background: $danger-color
65
+ // background: $danger-color
60
66
 
61
67
  &.notification-success
62
- background: $success-color
68
+ // background: $success-color
@@ -0,0 +1,131 @@
1
+ .page-form
2
+ margin: 20px 0
3
+
4
+ .page-form-group
5
+ margin: 0 -15px 20px -15px
6
+
7
+ .page-form-label
8
+ color: #888
9
+ font-size: 12px
10
+ font-weight: 500
11
+ line-height: 24px
12
+ padding: 0 3px
13
+
14
+ .page-form-content
15
+ .select-dropdown
16
+ border-color: #e2e2e2
17
+ box-shadow: 0 1px 1px rgba(0, 0, 0, .05)
18
+ font-size: 16px
19
+ font-weight: 500
20
+
21
+ select
22
+ color: #333
23
+ font-size: 15px
24
+ font-weight: 500
25
+ padding-left: 15px
26
+
27
+ label
28
+ background: none
29
+ box-shadow: none
30
+ padding-left: 15px
31
+
32
+ .page-form-control
33
+ input[type="text"]
34
+ border: 1px solid #e2e2e2
35
+ border-radius: 6px
36
+ box-shadow: 0 1px 1px rgba(0, 0, 0, .05)
37
+ height: 42px
38
+ padding: 0 15px
39
+ width: 100%
40
+
41
+ &.input-large
42
+ font-size: 18px
43
+ font-weight: 500
44
+ height: 50px
45
+
46
+ &:disabled
47
+ box-shadow: none !important
48
+
49
+ .page-form-rich-text
50
+ background: white
51
+ border: 1px solid #e2e2e2
52
+ border-radius: 6px
53
+ box-shadow: 0 1px 1px rgba(0, 0, 0, .05)
54
+ padding: 15px
55
+
56
+ trix-editor
57
+ border: none
58
+ box-shadow: none
59
+ font-size: 14px
60
+ line-height: 22px
61
+ padding: 0
62
+
63
+ .page-form-media-picker
64
+ align-items: flex-start
65
+ background: white
66
+ border: 1px solid #e2e2e2
67
+ border-radius: 6px
68
+ box-shadow: 0 1px 1px rgba(0, 0, 0, .05)
69
+ display: flex
70
+ justify-content: space-between
71
+ padding: 15px
72
+ width: 100%
73
+
74
+ .button
75
+ margin: 0
76
+
77
+ .image
78
+ background: #ddd
79
+ border-radius: 6px
80
+ height: 150px
81
+ display: block
82
+ position: relative
83
+ width: 200px
84
+
85
+ .image img
86
+ border-radius: 6px
87
+ position: relative
88
+
89
+ .images
90
+ min-height: 80px
91
+ margin: -4px
92
+
93
+ img
94
+ border-radius: 6px
95
+ display: block
96
+ float: left
97
+ height: 72px
98
+ margin: 4px
99
+ position: relative
100
+ width: 96px
101
+
102
+ .page-form-media-picker-placeholder
103
+ background: #ddd
104
+ border-radius: 6px
105
+ height: 72px
106
+ margin: 4px
107
+ width: 96px
108
+
109
+ input.page-form-media-picker-alt-text
110
+ border: none
111
+ box-shadow: none
112
+ color: #777
113
+ font-style: italic
114
+ margin: 0 0 -15px -12px
115
+ max-width: 400px
116
+
117
+ &:focus, &:hover
118
+ color: #333
119
+
120
+ .page-form-media-picker-placeholder
121
+ align-items: center
122
+ color: #999
123
+ display: flex
124
+ font-size: 13px
125
+ font-style: italic
126
+ height: 100%
127
+ justify-content: center
128
+ margin-right: 10px
129
+ position: absolute
130
+ text-align: center
131
+ width: 100%
@@ -1,6 +1,9 @@
1
1
  // Sortable lists
2
2
 
3
3
  .dd
4
+ border: 1px solid #e2e2e2
5
+ border-radius: 6px
6
+ box-shadow: 0 1px 1px rgba(0, 0, 0, .05)
4
7
  margin: -20px
5
8
  overflow: hidden
6
9
  position: relative
@@ -39,6 +42,9 @@
39
42
  padding: 0
40
43
  position: relative
41
44
 
45
+ .dd-item:last-child
46
+ border-bottom: none
47
+
42
48
  .dd-placeholder
43
49
  position: relative
44
50
 
@@ -54,16 +60,13 @@
54
60
 
55
61
  .dd-list
56
62
  background: tint(#f5f5fa, 50%)
57
- border-top: 1px solid #ddd
63
+ border-top: 1px solid #eee
58
64
 
59
65
  .dd-placeholder
60
66
  background: tint(#f5f5fa, 50%)
61
67
 
62
68
  &:after
63
69
  margin-left: 40px
64
-
65
- .dd-item:last-child
66
- border-bottom: none
67
70
 
68
71
  .dd-item
69
72
  padding-left: 20px
@@ -84,9 +87,6 @@
84
87
  .dd-collapsed .dd-list
85
88
  display: none
86
89
 
87
- .dd-item
88
- border-bottom: 1px solid #ddd
89
-
90
90
  .dd-item, .dd-empty, .dd-placeholder
91
91
  margin: 0
92
92
  padding: 0
@@ -103,16 +103,21 @@
103
103
  min-height: 100px
104
104
 
105
105
  .dd-item-inner
106
+ align-items: center
107
+ display: flex
106
108
  padding: 10px 20px
107
109
  text-decoration: none
108
110
 
109
111
  a
110
112
  margin: 0
111
113
 
114
+ a.sortable-link
115
+ flex: 1
116
+
112
117
  a.sortable-link, a.sortable-link:hover
113
118
  color: $primary-color
114
119
  font-size: 13px
115
- font-weight: 600
120
+ font-weight: 500
116
121
  padding-left: 0
117
122
 
118
123
  small
@@ -121,6 +126,7 @@
121
126
  margin-left: 13px
122
127
 
123
128
  .pull-right a
129
+ margin: 0
124
130
  opacity: 0
125
131
  transform: translateX(50px)
126
132
  transition: all .4s ease
@@ -98,10 +98,11 @@ table.table
98
98
  font-size: 16px
99
99
  position: absolute
100
100
  right: 10px
101
- @extend .icon, .icon-caret-up:before
101
+ @extend .icon
102
+ content: "\f108"
102
103
 
103
104
  &.table-column-sorted-desc:after
104
- @extend .icon-caret-down:before
105
+ content: "\f105"
105
106
 
106
107
  th.text-right .table-column-sorted
107
108
  text-align: left
@@ -261,12 +262,14 @@ tr:hover .progress
261
262
  .dataTable
262
263
  th.sorting_desc
263
264
  &:after
264
- @extend .icon, .icon-caret-down:before
265
+ @extend .icon
266
+ content: "\f105"
265
267
  float: right
266
268
 
267
269
  th.sorting_asc
268
270
  &:after
269
- @extend .icon, .icon-caret-up:before
271
+ @extend .icon
272
+ content: "\f108"
270
273
  float: right
271
274
 
272
275
  .dataTables_paginate
@@ -38,7 +38,7 @@ trix-toolbar
38
38
 
39
39
  &::before
40
40
  background: none
41
- font-family: 'Font Awesome 5 Free'
41
+ font-family: $icon-font
42
42
  display: inline-block
43
43
  font-weight: 900
44
44
  line-height: 36px
@@ -46,56 +46,43 @@ trix-toolbar
46
46
  text-indent: 0
47
47
 
48
48
  &.trix-button--icon-bold
49
- &::before
50
- content: "\f032"
49
+ @extend .icon-bold
51
50
 
52
51
  &.trix-button--icon-italic
53
- &::before
54
- content: "\f033"
52
+ @extend .icon-italic
55
53
 
56
54
  &.trix-button--icon-strike
57
- &::before
58
- content: "\f0cc"
55
+ @extend .icon-strikethrough
59
56
 
60
57
  &.trix-button--icon-link
61
- &::before
62
- content: "\f0c1"
58
+ @extend .icon-link
63
59
 
64
60
  &.trix-button--icon-image
65
- &::before
66
- content: "\f03e"
61
+ @extend .icon-image
67
62
 
68
63
  &.trix-button--icon-quote
69
- &::before
70
- content: "\f10e"
64
+ @extend .icon-quote-right
71
65
 
72
66
  &.trix-button--icon-code
73
- &::before
74
- content: "\f121"
67
+ @extend .icon-code
75
68
 
76
69
  &.trix-button--icon-bullet-list
77
- &::before
78
- content: "\f0ca"
70
+ @extend .icon-list
79
71
 
80
72
  &.trix-button--icon-number-list
81
- &::before
82
- content: "\f0cb"
73
+ @extend .icon-list-ol
83
74
 
84
75
  &.trix-button--icon-decrease-nesting-level
85
- &::before
86
- content: "\f03b"
76
+ @extend .icon-outdent
87
77
 
88
78
  &.trix-button--icon-increase-nesting-level
89
- &::before
90
- content: "\f03c"
79
+ @extend .icon-indent
91
80
 
92
81
  &.trix-button--icon-undo
93
- &::before
94
- content: "\f2ea"
82
+ @extend .icon-undo
95
83
 
96
84
  &.trix-button--icon-redo
97
- &::before
98
- content: "\f2f9"
85
+ @extend .icon-redo
99
86
 
100
87
  .trix-dialog
101
88
  border-top-color: $primary-color
@@ -192,7 +179,7 @@ trix-editor
192
179
  display: none
193
180
 
194
181
  img
195
- border-radius: 4px
182
+ border-radius: 6px
196
183
  display: block
197
184
  max-height: 150px
198
185
  max-width: 200px