Commit 7e8eedaea50ff7ace5462c7d0bfc8e19d8fab4fe
1 parent
74b5e4bc
Exists in
master
and in
39 other branches
Adding more specific paths for converse css
Showing
2 changed files
with
15 additions
and
15 deletions
Show diff stats
src/colab/deprecated/templates/base.html
| @@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
| 50 | {% browserid_login text='Login' next=request.path %} | 50 | {% browserid_login text='Login' next=request.path %} |
| 51 | </div> | 51 | </div> |
| 52 | {% else %} | 52 | {% else %} |
| 53 | - <div class="col-sm-1 text-right"> | 53 | + <div class="col-sm-10 text-right"> |
| 54 | {% trans "authenticated as" %} <b>{{ user.email }}</b> | 54 | {% trans "authenticated as" %} <b>{{ user.email }}</b> |
| 55 | </div> | 55 | </div> |
| 56 | <div class="col-sm-1 text-center"> | 56 | <div class="col-sm-1 text-center"> |
src/colab/static/css/screen.css
| @@ -214,61 +214,61 @@ ul.indent-dois { | @@ -214,61 +214,61 @@ ul.indent-dois { | ||
| 214 | margin-top: 10px; | 214 | margin-top: 10px; |
| 215 | } | 215 | } |
| 216 | 216 | ||
| 217 | -a.configure-chatroom-button, a.close-chatbox-button { | 217 | +#chatpanel a.configure-chatroom-button, #chatpanel a.close-chatbox-button { |
| 218 | background-color: #F6F6F6; | 218 | background-color: #F6F6F6; |
| 219 | margin-right: 0.6em; | 219 | margin-right: 0.6em; |
| 220 | width: 22px; | 220 | width: 22px; |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | -.chat-head #controlbox-tabs li { | 223 | +#chatpanel .chat-head #controlbox-tabs li { |
| 224 | width:32%; | 224 | width:32%; |
| 225 | } | 225 | } |
| 226 | 226 | ||
| 227 | -.oc-chat-head { | 227 | +#chatpanel .oc-chat-head { |
| 228 | height: 37px; | 228 | height: 37px; |
| 229 | } | 229 | } |
| 230 | 230 | ||
| 231 | -.chatbox dl.dropdown { | 231 | +#chatpanel .chatbox dl.dropdown { |
| 232 | margin-top: 0; | 232 | margin-top: 0; |
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | -#converse-roster { | 235 | +#chatpanel #converse-roster { |
| 236 | height: 207px; | 236 | height: 207px; |
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | #chatpanel #toggle-controlbox { | 239 | #chatpanel #toggle-controlbox { |
| 240 | - font-size: 100%; | ||
| 241 | - padding: 0 4px 23px; | 240 | + font-size: 100% !important; |
| 241 | + padding: 0 4px 23px !important; | ||
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | #chatpanel { | 244 | #chatpanel { |
| 245 | - height: 342px; | 245 | + height: 342px !important; |
| 246 | } | 246 | } |
| 247 | 247 | ||
| 248 | -div#controlbox-panes { | 248 | +#chatpanel div#controlbox-panes { |
| 249 | width: auto; | 249 | width: auto; |
| 250 | } | 250 | } |
| 251 | 251 | ||
| 252 | -.chat-head-chatbox, .chat-head-chatroom { | 252 | +#chatpanel .chat-head-chatbox, #chatpanel .chat-head-chatroom { |
| 253 | height: 40.5px; | 253 | height: 40.5px; |
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | -form.sendXMPPMessage { | 256 | +#chatpanel form.sendXMPPMessage { |
| 257 | height: 76px; | 257 | height: 76px; |
| 258 | border: none; | 258 | border: none; |
| 259 | } | 259 | } |
| 260 | 260 | ||
| 261 | -form.sendXMPPMessage textarea { | 261 | +#chatpanel form.sendXMPPMessage textarea { |
| 262 | width: 189px; | 262 | width: 189px; |
| 263 | max-width: 285px; | 263 | max-width: 285px; |
| 264 | max-height: 66px; | 264 | max-height: 66px; |
| 265 | } | 265 | } |
| 266 | 266 | ||
| 267 | -.chatbox form.sendXMPPMessage textarea { | 267 | +#chatpanel .chatbox form.sendXMPPMessage textarea { |
| 268 | max-width: 189px; | 268 | max-width: 189px; |
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | -.chat-content, .chatroom .participants{ | 271 | +#chatpanel .chat-content, #chatpanel .chatroom .participants{ |
| 272 | border: none; | 272 | border: none; |
| 273 | } | 273 | } |
| 274 | /* End of Converse JS*/ | 274 | /* End of Converse JS*/ |