diff --git a/converse.css b/converse.css index 4a1143741..98fbe4000 100644 --- a/converse.css +++ b/converse.css @@ -351,14 +351,6 @@ span.spinner.hor_centered { position: absolute; } -#conversejs { - z-index: 99; /*--Keeps the panel on top of all other elements--*/ - position: fixed; - bottom: 0; right: 0; - height: 332px; - width: auto; -} - #toggle-controlbox { position: fixed; font-size: 70%; @@ -1263,3 +1255,45 @@ form.add-xmpp-contact input { color: rgb(79, 79, 79); } + +#conversejs { + bottom:0; + direction:ltr; + height:25px; + left: auto; + position:fixed; + right:0; + z-index:300 +} + + +/* XXX ------ XXX */ + +#conversejs { + bottom: 0; + direction: ltr; + height: 25px; + left: 0; + position: fixed; + right: 0; + z-index: 300; +} + +.converse-dock { + margin: 0 15px 0 0; +} + +.converse-dock .nub-container { + float: right; +} + +.nub { + height: 25px; + width: 200px; +} + +.nub-flyout { + position: absolute; + display: block; + bottom: 0; +} diff --git a/mockup.html b/mockup.html index 0f54535b5..de2e588ec 100644 --- a/mockup.html +++ b/mockup.html @@ -1,368 +1,45 @@ - + - - - - - + Converse + + + + - Converse.js Mockup - - -
-
-

Converse.js

-

Static Mockup

-
-
-
-
-
- - - -
-
-
-
- - - -
-
-
-
+
+
+
+
+
-
-
- - - -
-
-
-
- - - -
-
- -
+
+
+ + + + - -
  • - - - -
    -
    My contacts
    -
    - - - John Smit - -
    -
    - - - Francois Pienaar - -
    -
    - - - Gary Teichmann - -
    -
    - - - Corné Krige - -
    - -
    Contact requests
    -
    -
    Bob Skinstad
    - - -
    -
    -
    André Vos
    - - -
    - -
    Pending contacts
    -
    Rassie Erasmus - -
    -
    Victor Matfield - -
    -
    -
    - -
    -
    - -
    -
    - - - - - -
    JC Brand
    -     -

    10000ft in the air

    -

    -
    -
    -
    /help:This is an info message
    -
    This is an error message
    -
    - 09:35 me:  - - Hello world - - -
    -
    - 19:25 Benedict-John:  - Dagsê -
    -
    - 19:39 me:  - This is a relatively long message to check that wrapping works as expected. -
    -
    - 19:42 me:  - Supercalifragilisticexpialidociousstillnotlongenough -
    -
    JC Brand is busy
    -
    - 19:43 me:  - Another message to check that scrolling works. -
    -
    -
    - - -
    -
    - -
    -
    - - - - -
    Chatroom
    -

    -

    -
    -
    -
    -
    - -
    - 18:50 luke:  - leia: hi :) -
    -
    - 19:40 leia:  - - I'll be gone for a while, will be back in about an hour -
    -
    - 19:40 Obi-wan Kenobi, Jedi Master:  - - I'll be gone for a while, will be back in about an hour -
    -
    - 19:42 me:  - Supercalifragilisticexpialidociousstillnotlongenough -
    -
    - 19:43 Obi-wan Kenobi, Jedi Master:  - Another message to check that scrolling works. +
    +
    -
    -
      -
    • -
        -
        • -
        • -
        • -
        • -
        • -
        • -
        • -
        • -
        • -
        • -
        • -
        • -
        • -
      -
      • -
    - -
    -
    -
    -
      -
    • Obi-wan Kenobi, Jedi Master
      • -
    • jabber the hut
      • -
    • leia
      • -
    • luke
      • -
    - -
    -
    - - - -
    Restricted Chatroom
    -

    -

    -
    -
    -
    -
    - This chatroom requires a password - -
    -
    -
    -
    - -
    -