From 03cf27af6729b72ecc96c84205bd1f6fcfde544a Mon Sep 17 00:00:00 2001 From: JC Brand Date: Mon, 11 Aug 2014 19:55:58 +0200 Subject: [PATCH] Update mockup with group/user filter toggle --- css/converse.css | 14 ++- index.html | 10 +- less/converse.less | 15 ++- mockup/controlbox.html | 4 + mockup/index.html | 219 ++++++++++++++++++++++++++--------------- 5 files changed, 167 insertions(+), 95 deletions(-) diff --git a/css/converse.css b/css/converse.css index 5fcae282f..cd0ada140 100644 --- a/css/converse.css +++ b/css/converse.css @@ -754,7 +754,7 @@ dl.add-converse-contact { clear: right; height: 22px; width: 12px; - padding: 0px 5px 0 0; + padding: 0px 15px 0 0; color: #4f4f4f; } #conversejs ul#found-users { @@ -891,10 +891,18 @@ dl.add-converse-contact { overflow-x: hidden; } #converse-roster .roster-filter { - margin: 0 0.5em 5px 0.5em; - width: 185px; + padding: 0; + margin: 0 0 5px 0.5em; + width: 111px; + height: 20px; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg== ) no-repeat right -20px center; border: 1px solid #999; + display: inline-block; +} +#converse-roster .filter-type { + height: 20px; + padding: 0; + margin: 0 0 0 -5px; } /* (jQ addClass:) if input has value: */ #converse-roster .roster-filter.x { diff --git a/index.html b/index.html index 84f41a45e..9aa0f4326 100644 --- a/index.html +++ b/index.html @@ -11,14 +11,8 @@ - - - - - - + + diff --git a/less/converse.less b/less/converse.less index f59737b11..3c5197e33 100644 --- a/less/converse.less +++ b/less/converse.less @@ -831,7 +831,7 @@ dl.add-converse-contact { clear: right; height: 22px; width: 12px; - padding: 0px 5px 0 0; + padding: 0px 15px 0 0; color: rgb(79, 79, 79); } @@ -990,10 +990,19 @@ dl.add-converse-contact { } #converse-roster .roster-filter { - margin: 0 0.5em 5px 0.5em; - width: 185px; + padding: 0; + margin: 0 0 5px 0.5em; + width: 111px; + height: 20px; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg== ) no-repeat right -20px center; border: 1px solid #999; + display: inline-block; +} + +#converse-roster .filter-type { + height: 20px; + padding: 0; + margin: 0 0 0 -5px; } /* (jQ addClass:) if input has value: */ diff --git a/mockup/controlbox.html b/mockup/controlbox.html index e62d412a6..ed9faf656 100644 --- a/mockup/controlbox.html +++ b/mockup/controlbox.html @@ -116,6 +116,10 @@
+
Colleagues diff --git a/mockup/index.html b/mockup/index.html index 493db2dd5..f21b99cb7 100644 --- a/mockup/index.html +++ b/mockup/index.html @@ -114,89 +114,146 @@
-
-
My contacts
-
- - - John Smit - -
-
- - - Francois Pienaar - -
-
- - - Gary Teichmann - -
-
- - - Corné Krige - -
+
+ + +
+
+ Colleagues +
+
+ + + Victor Matfield + + +
+
+ + + William Winterbottom + + +
+
+ + + Gary Teichmann + + +
-
Contact requests
-
- Bob Skinstad - - - - -
-
- André Vos - - - - -
+
+ Family +
+
+ + + Allan Donald + + +
+
+ + + Corné Krige + + +
-
Pending contacts
-
Rassie Erasmus - -
-
Victor Matfield - -
-
-
-
+
+