Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
d9709af7
Commit
d9709af7
authored
Feb 21, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Initial work on the new chatroom modal
parent
b5812e25
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
83 additions
and
24 deletions
+83
-24
css/converse.css
css/converse.css
+14
-0
css/inverse.css
css/inverse.css
+14
-0
docs/source/plugin_development.rst
docs/source/plugin_development.rst
+12
-12
mockup/modals.html
mockup/modals.html
+4
-11
sass/_core.scss
sass/_core.scss
+17
-1
src/templates/add_chatroom_modal.html
src/templates/add_chatroom_modal.html
+22
-0
No files found.
css/converse.css
View file @
d9709af7
...
@@ -4739,6 +4739,20 @@ body.reset {
...
@@ -4739,6 +4739,20 @@ body.reset {
color
:
#A8ABA1
;
}
color
:
#A8ABA1
;
}
#conversejs
::placeholder
{
#conversejs
::placeholder
{
color
:
#A8ABA1
;
}
color
:
#A8ABA1
;
}
#conversejs
.form-control
::-webkit-input-placeholder
{
/* Chrome/Opera/Safari */
color
:
#A8ABA1
;
}
#conversejs
.form-control
::-moz-placeholder
{
/* Firefox 19+ */
color
:
#A8ABA1
;
}
#conversejs
.form-control
:-ms-input-placeholder
{
/* IE 10+ */
color
:
#A8ABA1
;
}
#conversejs
.form-control
:-moz-placeholder
{
/* Firefox 18- */
color
:
#A8ABA1
;
}
#conversejs
.form-control
::placeholder
{
color
:
#A8ABA1
;
}
#conversejs
::selection
{
#conversejs
::selection
{
background-color
:
#DCF9F6
;
}
background-color
:
#DCF9F6
;
}
#conversejs
::-moz-selection
{
#conversejs
::-moz-selection
{
...
...
css/inverse.css
View file @
d9709af7
...
@@ -4739,6 +4739,20 @@ body.reset {
...
@@ -4739,6 +4739,20 @@ body.reset {
color
:
#A8ABA1
;
}
color
:
#A8ABA1
;
}
#conversejs
::placeholder
{
#conversejs
::placeholder
{
color
:
#A8ABA1
;
}
color
:
#A8ABA1
;
}
#conversejs
.form-control
::-webkit-input-placeholder
{
/* Chrome/Opera/Safari */
color
:
#A8ABA1
;
}
#conversejs
.form-control
::-moz-placeholder
{
/* Firefox 19+ */
color
:
#A8ABA1
;
}
#conversejs
.form-control
:-ms-input-placeholder
{
/* IE 10+ */
color
:
#A8ABA1
;
}
#conversejs
.form-control
:-moz-placeholder
{
/* Firefox 18- */
color
:
#A8ABA1
;
}
#conversejs
.form-control
::placeholder
{
color
:
#A8ABA1
;
}
#conversejs
::selection
{
#conversejs
::selection
{
background-color
:
#DCF9F6
;
}
background-color
:
#DCF9F6
;
}
#conversejs
::-moz-selection
{
#conversejs
::-moz-selection
{
...
...
docs/source/plugin_development.rst
View file @
d9709af7
...
@@ -385,15 +385,15 @@ generated by `generator-conversejs <https://github.com/jcbrand/generator-convers
...
@@ -385,15 +385,15 @@ generated by `generator-conversejs <https://github.com/jcbrand/generator-convers
// The following line registers your plugin.
// The following line registers your plugin.
converse.plugins.add("myplugin", {
converse.plugins.add("myplugin", {
/*
Optional d
ependencies are other plugins which might be
/*
D
ependencies are other plugins which might be
* overridden or relied upon, and therefore need to be loaded before
* overridden or relied upon, and therefore need to be loaded before
* this plugin. They are called
"optional" because they might not be
* this plugin. They are
"optional" because they might not be
* available, in which case any overrides applicable to them will be
* available, in which case any overrides applicable to them will be
* ignored.
* ignored.
*
*
* NB: These plugins need to have already been loaded via require.js.
* NB: These plugins need to have already been loaded via require.js.
*
*
* It's possible to make optional dependencies non-optional
.
* It's possible to make these dependencies "non-optional"
.
* If the setting "strict_plugin_dependencies" is set to true,
* If the setting "strict_plugin_dependencies" is set to true,
* an error will be raised if the plugin is not found.
* an error will be raised if the plugin is not found.
*/
*/
...
...
mockup/modals.html
View file @
d9709af7
...
@@ -143,7 +143,7 @@
...
@@ -143,7 +143,7 @@
<div
class=
"modal-dialog"
role=
"document"
>
<div
class=
"modal-dialog"
role=
"document"
>
<div
class=
"modal-content"
>
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<div
class=
"modal-header"
>
<h5
class=
"modal-title"
id=
"chatroomsModalLabel"
>
N
ew Chatroom
</h5>
<h5
class=
"modal-title"
id=
"chatroomsModalLabel"
>
Enter a n
ew Chatroom
</h5>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-label=
"Close"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-label=
"Close"
>
<span
aria-hidden=
"true"
>
×
</span>
<span
aria-hidden=
"true"
>
×
</span>
</button>
</button>
...
@@ -151,18 +151,11 @@
...
@@ -151,18 +151,11 @@
<div
class=
"modal-body"
>
<div
class=
"modal-body"
>
<form
class=
"pure-form pure-form-stacked converse-form add-chatroom"
>
<form
class=
"pure-form pure-form-stacked converse-form add-chatroom"
>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
for=
"chatroom"
>
Room name
</label>
<label
for=
"chatroom"
>
Room address
</label>
<input
type=
"text"
name=
"chatroom"
class=
"form-control"
placeholder=
"Room name"
>
<input
type=
"text"
name=
"chatroom"
class=
"form-control"
placeholder=
"room@conference.example.org"
>
</div>
<div
class=
"form-group"
>
<label
for=
"server"
>
Server
</label>
<input
type=
"text"
name=
"server"
class=
"form-control"
placeholder=
"Server"
>
</div>
<input
type=
"submit"
class=
"btn btn-primary"
name=
"join"
value=
"Join"
>
<input
type=
"submit"
class=
"btn btn-primary"
name=
"join"
value=
"Join"
>
</form>
</div>
</div>
<div
class=
"modal-footer"
>
</form>
<button
type=
"button"
class=
"btn btn-secondary"
data-dismiss=
"modal"
>
Cancel
</button>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
sass/_core.scss
View file @
d9709af7
...
@@ -36,10 +36,26 @@ body.reset {
...
@@ -36,10 +36,26 @@ body.reset {
:-moz-placeholder
{
/* Firefox 18- */
:-moz-placeholder
{
/* Firefox 18- */
color
:
$subdued-color
;
color
:
$subdued-color
;
}
}
::placeholder
{
::placeholder
{
color
:
$subdued-color
;
color
:
$subdued-color
;
}
}
.form-control
{
&
:
:-
webkit-input-placeholder
{
/* Chrome/Opera/Safari */
color
:
$subdued-color
;
}
&
:
:-
moz-placeholder
{
/* Firefox 19+ */
color
:
$subdued-color
;
}
&
:
-
ms-input-placeholder
{
/* IE 10+ */
color
:
$subdued-color
;
}
&
:
-
moz-placeholder
{
/* Firefox 18- */
color
:
$subdued-color
;
}
&
:
:
placeholder
{
color
:
$subdued-color
;
}
}
::selection
{
::selection
{
background-color
:
$highlight-color
;
background-color
:
$highlight-color
;
...
...
src/templates/add_chatroom_modal.html
0 → 100644
View file @
d9709af7
<div
class=
"modal fade"
id=
"chatroomsModal"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"chatroomsModalLabel"
aria-hidden=
"true"
>
<div
class=
"modal-dialog"
role=
"document"
>
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<h5
class=
"modal-title"
id=
"chatroomsModalLabel"
>
{{{o.heading_new_chatroom}}}
</h5>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-label=
"Close"
>
<span
aria-hidden=
"true"
>
×
</span>
</button>
</div>
<div
class=
"modal-body"
>
<form
class=
"pure-form pure-form-stacked converse-form add-chatroom"
>
<div
class=
"form-group"
>
<label
for=
"chatroom"
>
Room address
</label>
<input
type=
"text"
name=
"chatroom"
class=
"form-control"
placeholder=
"name@conference.example.org"
>
</div>
<input
type=
"submit"
class=
"btn btn-primary"
name=
"join"
value=
"Join"
>
</form>
</div>
</div>
</div>
</div>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment