nodebb-plugin-composer-default 9.2.0 → 10.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/.gitattributes CHANGED
@@ -1,22 +1,22 @@
1
- # Auto detect text files and perform LF normalization
2
- * text=auto
3
-
4
- # Custom for Visual Studio
5
- *.cs diff=csharp
6
- *.sln merge=union
7
- *.csproj merge=union
8
- *.vbproj merge=union
9
- *.fsproj merge=union
10
- *.dbproj merge=union
11
-
12
- # Standard to msysgit
13
- *.doc diff=astextplain
14
- *.DOC diff=astextplain
15
- *.docx diff=astextplain
16
- *.DOCX diff=astextplain
17
- *.dot diff=astextplain
18
- *.DOT diff=astextplain
19
- *.pdf diff=astextplain
20
- *.PDF diff=astextplain
21
- *.rtf diff=astextplain
22
- *.RTF diff=astextplain
1
+ # Auto detect text files and perform LF normalization
2
+ * text=auto
3
+
4
+ # Custom for Visual Studio
5
+ *.cs diff=csharp
6
+ *.sln merge=union
7
+ *.csproj merge=union
8
+ *.vbproj merge=union
9
+ *.fsproj merge=union
10
+ *.dbproj merge=union
11
+
12
+ # Standard to msysgit
13
+ *.doc diff=astextplain
14
+ *.DOC diff=astextplain
15
+ *.docx diff=astextplain
16
+ *.DOCX diff=astextplain
17
+ *.dot diff=astextplain
18
+ *.DOT diff=astextplain
19
+ *.pdf diff=astextplain
20
+ *.PDF diff=astextplain
21
+ *.rtf diff=astextplain
22
+ *.RTF diff=astextplain
package/.jshintrc CHANGED
@@ -1,86 +1,86 @@
1
- {
2
- // JSHint Default Configuration File (as on JSHint website)
3
- // See http://jshint.com/docs/ for more details
4
-
5
- "maxerr" : 50, // {int} Maximum error before stopping
6
-
7
- // Enforcing
8
- "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
9
- "camelcase" : false, // true: Identifiers must be in camelCase
10
- "curly" : true, // true: Require {} for every new block or scope
11
- "eqeqeq" : true, // true: Require triple equals (===) for comparison
12
- "forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
13
- "immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
14
- "indent" : 4, // {int} Number of spaces to use for indentation
15
- "latedef" : false, // true: Require variables/functions to be defined before being used
16
- "newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
17
- "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
18
- "noempty" : true, // true: Prohibit use of empty blocks
19
- "nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
20
- "plusplus" : false, // true: Prohibit use of `++` & `--`
21
- "quotmark" : false, // Quotation mark consistency:
22
- // false : do nothing (default)
23
- // true : ensure whatever is used is consistent
24
- // "single" : require single quotes
25
- // "double" : require double quotes
26
- "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
27
- "unused" : true, // true: Require all defined variables be used
28
- "strict" : true, // true: Requires all functions run in ES5 Strict Mode
29
- "trailing" : false, // true: Prohibit trailing whitespaces
30
- "maxparams" : false, // {int} Max number of formal params allowed per function
31
- "maxdepth" : false, // {int} Max depth of nested blocks (within functions)
32
- "maxstatements" : false, // {int} Max number statements per function
33
- "maxcomplexity" : false, // {int} Max cyclomatic complexity per function
34
- "maxlen" : false, // {int} Max number of characters per line
35
-
36
- // Relaxing
37
- "asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
38
- "boss" : false, // true: Tolerate assignments where comparisons would be expected
39
- "debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
40
- "eqnull" : false, // true: Tolerate use of `== null`
41
- "es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
42
- "esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
43
- "moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
44
- // (ex: `for each`, multiple try/catch, function expression…)
45
- "evil" : false, // true: Tolerate use of `eval` and `new Function()`
46
- "expr" : false, // true: Tolerate `ExpressionStatement` as Programs
47
- "funcscope" : false, // true: Tolerate defining variables inside control statements"
48
- "globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
49
- "iterator" : false, // true: Tolerate using the `__iterator__` property
50
- "lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
51
- "laxbreak" : false, // true: Tolerate possibly unsafe line breakings
52
- "laxcomma" : false, // true: Tolerate comma-first style coding
53
- "loopfunc" : false, // true: Tolerate functions being defined in loops
54
- "multistr" : false, // true: Tolerate multi-line strings
55
- "proto" : false, // true: Tolerate using the `__proto__` property
56
- "scripturl" : false, // true: Tolerate script-targeted URLs
57
- "smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment
58
- "shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
59
- "sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
60
- "supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
61
- "validthis" : false, // true: Tolerate using this in a non-constructor function
62
-
63
- // Environments
64
- "browser" : true, // Web Browser (window, document, etc)
65
- "couch" : false, // CouchDB
66
- "devel" : true, // Development/debugging (alert, confirm, etc)
67
- "dojo" : false, // Dojo Toolkit
68
- "jquery" : true, // jQuery
69
- "mootools" : false, // MooTools
70
- "node" : true, // Node.js
71
- "nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
72
- "prototypejs" : false, // Prototype and Scriptaculous
73
- "rhino" : false, // Rhino
74
- "worker" : false, // Web Workers
75
- "wsh" : false, // Windows Scripting Host
76
- "yui" : false, // Yahoo User Interface
77
-
78
- // Legacy
79
- "nomen" : false, // true: Prohibit dangling `_` in variables
80
- "onevar" : false, // true: Allow only one `var` statement per function
81
- "passfail" : false, // true: Stop on first error
82
- "white" : false, // true: Check against strict whitespace and indentation rules
83
-
84
- // Custom Globals
85
- "globals" : {} // additional predefined global variables
1
+ {
2
+ // JSHint Default Configuration File (as on JSHint website)
3
+ // See http://jshint.com/docs/ for more details
4
+
5
+ "maxerr" : 50, // {int} Maximum error before stopping
6
+
7
+ // Enforcing
8
+ "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
9
+ "camelcase" : false, // true: Identifiers must be in camelCase
10
+ "curly" : true, // true: Require {} for every new block or scope
11
+ "eqeqeq" : true, // true: Require triple equals (===) for comparison
12
+ "forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
13
+ "immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
14
+ "indent" : 4, // {int} Number of spaces to use for indentation
15
+ "latedef" : false, // true: Require variables/functions to be defined before being used
16
+ "newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
17
+ "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
18
+ "noempty" : true, // true: Prohibit use of empty blocks
19
+ "nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
20
+ "plusplus" : false, // true: Prohibit use of `++` & `--`
21
+ "quotmark" : false, // Quotation mark consistency:
22
+ // false : do nothing (default)
23
+ // true : ensure whatever is used is consistent
24
+ // "single" : require single quotes
25
+ // "double" : require double quotes
26
+ "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
27
+ "unused" : true, // true: Require all defined variables be used
28
+ "strict" : true, // true: Requires all functions run in ES5 Strict Mode
29
+ "trailing" : false, // true: Prohibit trailing whitespaces
30
+ "maxparams" : false, // {int} Max number of formal params allowed per function
31
+ "maxdepth" : false, // {int} Max depth of nested blocks (within functions)
32
+ "maxstatements" : false, // {int} Max number statements per function
33
+ "maxcomplexity" : false, // {int} Max cyclomatic complexity per function
34
+ "maxlen" : false, // {int} Max number of characters per line
35
+
36
+ // Relaxing
37
+ "asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
38
+ "boss" : false, // true: Tolerate assignments where comparisons would be expected
39
+ "debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
40
+ "eqnull" : false, // true: Tolerate use of `== null`
41
+ "es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
42
+ "esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
43
+ "moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
44
+ // (ex: `for each`, multiple try/catch, function expression…)
45
+ "evil" : false, // true: Tolerate use of `eval` and `new Function()`
46
+ "expr" : false, // true: Tolerate `ExpressionStatement` as Programs
47
+ "funcscope" : false, // true: Tolerate defining variables inside control statements"
48
+ "globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
49
+ "iterator" : false, // true: Tolerate using the `__iterator__` property
50
+ "lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
51
+ "laxbreak" : false, // true: Tolerate possibly unsafe line breakings
52
+ "laxcomma" : false, // true: Tolerate comma-first style coding
53
+ "loopfunc" : false, // true: Tolerate functions being defined in loops
54
+ "multistr" : false, // true: Tolerate multi-line strings
55
+ "proto" : false, // true: Tolerate using the `__proto__` property
56
+ "scripturl" : false, // true: Tolerate script-targeted URLs
57
+ "smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment
58
+ "shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
59
+ "sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
60
+ "supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
61
+ "validthis" : false, // true: Tolerate using this in a non-constructor function
62
+
63
+ // Environments
64
+ "browser" : true, // Web Browser (window, document, etc)
65
+ "couch" : false, // CouchDB
66
+ "devel" : true, // Development/debugging (alert, confirm, etc)
67
+ "dojo" : false, // Dojo Toolkit
68
+ "jquery" : true, // jQuery
69
+ "mootools" : false, // MooTools
70
+ "node" : true, // Node.js
71
+ "nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
72
+ "prototypejs" : false, // Prototype and Scriptaculous
73
+ "rhino" : false, // Rhino
74
+ "worker" : false, // Web Workers
75
+ "wsh" : false, // Windows Scripting Host
76
+ "yui" : false, // Yahoo User Interface
77
+
78
+ // Legacy
79
+ "nomen" : false, // true: Prohibit dangling `_` in variables
80
+ "onevar" : false, // true: Allow only one `var` statement per function
81
+ "passfail" : false, // true: Stop on first error
82
+ "white" : false, // true: Check against strict whitespace and indentation rules
83
+
84
+ // Custom Globals
85
+ "globals" : {} // additional predefined global variables
86
86
  }
package/LICENSE CHANGED
@@ -1,7 +1,7 @@
1
- Copyright (c) 2016 NodeBB Inc.
2
-
3
- Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
4
-
5
- The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
6
-
1
+ Copyright (c) 2016 NodeBB Inc.
2
+
3
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
4
+
5
+ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
6
+
7
7
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
package/README.md CHANGED
@@ -1,11 +1,11 @@
1
- # Default Composer for NodeBB
2
-
3
- This plugin activates the default composer for NodeBB. It is activated by default, but can be swapped out as necessary.
4
-
5
- ## Screenshots
6
-
7
- ### Desktop
8
- ![Desktop Composer](screenshots/desktop.png?raw=true)
9
-
10
- ### Mobile Devices
1
+ # Default Composer for NodeBB
2
+
3
+ This plugin activates the default composer for NodeBB. It is activated by default, but can be swapped out as necessary.
4
+
5
+ ## Screenshots
6
+
7
+ ### Desktop
8
+ ![Desktop Composer](screenshots/desktop.png?raw=true)
9
+
10
+ ### Mobile Devices
11
11
  ![Mobile Composer](screenshots/mobile.png?raw=true)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nodebb-plugin-composer-default",
3
- "version": "9.2.0",
3
+ "version": "10.0.0",
4
4
  "description": "Default composer for NodeBB",
5
5
  "main": "library.js",
6
6
  "repository": {
@@ -26,7 +26,7 @@
26
26
  },
27
27
  "readmeFilename": "README.md",
28
28
  "nbbpm": {
29
- "compatibility": "^2.5.0"
29
+ "compatibility": "^3.0.0"
30
30
  },
31
31
  "dependencies": {
32
32
  "@textcomplete/contenteditable": "^0.1.12",
package/plugin.json CHANGED
@@ -9,8 +9,8 @@
9
9
  { "hook": "filter:admin.header.build", "method": "addAdminNavigation" },
10
10
  { "hook": "filter:meta.getLinkTags", "method": "addPrefetchTags" }
11
11
  ],
12
- "less": [
13
- "./static/less/composer.less"
12
+ "scss": [
13
+ "./static/scss/composer.scss"
14
14
  ],
15
15
  "scripts": [
16
16
  "./static/lib/client.js",
@@ -73,7 +73,7 @@ define('composer/scheduler', ['benchpress', 'bootbox', 'alerts'], function (Benc
73
73
  buttons: {
74
74
  cancel: {
75
75
  label: state.timestamp ? '[[modules:composer.cancel-scheduling]]' : '[[modules:bootbox.cancel]]',
76
- className: (state.timestamp ? 'btn-warning' : 'btn-default') + (state.edit ? ' hidden' : ''),
76
+ className: (state.timestamp ? 'btn-warning' : 'btn-outline-secondary') + (state.edit ? ' hidden' : ''),
77
77
  callback: cancelScheduling,
78
78
  },
79
79
  set: {
@@ -17,6 +17,7 @@ define('composer/tags', ['alerts'], function (alerts) {
17
17
  maxTags = ajaxify.data.hasOwnProperty('maxTags') ? ajaxify.data.maxTags : config.maximumTagsPerTopic;
18
18
 
19
19
  tagEl.tagsinput({
20
+ tagClass: 'badge bg-info',
20
21
  confirmKeys: [13, 44],
21
22
  trimValue: true,
22
23
  });
@@ -1,17 +1,7 @@
1
- .define-if-not-set() {
2
- @btn-primary-bg: darken(#428bca, 6.5%);
3
- @btn-primary-color: #fff;
4
- @gray-light: lighten(#000, 46.7%);
5
- @padding-large-vertical: 10px;
6
- @padding-large-horizontal: 16px;
7
- }
8
-
9
- .define-if-not-set();
10
-
11
1
  .composer {
12
- .no-select;
2
+ @include no-select;
13
3
 
14
- z-index: @zindex-modal;
4
+ z-index: $zindex-modal;
15
5
 
16
6
  background: #fff;
17
7
  visibility: hidden;
@@ -32,8 +22,6 @@
32
22
 
33
23
  .mobile-navbar {
34
24
  position: static;
35
- background: @btn-primary-bg;
36
- color: @btn-primary-color;
37
25
  min-height: 40px;
38
26
  margin: 0;
39
27
 
@@ -79,7 +67,7 @@
79
67
  padding: 8px;
80
68
  font-size: 18px;
81
69
  border: 0;
82
- .box-shadow(none);
70
+ box-shadow: none;
83
71
  overflow: hidden;
84
72
  }
85
73
 
@@ -147,7 +135,7 @@
147
135
  .spacer {
148
136
  &:before {
149
137
  content: ' | ';
150
- color: @gray-light;
138
+ color: $gray-200;
151
139
  }
152
140
  }
153
141
 
@@ -173,7 +161,7 @@
173
161
 
174
162
  &[data-format="thumbs"][data-count]:after {
175
163
  content: attr(data-count);
176
- background: @brand-info;
164
+ background: $info;
177
165
  color: white;
178
166
  font-weight: 600;
179
167
  position: absolute;
@@ -219,13 +207,13 @@
219
207
  .preview-container {
220
208
  word-wrap: break-word;
221
209
  max-width: 50%;
222
- max-width: ~"calc(50% - 30px)";
210
+ max-width: calc(50% - 30px);
223
211
  }
224
212
 
225
213
  .write, .preview {
226
214
  width: 100%;
227
215
  font-size: 16px;
228
- .border-radius(0);
216
+ @include border-radius(0);
229
217
  resize: none;
230
218
  overflow: auto;
231
219
  padding: 25px 10px;
@@ -236,7 +224,7 @@
236
224
  border: none;
237
225
  border-top: 1px solid #EDEDED;
238
226
  border-bottom: 1px solid #EDEDED;
239
- .box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.05));
227
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
240
228
  }
241
229
 
242
230
  .preview {
@@ -249,19 +237,16 @@
249
237
  }
250
238
 
251
239
  .help {
252
- .pointer;
240
+ @include pointer;
253
241
  }
254
242
 
255
243
  .toggle-preview {
256
244
  margin-left: 20px;
257
- .pointer;
245
+ @include pointer;
258
246
  }
259
247
 
260
248
  .tags-container {
261
249
  [component="composer/tag/dropdown"] {
262
- display: inherit;
263
- top: -8px;
264
- left: -8px;
265
250
  .dropdown-menu {
266
251
  max-height: 400px;
267
252
  overflow-y: auto;
@@ -271,12 +256,17 @@
271
256
  border: 0;
272
257
  }
273
258
  }
274
-
259
+ // if picking tags from taglist dropdown hide the input
260
+ &.haswhitelist .bootstrap-tagsinput {
261
+ input {
262
+ display: none;
263
+ }
264
+ }
275
265
  .bootstrap-tagsinput {
266
+ flex-grow: 1;
276
267
  border: 0;
277
268
  padding: 4px 6px;
278
269
  box-shadow: none;
279
- display: block;
280
270
  max-height: 80px;
281
271
  overflow: auto;
282
272
 
@@ -305,7 +295,7 @@
305
295
 
306
296
  margin: 0;
307
297
  padding: 0 5px;
308
- max-height: ~"calc(100% - 86px)";
298
+ max-height: calc(100% - 86px);
309
299
 
310
300
  background: #fff;
311
301
  box-shadow: 0 2px 6px rgba(0,0,0,0.35);
@@ -320,16 +310,6 @@
320
310
  visibility: visible;
321
311
  transition-delay: 0s;
322
312
  }
323
-
324
- li {
325
- padding: 10px;
326
- color: #333;
327
-
328
- &.active {
329
- background-color: @btn-primary-bg;
330
- color: @btn-primary-color;
331
- }
332
- }
333
313
  }
334
314
 
335
315
  .resizer {
@@ -340,7 +320,7 @@
340
320
  top: 0px;
341
321
  height: 0;
342
322
 
343
- .pointer;
323
+ @include pointer;
344
324
 
345
325
  .trigger {
346
326
  position: relative;
@@ -349,7 +329,7 @@
349
329
  margin: 0 auto;
350
330
  margin-left: 20px;
351
331
  line-height: 26px;
352
- .transition(filter .15s linear);
332
+ @include transition(filter .15s linear);
353
333
 
354
334
  &:hover {
355
335
  filter: invert(100%);
@@ -361,7 +341,7 @@
361
341
  height: 32px;
362
342
  background: #333;
363
343
  border: 1px solid #333;
364
- .border-radius(50%);
344
+ border-radius: 50%;
365
345
 
366
346
  position: relative;
367
347
 
@@ -369,7 +349,7 @@
369
349
  font-size: 16px;
370
350
 
371
351
  &:before {
372
- content: @fa-var-arrows-v;
352
+ content: fa-content($fa-var-arrows-alt-v);
373
353
  position: relative;
374
354
  top: 25%;
375
355
  }
@@ -384,7 +364,7 @@
384
364
  right: 10px;
385
365
  height: 0;
386
366
 
387
- .pointer;
367
+ @include pointer;
388
368
 
389
369
  .trigger {
390
370
  position: relative;
@@ -394,7 +374,7 @@
394
374
  margin: 0 auto;
395
375
  margin-left: 20px;
396
376
  line-height: 26px;
397
- .transition(filter .15s linear);
377
+ @include transition(filter .15s linear);
398
378
 
399
379
  &:hover {
400
380
  filter: invert(100%);
@@ -405,7 +385,7 @@
405
385
  height: 32px;
406
386
  background: #333;
407
387
  border: 1px solid #333;
408
- .border-radius(50%);
388
+ border-radius: 50%;
409
389
 
410
390
  position: relative;
411
391
 
@@ -429,7 +409,7 @@
429
409
  &.resizable.maximized {
430
410
  .resizer .trigger i {
431
411
  &:before {
432
- content: @fa-var-chevron-down;
412
+ content: fa-content($fa-var-chevron-down);
433
413
  }
434
414
  }
435
415
 
@@ -438,18 +418,18 @@
438
418
 
439
419
  .draft-icon {
440
420
  font-family: 'FontAwesome';
441
- color: @state-success-text;
421
+ color: $success;
442
422
  margin: 0 1em;
443
423
  opacity: 0;
444
424
 
445
425
  &::before {
446
- content: @fa-var-save;
426
+ content: fa-content($fa-var-save);
447
427
  position: relative;
448
428
  top: 25%;
449
429
  }
450
430
 
451
431
  &::after {
452
- content: @fa-var-check;
432
+ content: fa-content($fa-var-check);
453
433
  position: relative;
454
434
  top: 18px;
455
435
  font-size: 0.7em;
@@ -524,7 +504,7 @@
524
504
  }
525
505
  }
526
506
 
527
- @media (min-width: @screen-md-max) {
507
+ @include media-breakpoint-up(md) {
528
508
  html.composing {
529
509
  .composer {
530
510
  left: 15%;
@@ -533,11 +513,11 @@
533
513
  }
534
514
  }
535
515
 
536
- @media (max-width: @screen-sm-max) {
516
+ @include media-breakpoint-down(sm) {
537
517
  html.composing {
538
518
  .composer {
539
519
  height: 100%;
540
- z-index: @zindex-modal;
520
+ z-index: $zindex-modal;
541
521
 
542
522
  .draft-icon {
543
523
  position: absolute;
@@ -564,10 +544,11 @@
564
544
  }
565
545
  }
566
546
 
567
- @media (min-width: @screen-md-min) {
568
- @import './medium.less';
547
+ @include media-breakpoint-up(md) {
548
+ @import './medium';
569
549
  }
570
550
 
571
- @import './zen-mode.less';
572
- @import './page-compose.less';
573
- @import './textcomplete.less';
551
+ @import './zen-mode';
552
+ @import './page-compose';
553
+ @import './textcomplete';
554
+
@@ -1,3 +1,4 @@
1
+
1
2
  .composer {
2
3
  min-height: 400px;
3
4
 
@@ -27,7 +28,7 @@
27
28
  }
28
29
 
29
30
  &.resizable {
30
- .box-shadow(0px 6px 12px rgba(0, 0, 0, 0.5));
31
+ box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.5);
31
32
 
32
33
  padding-top: 30px;
33
34
  padding-left: 15px;
@@ -57,10 +58,6 @@
57
58
 
58
59
  .bootstrap-tagsinput {
59
60
  padding: 0;
60
-
61
- input {
62
- margin-left: -6px;
63
- }
64
61
  }
65
62
  }
66
63
  }
@@ -38,7 +38,7 @@ html.zen-mode {
38
38
  }
39
39
  }
40
40
 
41
- @media (min-width: @screen-md-min) {
41
+ @include media-breakpoint-up(md) {
42
42
  & {
43
43
  padding-left: 15px;
44
44
  padding-right: 15px;
@@ -1,17 +1,17 @@
1
- <form role="form" class="composer-default-settings">
2
- <div class="row">
3
- <div class="col-sm-2 col-xs-12 settings-header">General</div>
4
- <div class="col-sm-10 col-xs-12">
5
- <div class="checkbox">
6
- <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
7
- <input class="mdl-switch__input" type="checkbox" name="composeRouteEnabled" />
8
- <span class="mdl-switch__label"><strong>Use a separate route for the composer</strong></span>
9
- </label>
10
- </div>
11
- </div>
12
- </div>
13
- </form>
14
-
15
- <button id="save" class="floating-button mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
16
- <i class="material-icons">save</i>
1
+ <form role="form" class="composer-default-settings">
2
+ <div class="row">
3
+ <div class="col-sm-2 col-xs-12 settings-header">General</div>
4
+ <div class="col-sm-10 col-xs-12">
5
+ <div class="checkbox">
6
+ <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
7
+ <input class="mdl-switch__input" type="checkbox" name="composeRouteEnabled" />
8
+ <span class="mdl-switch__label"><strong>Use a separate route for the composer</strong></span>
9
+ </label>
10
+ </div>
11
+ </div>
12
+ </div>
13
+ </form>
14
+
15
+ <button id="save" class="floating-button mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
16
+ <i class="material-icons">save</i>
17
17
  </button>
@@ -20,7 +20,7 @@
20
20
  <div class="category-list-container"><!-- IMPORT partials/category-selector.tpl --></div>
21
21
  <!-- ENDIF isTopic -->
22
22
  <!-- IF isTopicOrMain -->
23
- <div class="display-scheduler pull-right{{{ if !canSchedule }}} hidden{{{ end }}}">
23
+ <div class="display-scheduler float-end{{{ if !canSchedule }}} hidden{{{ end }}}">
24
24
  <i class="fa fa-clock-o"></i>
25
25
  </div>
26
26
  <!-- ENDIF isTopicOrMain -->
@@ -77,8 +77,8 @@
77
77
  </form>
78
78
  </ul>
79
79
 
80
- <div class="btn-group pull-right action-bar">
81
- <a href="{discardRoute}" class="btn btn-default composer-discard" data-action="discard" tabindex="-1"><i class="fa fa-times"></i> [[topic:composer.discard]]</a>
80
+ <div class="btn-group float-end action-bar">
81
+ <a href="{discardRoute}" class="btn btn-outline-secondary composer-discard" data-action="discard" tabindex="-1"><i class="fa fa-times"></i> [[topic:composer.discard]]</a>
82
82
 
83
83
  <button type="submit" form="compose-form" class="btn btn-primary composer-submit" data-action="post" tabindex="6" data-text-variant=" [[topic:composer.schedule]]"><i class="fa fa-check"></i> [[topic:composer.submit]]</button>
84
84
  </div>
@@ -103,16 +103,16 @@
103
103
 
104
104
  <!-- IF isTopicOrMain -->
105
105
  <div class="tag-row">
106
- <div class="tags-container">
106
+ <div class="tags-container d-flex {{{ if tagWhitelist.length }}}haswhitelist{{{ end }}}">
107
107
  <div class="btn-group dropup <!-- IF !tagWhitelist.length -->hidden<!-- ENDIF !tagWhitelist.length -->" component="composer/tag/dropdown">
108
- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">
108
+ <button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button">
109
109
  <span class="visible-sm-inline visible-md-inline visible-lg-inline"><i class="fa fa-tags"></i></span>
110
110
  <span class="caret"></span>
111
111
  </button>
112
112
 
113
113
  <ul class="dropdown-menu">
114
114
  <!-- BEGIN tagWhitelist -->
115
- <li data-tag="{@value}"><a href="#">{@value}</a></li>
115
+ <li data-tag="{@value}"><a class="dropdown-item" href="#">{@value}</a></li>
116
116
  <!-- END tagWhitelist -->
117
117
  </ul>
118
118
  </div>
@@ -1,7 +1,7 @@
1
1
  <div component="composer" class="composer<!-- IF resizable --> resizable<!-- ENDIF resizable --><!-- IF !isTopicOrMain --> reply<!-- ENDIF !isTopicOrMain -->">
2
2
 
3
3
  <div class="composer-container">
4
- <nav class="navbar navbar-fixed-top mobile-navbar hidden-md hidden-lg">
4
+ <nav class="navbar fixed-top mobile-navbar hidden-md hidden-lg text-bg-primary">
5
5
  <div class="btn-group">
6
6
  <button class="btn btn-sm btn-primary composer-discard" data-action="discard" tabindex="-1"><i class="fa fa-times"></i></button>
7
7
  <button class="btn btn-sm btn-primary composer-minimize" data-action="minimize" tabindex="-1"><i class="fa fa-minus"></i></button>
@@ -14,14 +14,14 @@
14
14
  <!-- IF !isTopicOrMain -->
15
15
  <h4 class="title">[[topic:composer.replying_to, "{title}"]]</h4>
16
16
  <!-- ENDIF !isTopicOrMain -->
17
- <div class="display-scheduler pull-right{{{ if !canSchedule }}} hidden{{{ end }}}">
17
+ <div class="display-scheduler float-end{{{ if !canSchedule }}} hidden{{{ end }}}">
18
18
  <i class="fa fa-clock-o"></i>
19
19
  </div>
20
20
  <div class="btn-group">
21
21
  <button class="btn btn-sm btn-primary composer-submit" data-action="post" tabindex="-1"><i class="fa fa-chevron-right"></i></button>
22
22
  </div>
23
23
  </nav>
24
- <div class="row title-container">
24
+ <div class="title-container">
25
25
  {{{ if isTopic }}}
26
26
  <div class="category-list-container hidden-sm hidden-xs">
27
27
  <!-- IMPORT partials/category-selector.tpl -->
@@ -45,21 +45,23 @@
45
45
  </div>
46
46
  </div>
47
47
 
48
- <div class="pull-right draft-icon hidden-xs hidden-sm"></div>
48
+ <div class="float-end draft-icon hidden-xs hidden-sm"></div>
49
49
 
50
- <div class="display-scheduler pull-right hidden-sm hidden-xs{{{ if !canSchedule }}} hidden{{{ end }}}">
50
+ <div class="display-scheduler float-end hidden-sm hidden-xs{{{ if !canSchedule }}} hidden{{{ end }}}">
51
51
  <i class="fa fa-clock-o"></i>
52
52
  </div>
53
53
 
54
- <div class="btn-group pull-right action-bar hidden-sm hidden-xs">
55
- <button class="btn btn-default composer-discard" data-action="discard" tabindex="-1"><i class="fa fa-times"></i> [[topic:composer.discard]]</button>
54
+ <div class="btn-group float-end action-bar hidden-sm hidden-xs">
55
+ <button class="btn btn-outline-secondary composer-discard" data-action="discard" tabindex="-1"><i class="fa fa-times"></i> [[topic:composer.discard]]</button>
56
56
 
57
- <ul class="dropdown-menu">{{{ each submitOptions }}}<li><a href="#" data-action="{./action}">{./text}</a></li>{{{ end }}}</ul>
58
57
  <button class="btn btn-primary composer-submit" data-action="post" tabindex="6" data-text-variant=" [[topic:composer.schedule]]"><i class="fa fa-check"></i> [[topic:composer.submit]]</button>
59
- <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
58
+ {{{ if submitOptions.length }}}
59
+ <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
60
60
  <span class="caret"></span>
61
61
  <span class="sr-only">[[topic:composer.additional-options]]</span>
62
62
  </button>
63
+ <ul class="dropdown-menu">{{{ each submitOptions }}}<li><a href="#" data-action="{./action}">{./text}</a></li>{{{ end }}}</ul>
64
+ {{{ end }}}
63
65
  </div>
64
66
  </div>
65
67
 
@@ -94,39 +96,39 @@
94
96
  </div>
95
97
  </div>
96
98
 
97
- <div class="row write-preview-container">
99
+ <div class="write-preview-container">
98
100
  <div class="write-container">
99
101
  <div class="help-text">
100
102
  <span class="help hidden">[[modules:composer.compose]] <i class="fa fa-question-circle"></i></span>
101
103
  <span class="toggle-preview hide">[[modules:composer.show_preview]]</span>
102
104
  </div>
103
- <div class="pull-right draft-icon hidden-md hidden-lg"></div>
105
+ <div class="float-end draft-icon hidden-md hidden-lg"></div>
104
106
  <textarea class="write" tabindex="4" placeholder="[[modules:composer.textarea.placeholder]]">{body}</textarea>
105
107
  </div>
106
108
  <div class="hidden-sm hidden-xs preview-container">
107
109
  <div class="help-text">
108
110
  <span class="toggle-preview">[[modules:composer.hide_preview]]</span>
109
111
  </div>
110
- <div class="preview well"></div>
112
+ <div class="preview card card-body bg-light"></div>
111
113
  </div>
112
114
  </div>
113
115
 
114
116
  <!-- IF isTopicOrMain -->
115
117
  <div class="tag-row">
116
- <div class="tags-container">
118
+ <div class="tags-container d-flex {{{ if tagWhitelist.length }}}haswhitelist{{{ end }}}">
117
119
  <div class="btn-group dropup <!-- IF !tagWhitelist.length -->hidden<!-- ENDIF !tagWhitelist.length -->" component="composer/tag/dropdown">
118
- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">
120
+ <button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button">
119
121
  <span class="visible-sm-inline visible-md-inline visible-lg-inline"><i class="fa fa-tags"></i></span>
120
122
  [[tags:select_tags]]
121
123
  </button>
122
124
 
123
125
  <ul class="dropdown-menu">
124
126
  <!-- BEGIN tagWhitelist -->
125
- <li data-tag="{@value}"><a href="#">{@value}</a></li>
127
+ <li data-tag="{@value}"><a class="dropdown-item" href="#">{@value}</a></li>
126
128
  <!-- END tagWhitelist -->
127
129
  </ul>
128
130
  </div>
129
- <input class="tags" type="text" class="form-control" placeholder="[[tags:enter_tags_here, {minimumTagLength}, {maximumTagLength}]]" tabindex="5"/>
131
+ <input class="tags" type="text" class="" placeholder="[[tags:enter_tags_here, {minimumTagLength}, {maximumTagLength}]]" tabindex="5" />
130
132
  </div>
131
133
  </div>
132
134
  <!-- ENDIF isTopicOrMain -->
File without changes