Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #8963 from pivanov/bug-845097
Browse files Browse the repository at this point in the history
Bug 845097 - Contact List and Search bar update r=samjoch
  • Loading branch information
samjoch committed Apr 18, 2013
2 parents dbc79d0 + 817939f commit 010a8a6
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 43 deletions.
7 changes: 1 addition & 6 deletions apps/communications/contacts/style/app.css
Expand Up @@ -276,11 +276,6 @@ li a[role="button"].activity > b{
bottom: 0;
}

/* BB Lists extending */
[data-type="list"] header {
margin-left: -1rem;
}

/* JS helper */
[data-type="list"] li p,
[data-type="list"] li aside {
Expand Down Expand Up @@ -323,7 +318,7 @@ form p + p {
z-index: 5;
width: 100%;
-moz-box-sizing: border-box;
padding: 1.4rem 2rem;
padding: 1.4rem 1.5rem;
background: #f4f4f4;
color: #333;
text-align: left;
Expand Down
11 changes: 6 additions & 5 deletions apps/communications/contacts/style/fixed_header.css
Expand Up @@ -2,18 +2,19 @@
.fixed-title-import {
position: absolute;
top: 5rem;
left: 2rem;
right: 2.7rem;
height: 2.3rem;
padding: 0.5rem 0 0 1rem;
left: 1.5rem;
right: 2.5rem;
height: 1.8rem;
padding: 0.5rem 1.5rem;
z-index: 6;
background-repeat: no-repeat;
background-color: #f4f4f4;
transform: translateY(-100%);
text-align: left;
color: #FF5F19;
font-size: 1.6rem;
border-bottom: 1px solid #FF5F19;
line-height: 1.8rem;
border-bottom: 0.1rem solid #FF5F19;
pointer-events: none;
}

Expand Down
30 changes: 23 additions & 7 deletions apps/communications/contacts/style/search.css
@@ -1,19 +1,31 @@
/* Search */
#groups-list {
padding-top: 2.5rem;
padding: 2.5rem 0 0;
width: calc(100% - 0.3rem - 1.5rem);
}

/* Common search styles */
form.search {
position: absolute;
width: 100%;
width: calc(100% - 0.8rem);
-moz-box-sizing: border-box;
top: 0;
left: 0;
text-align: left;
z-index: 1;
}

.insearchmode form.search {
width: 100%;
}

form.search[role="search"] input,
form.search[role="search"] input:focus {
font-size: 1.7rem;
padding-left: 1.3rem;
background: #fff;
}

#search-view:not(.insearchmode) form.search * {
pointer-events: none;
}
Expand All @@ -22,14 +34,17 @@ form.search {
pointer-events: auto;
}

#search-view.insearchmode form.search button {
right: 1.3rem;
}

form.search p {
padding: 0;
}

form.search label {
display: block;
padding: 0.5rem 3.5rem 0.5rem 3rem;
background: none;
padding: 0.4rem 2.5rem 0.4rem 1.5rem;
}

form.search input {
Expand Down Expand Up @@ -65,7 +80,7 @@ form.search button[type="submit"] {
}

#search-view form.search label {
padding: 0.3rem 1.2rem;
padding: 0.4rem 1.5rem;
}

#no-result {
Expand Down Expand Up @@ -96,10 +111,10 @@ form.search button[type="submit"] {

#search-view > section {
position: absolute;
top: 3.7rem;
top: 3.9rem;
left: 0;
right: 0;
height: calc(100% - 3.7rem);
height: calc(100% - 3.9rem);
background: #f3f3f3;
}

Expand All @@ -111,6 +126,7 @@ form.search button[type="submit"] {

#search-list {
height: 100%;
padding: 0;
}

