Browse Source

Merge branch 'master' into video

Conflicts:
	public/css/otalk.css
	public/x-manifest.cache
video
Lance Stout 8 years ago
parent
commit
71e342a0a2
9 changed files with 43 additions and 16 deletions
  1. +1
    -0
      .jshintignore
  2. +6
    -0
      clientapp/models/contact.js
  3. +1
    -1
      clientapp/templates/main.html
  4. +4
    -0
      public/css/app/aux.styl
  5. +0
    -5
      public/css/app/chat.styl
  6. +4
    -1
      public/css/app/forms.styl
  7. +7
    -2
      public/css/app/roster.styl
  8. +4
    -0
      public/css/app/settings.styl
  9. +16
    -7
      public/css/otalk.css

+ 1
- 0
.jshintignore View File

@ -4,3 +4,4 @@ clientapp/helpers/htmlify.js
clientapp/libraries
clientapp/templates.js
clientapp/.build
clientapp/helpers/callbar.js

+ 6
- 0
clientapp/models/contact.js View File

@ -148,6 +148,12 @@ module.exports = HumanModel.define({
return res.supportsJingleMedia;
});
}
},
callable: {
deps: ['jingleResources'],
fn: function () {
return !!this.jingleResources.length;
}
}
},
collections: {


+ 1
- 1
clientapp/templates/main.html View File

@ -11,7 +11,7 @@
</header>
<section class="box connect">
<h2>Connecting...</h2>
<a href="/logout">Cancel</a>
<a class="button" href="/logout">Cancel</a>
</section>
</body>
</html>

+ 4
- 0
public/css/app/aux.styl View File

@ -24,6 +24,10 @@
h2
padding: 0
.button
float: none
margin-top: 20px
.head, .content
padding: 0 20px


+ 0
- 5
public/css/app/chat.styl View File

@ -3,7 +3,6 @@
.page.chat
padding-top: 0px
height: 100%
borderbox()
.conversation
@ -12,7 +11,6 @@
left: 0px
right: 0px
padding: 0px
height: 100%
width: 100%
borderbox()
@ -24,9 +22,6 @@
width: 100%
display: block
.messages
padding-top: 630px
header
padding: 5px
border-bottom: 2px solid $grayOutline


+ 4
- 1
public/css/app/forms.styl View File

@ -59,4 +59,7 @@ button, a.button
cursor: pointer
&:hover
background: darken($activeBlue, 30%)
background: darken($activeBlue, 30%)
.enableAlerts
margin-right: 5px

+ 7
- 2
public/css/app/roster.styl View File

@ -148,7 +148,7 @@
margin-top: -15px
position: absolute
left: 10px
top: 50%
top: 20px
avatar()
noselect()
@ -178,7 +178,7 @@
padding-top: 8px
roundall(30px)
position: absolute
top: 7px
top: 5px
left: 10px
font-size: 10px
font-weight: bold
@ -191,6 +191,11 @@
font-size: 10px
color: darken($textSecondary, 50%)
#bookmarks
.name
padding: 10px 15px 10px 40px
@keyframes pulsate
0%
opacity: 1.0


+ 4
- 0
public/css/app/settings.styl View File

@ -12,6 +12,7 @@
padding: 5px
background: $grayBackground
roundall(3px)
font-size: $fontSmall
.uploadRegion
padding: 15px
@ -26,3 +27,6 @@
input
width: 100%
img
margin: 10px 0

+ 16
- 7
public/css/otalk.css View File

@ -503,7 +503,7 @@ h3 {
margin-top: -15px;
position: absolute;
left: 10px;
top: 50%;
top: 20px;
width: 30px;
height: 30px;
-moz-border-radius: 50px;
@ -554,7 +554,7 @@ h3 {
-border-radius: 30px;
border-radius: 30px;
position: absolute;
top: 7px;
top: 5px;
left: 10px;
font-size: 10px;
font-weight: bold;
@ -568,6 +568,9 @@ h3 {
font-size: 10px;
color: #5c5c5c;
}
#bookmarks .name {
padding: 10px 15px 10px 40px;
}
@-moz-keyframes pulsate {
0% {
opacity: 1;
@ -635,7 +638,6 @@ h3 {
}
.page.chat {
padding-top: 0px;
height: 100%;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
@ -646,7 +648,6 @@ h3 {
left: 0px;
right: 0px;
padding: 0px;
height: 100%;
width: 100%;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@ -659,9 +660,6 @@ h3 {
width: 100%;
display: block;
}
.conversation.activeCall .messages {
padding-top: 630px;
}
.conversation header {
padding: 5px;
border-bottom: 2px solid #e4e4e4;
@ -877,6 +875,7 @@ h3 {
-o-border-radius: 3px;
-border-radius: 3px;
border-radius: 3px;
font-size: 12px;
}
.uploadRegion {
padding: 15px;
@ -897,6 +896,9 @@ h3 {
.uploadRegion input {
width: 100%;
}
.uploadRegion img {
margin: 10px 0;
}
.aux {
background: #f7f7f7;
}
@ -928,6 +930,10 @@ h3 {
.box.connect h2 {
padding: 0;
}
.box.connect .button {
float: none;
margin-top: 20px;
}
.box .head,
.box .content {
padding: 0 20px;
@ -1038,6 +1044,9 @@ button:hover,
a.button:hover {
background: #007aa7;
}
.enableAlerts {
margin-right: 5px;
}
body {
position: relative !important;
-webkit-transition: top 1s;


Loading…
Cancel
Save