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
be5b2357
Commit
be5b2357
authored
May 24, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Combine _core.scss from inverse/converse
updates #1091
parent
a8540162
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
51 additions
and
97 deletions
+51
-97
css/converse.css
css/converse.css
+5
-3
css/fullpage.css
css/fullpage.css
+26
-0
css/inverse.css
css/inverse.css
+5
-45
dev.html
dev.html
+1
-0
fullscreen.html
fullscreen.html
+1
-0
sass/_core.scss
sass/_core.scss
+13
-0
sass/converse.scss
sass/converse.scss
+0
-1
sass/converse/_core.scss
sass/converse/_core.scss
+0
-5
sass/inverse.scss
sass/inverse.scss
+0
-1
sass/inverse/_core.scss
sass/inverse/_core.scss
+0
-42
No files found.
css/converse.css
View file @
be5b2357
...
@@ -6868,6 +6868,11 @@ body.reset {
...
@@ -6868,6 +6868,11 @@ body.reset {
font-size
:
14px
;
font-size
:
14px
;
direction
:
ltr
;
direction
:
ltr
;
z-index
:
1031
;
}
z-index
:
1031
;
}
#conversejs
.converse-overlayed
>
.row
{
flex-direction
:
row-reverse
;
}
#conversejs
.converse-fullscreen
.converse-chatboxes
{
width
:
100vw
;
right
:
15px
;
}
#conversejs
.brand-heading
{
#conversejs
.brand-heading
{
font-family
:
"Century Gothic"
,
futura
,
"URW Gothic L"
,
Verdana
,
sans-serif
;
}
font-family
:
"Century Gothic"
,
futura
,
"URW Gothic L"
,
Verdana
,
sans-serif
;
}
#conversejs
.brand-heading
.icon-conversejs
{
#conversejs
.brand-heading
.icon-conversejs
{
...
@@ -7201,9 +7206,6 @@ body.reset {
...
@@ -7201,9 +7206,6 @@ body.reset {
@media
screen
and
(
max-height
:
450px
)
{
@media
screen
and
(
max-height
:
450px
)
{
#conversejs
{
#conversejs
{
left
:
0
;
}
}
left
:
0
;
}
}
#conversejs
>
.row
{
flex-direction
:
row-reverse
;
}
#conversejs
form
.form-group
{
#conversejs
form
.form-group
{
margin-bottom
:
2em
;
}
margin-bottom
:
2em
;
}
#conversejs
form
.form-check-label
{
#conversejs
form
.form-check-label
{
...
...
css/fullpage.css
0 → 100644
View file @
be5b2357
body
{
font-family
:
"Lora"
,
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
color
:
#ffffff
;
background-color
:
#578EA9
;
}
.brand-heading
{
font-size
:
600%
;
margin-left
:
-10%
;
}
.icon-conversejs
{
font-size
:
88%
;
}
.brand-heading
div
.content
{
height
:
100vh
;
width
:
100vw
;
position
:
fixed
;
background-color
:
#578EA9
;
}
.brand-heading
div
.content
.inner-content
{
text-align
:
center
;
padding
:
7%
;
}
p
.no-chats
{
padding-right
:
10%
;
font-size
:
120%
;
}
css/inverse.css
View file @
be5b2357
...
@@ -6868,6 +6868,11 @@ body.reset {
...
@@ -6868,6 +6868,11 @@ body.reset {
font-size
:
14px
;
font-size
:
14px
;
direction
:
ltr
;
direction
:
ltr
;
z-index
:
1031
;
}
z-index
:
1031
;
}
#conversejs
.converse-overlayed
>
.row
{
flex-direction
:
row-reverse
;
}
#conversejs
.converse-fullscreen
.converse-chatboxes
{
width
:
100vw
;
right
:
15px
;
}
#conversejs
.brand-heading
{
#conversejs
.brand-heading
{
font-family
:
"Century Gothic"
,
futura
,
"URW Gothic L"
,
Verdana
,
sans-serif
;
}
font-family
:
"Century Gothic"
,
futura
,
"URW Gothic L"
,
Verdana
,
sans-serif
;
}
#conversejs
.brand-heading
.icon-conversejs
{
#conversejs
.brand-heading
.icon-conversejs
{
...
@@ -7201,51 +7206,6 @@ body.reset {
...
@@ -7201,51 +7206,6 @@ body.reset {
@media
screen
and
(
max-height
:
450px
)
{
@media
screen
and
(
max-height
:
450px
)
{
#conversejs
{
#conversejs
{
left
:
0
;
}
}
left
:
0
;
}
}
body
{
font-family
:
"Lora"
,
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
color
:
#ffffff
;
background-color
:
#578EA9
;
}
body
.brand-heading
{
font-size
:
600%
;
margin-left
:
-10%
;
}
body
.brand-heading.fade-in
{
opacity
:
0
;
/* make things invisible upon start */
-webkit-animation-name
:
fadein
;
-moz-animation-name
:
fadein
;
animation-name
:
fadein
;
-webkit-animation-fill-mode
:
forwards
;
-moz-animation-fill-mode
:
forwards
;
animation-fill-mode
:
forwards
;
-webkit-animation-duration
:
0.75s
;
-moz-animation-duration
:
0.75s
;
animation-duration
:
0.75s
;
-webkit-animation-timing-function
:
ease
;
-moz-animation-timing-function
:
ease
;
animation-timing-function
:
ease
;
-webkit-animation-delay
:
2s
;
-moz-animation-delay
:
2s
;
animation-delay
:
2s
;
}
body
.brand-heading
.icon-conversejs
{
font-size
:
88%
;
}
body
div
.content
{
height
:
100vh
;
width
:
100vw
;
position
:
fixed
;
background-color
:
#578EA9
;
}
body
div
.content
.inner-content
{
text-align
:
center
;
padding
:
7%
;
padding-left
:
-webkit-calc
(
5%
+
250px
);
padding-left
:
calc
(
5%
+
250px
);
}
body
div
.content
.inner-content
p
.no-chats
{
padding-right
:
10%
;
font-size
:
120%
;
}
#conversejs
.fullscreen
.converse-chatboxes
{
width
:
100vw
;
right
:
15px
;
}
#conversejs
form
.form-group
{
#conversejs
form
.form-group
{
margin-bottom
:
2em
;
}
margin-bottom
:
2em
;
}
#conversejs
form
.form-check-label
{
#conversejs
form
.form-check-label
{
...
...
dev.html
View file @
be5b2357
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
<meta
name=
"author"
content=
"JC Brand"
/>
<meta
name=
"author"
content=
"JC Brand"
/>
<meta
name=
"keywords"
content=
"xmpp chat webchat converse.js"
/>
<meta
name=
"keywords"
content=
"xmpp chat webchat converse.js"
/>
<link
rel=
"shortcut icon"
type=
"image/ico"
href=
"css/images/favicon.ico"
/>
<link
rel=
"shortcut icon"
type=
"image/ico"
href=
"css/images/favicon.ico"
/>
<link
type=
"text/css"
rel=
"stylesheet"
media=
"screen"
href=
"css/fullpage.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
media=
"screen"
href=
"css/inverse.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
media=
"screen"
href=
"css/inverse.css"
/>
<script
src=
"node_modules/requirejs/require.js"
></script>
<script
src=
"node_modules/requirejs/require.js"
></script>
<script
src=
"src/config.js"
></script>
<script
src=
"src/config.js"
></script>
...
...
fullscreen.html
View file @
be5b2357
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
<script
type=
"text/javascript"
src=
"inverse-analytics.js"
></script>
<script
type=
"text/javascript"
src=
"inverse-analytics.js"
></script>
<noscript><p><img
src=
"//stats.opkode.com/piwik.php?idsite=5"
style=
"border:0;"
alt=
""
/></p></noscript>
<noscript><p><img
src=
"//stats.opkode.com/piwik.php?idsite=5"
style=
"border:0;"
alt=
""
/></p></noscript>
<link
type=
"text/css"
rel=
"stylesheet"
media=
"screen"
href=
"css/inverse.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
media=
"screen"
href=
"css/inverse.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
media=
"screen"
href=
"css/fullpage.css"
/>
<script
src=
"dist/converse.js"
></script>
<script
src=
"dist/converse.js"
></script>
</head>
</head>
<body
class=
"reset"
>
<body
class=
"reset"
>
...
...
sass/_core.scss
View file @
be5b2357
...
@@ -61,6 +61,19 @@ body.reset {
...
@@ -61,6 +61,19 @@ body.reset {
direction
:
ltr
;
direction
:
ltr
;
z-index
:
1031
;
// One more than bootstrap navbar
z-index
:
1031
;
// One more than bootstrap navbar
&
.converse-overlayed
{
>
.row
{
flex-direction
:
row-reverse
;
}
}
&
.converse-fullscreen
{
.converse-chatboxes
{
width
:
100vw
;
right
:
15px
;
// Hack due to padding added by bootstrap
}
}
.brand-heading
{
.brand-heading
{
font-family
:
$heading-font
;
font-family
:
$heading-font
;
.icon-conversejs
{
.icon-conversejs
{
...
...
sass/converse.scss
View file @
be5b2357
...
@@ -40,7 +40,6 @@
...
@@ -40,7 +40,6 @@
@import
"bootstrap/scss/utilities"
;
@import
"bootstrap/scss/utilities"
;
}
}
@import
"core"
;
@import
"core"
;
@import
"converse/core"
;
@import
"forms"
;
@import
"forms"
;
@import
"profile"
;
@import
"profile"
;
@import
"chatbox"
;
@import
"chatbox"
;
...
...
sass/converse/_core.scss
deleted
100644 → 0
View file @
a8540162
#conversejs
{
>
.row
{
flex-direction
:
row-reverse
;
}
}
sass/inverse.scss
View file @
be5b2357
...
@@ -39,7 +39,6 @@
...
@@ -39,7 +39,6 @@
@import
"bootstrap/scss/utilities"
;
@import
"bootstrap/scss/utilities"
;
}
}
@import
"core"
;
@import
"core"
;
@import
"inverse/core"
;
@import
"forms"
;
@import
"forms"
;
@import
"profile"
;
@import
"profile"
;
@import
"chatbox"
;
@import
"chatbox"
;
...
...
sass/inverse/_core.scss
deleted
100644 → 0
View file @
a8540162
body
{
font-family
:
"Lora"
,
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
color
:
#ffffff
;
background-color
:
$global-background-color
;
.brand-heading
{
font-size
:
600%
;
margin-left
:
-10%
;
&
.fade-in
{
@include
fade-in
;
@include
animation-delay
(
2s
);
}
.icon-conversejs
{
font-size
:
88%
;
}
}
div
.content
{
height
:
100vh
;
width
:
100vw
;
position
:
fixed
;
background-color
:
$global-background-color
;
.inner-content
{
text-align
:
center
;
padding
:
7%
;
@include
calc
(
padding-left
,
'5% +
#{
$controlbox-width
}
'
);
p
.no-chats
{
padding-right
:
10%
;
font-size
:
120%
;
}
}
}
}
#conversejs
.fullscreen
{
.converse-chatboxes
{
width
:
100vw
;
right
:
15px
;
// Hack due to padding added by bootstrap
}
}
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