Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

CSS: fix line heights

Browse Source
This commit is contained in:
JC Brand 2017-02-16 14:42:50 +01:00
parent d8b2813feb
commit 29ddf0b4db
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -130,13 +130,13 @@ css/converse-muc-embedded.min.css:: stamp-bundler sass css/converse-muc-embedded
css/converse.css:: stamp-bundler sass
$(SASS) -I ./node_modules/bourbon/app/assets/stylesheets/ sass/converse.scss css/converse.css
css/converse.min.css:: stamp-npm
css/converse.min.css:: stamp-npm sass
$(CLEANCSS) css/converse.css > css/converse.min.css
css/theme.min.css:: stamp-npm
css/theme.min.css:: stamp-npm css/theme.css
$(CLEANCSS) css/theme.css > css/theme.min.css
css/mobile.min.css:: stamp-npm
css/mobile.min.css:: stamp-npm sass
$(CLEANCSS) css/mobile.css > css/mobile.min.css
.PHONY: watch

9
css/converse.css
View File

@ -2179,7 +2179,7 @@
overflow-y: hidden;
padding: 0.3em 1em;
text-shadow: 0 1px 0 #FAFAFA;
line-height: 14px;
line-height: 16px;
width: 100%; }
#conversejs #converse-roster .roster-contacts dd .open-chat {
max-width: 90%; }
@ -2196,12 +2196,14 @@
#conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .open-chat .req-contact-name {
width: 100%; }
#conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .req-contact-name {
line-height: 16px;
width: 69%;
padding: 0; }
#conversejs #converse-roster .roster-contacts dd.current-xmpp-contact span {
font-size: 16px;
float: left;
color: #2A9D8F; }
color: #2A9D8F;
padding-right: 0.5em; }
#conversejs #converse-roster .roster-contacts dd.odd {
background-color: #DCEAC5;
/* Make this difference */ }
@ -2221,7 +2223,8 @@
display: none;
color: #818479; }
#conversejs #converse-roster span.pending-contact-name {
width: 80%; }
line-height: 16px;
width: 100%; }
#converse-embedded-chat .new-chatroom-nick,
#conversejs .new-chatroom-nick {

3
non_amd.html
View File

@ -86,7 +86,8 @@
prebind: false,
show_controlbox_by_default: true,
debug: true,
roster_groups: true
roster_groups: true,
keepalive: true
});
});
</script>

7
sass/_roster.scss
View File

@ -103,7 +103,7 @@
overflow-y: hidden;
padding: 0.3em 1em;
text-shadow: 0 1px 0 $text-shadow-color;
line-height: $font-size;
line-height: $line-height;
width: 100%;
.open-chat {
max-width: 90%;
@ -127,6 +127,7 @@
}
}
.req-contact-name {
line-height: $line-height;
width: 69%;
padding: 0;
}
@ -135,6 +136,7 @@
font-size: 16px;
float: left;
color: $link-color;
padding-right: 0.5em;
}
&.odd {
background-color: #DCEAC5;
@ -165,7 +167,8 @@
}
span {
&.pending-contact-name {
width: 80%;
line-height: $line-height;
width: 100%;
}
}
}

2
sass/_variables.scss
View File

@ -54,6 +54,8 @@ $font-size: 14px !default;
$font-size-large: 16px !default;
$legend-font-size: 16px !default;
$line-height: 16px !default;
$chat-width: 200px !default;
$chat-height: 450px !default;
$chat-gutter: 0.5em !default;