#search-list > li[data-uuid] > a *,
Expand Down
24 changes: 7 additions & 17 deletions shared/style/input_areas.css
Expand Up @@ -171,8 +171,9 @@ fieldset section p:last-child {
/* Tidy (search/submit) */
form[role="search"] {
position: relative;
height: 3.7rem;
background: #fff;
height: 3.9rem;
background-image: linear-gradient(to bottom, #ebebeb, #fafafa);
border-bottom: 0.1rem solid #bdbdbd;
}

section[role="region"] > header:first-child + form[role="search"] {
Expand All @@ -181,16 +182,6 @@ section[role="region"] > header:first-child + form[role="search"] {
border-bottom: 0.1rem solid #c8c8c8;
}

form[role="search"]:after {
content: "";
position: absolute;
top: 100%;
right: 0;
left: 0;
height: 0.3rem;
background: url(input_areas/images/ui/shadow-search.png) repeat-x left top;
}

form[role="search"].bottom:after {
content: "";
position: absolute;
Expand Down Expand Up @@ -218,17 +209,16 @@ form[role="search"].full p {
form[role="search"] p input,
form[role="search"] p textarea {
height: 3rem;
border: none;
background: #fff;
border: 0.1rem solid #c1c1c1;
background: #fff url(input_areas/images/ui/shadow-search.png) repeat-x;
font-size: 1.8rem;
padding: 0;
}

form[role="search"] p input:focus {
padding: 0 2rem 0 0;
}

form[role="search"] p input:invalid,
form[role="search"] p input:invalid,
form[role="search"] p textarea:invalid {
border: none;
}
Expand Down Expand Up @@ -265,7 +255,7 @@ form[role="search"] p button[type="reset"] {
form[role="search"] button[type="submit"] {
float: right;
min-width: 6rem;
height: 3.7rem;
height: 3.8rem;
padding: 0 1rem;
border: none;
color: #333;
Expand Down
3 changes: 2 additions & 1 deletion shared/style_unstable/lists.css
Expand Up @@ -22,7 +22,7 @@
/* Title divisors */
[data-type="list"] header {
border-bottom: 0.1rem solid #ff4E00;
padding: 0.5rem 1rem;
padding: 0.5rem 1.5rem;
margin: 0;
font-size: 1.6rem;
line-height: 1.8rem;
Expand All @@ -40,6 +40,7 @@
border-bottom: solid 0.1rem #dbd9d9;
color: #000;
margin: 0;
padding-left: 1.5rem;
display: block;
position: relative;
z-index: 1;
Expand Down
15 changes: 8 additions & 7 deletions shared/style_unstable/scrolling.css
Expand Up @@ -26,16 +26,15 @@ nav[data-type="scrollbar"] p {
}

nav[data-type="scrollbar"] ol {
padding: 0.3rem 0;
padding: 0.3rem 0 0;
margin: 0;
border-radius: 4rem;
opacity: 0.6;
list-style: none;
}

nav[data-type="scrollbar"] li {
font-size: 1rem;
line-height: 1.4em;
line-height: 1.35rem;
text-align: center;
text-transform: uppercase;
width: 4.5rem;
Expand All @@ -45,19 +44,20 @@ nav[data-type="scrollbar"] li a {
display: block;
color: #333;
width: 100%;
text-indent: 1.5rem;
padding-left: 1.1rem;
text-decoration: none;
}

/* Top action icons */
nav[data-type="scrollbar"] li .pack-icon-search,
nav[data-type="scrollbar"] li .pack-icon-favorites {
width: 1.2rem;
height: 1.2rem;
width: 1.6rem;
height: 1.6rem;
font-size: 0;
vertical-align: middle;
background: transparent no-repeat center center / 100% auto;
background: transparent no-repeat 50% 50%;
}

nav[data-type="scrollbar"] li span:not([hidden]) {
display: inline-block;
}
Expand All @@ -67,5 +67,6 @@ nav[data-type="scrollbar"] li .pack-icon-search {
}

nav[data-type="scrollbar"] li .pack-icon-favorites {
margin-bottom: 0.6rem;
background-image: url(scrolling/images/icons/favorites.png);
}
Binary file modified shared/style_unstable/scrolling/images/icons/favorites.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/style_unstable/scrolling/images/icons/search.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 010a8a6

Please sign in to comment.