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

Commit

Permalink
Revert "Merge pull request #8963 from pivanov/bug-845097"
Browse files Browse the repository at this point in the history
This reverts commit 010a8a6, reversing
changes made to dbc79d0.
  • Loading branch information
samjoch committed May 7, 2013
1 parent 7b6e268 commit ff271e1
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 47 deletions.
7 changes: 6 additions & 1 deletion apps/communications/contacts/style/app.css
Expand Up @@ -276,6 +276,11 @@ 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 @@ -318,7 +323,7 @@ form p + p {
z-index: 5;
width: 100%;
-moz-box-sizing: border-box;
padding: 1.4rem 1.5rem;
padding: 1.4rem 2rem;
background: #f4f4f4;
color: #333;
text-align: left;
Expand Down
11 changes: 5 additions & 6 deletions apps/communications/contacts/style/fixed_header.css
Expand Up @@ -2,19 +2,18 @@
.fixed-title-import {
position: absolute;
top: 5rem;
left: 1.5rem;
right: 2.5rem;
height: 1.8rem;
padding: 0.5rem 1.5rem;
left: 2rem;
right: 2.7rem;
height: 2.3rem;
padding: 0.5rem 0 0 1rem;
z-index: 6;
background-repeat: no-repeat;
background-color: #f4f4f4;
transform: translateY(-100%);
text-align: left;
color: #FF5F19;
font-size: 1.6rem;
line-height: 1.8rem;
border-bottom: 0.1rem solid #FF5F19;
border-bottom: 1px solid #FF5F19;
pointer-events: none;
}

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

/* Common search styles */
form.search {
position: absolute;
width: calc(100% - 0.8rem);
width: 100%;
-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 @@ -34,17 +22,14 @@ form.search[role="search"] input:focus {
pointer-events: auto;
}

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

form.search p {
padding: 0;
}

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

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

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

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

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

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

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

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

section[role="region"] > header:first-child + form[role="search"] {
Expand All @@ -182,6 +181,16 @@ 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 @@ -209,16 +218,17 @@ form[role="search"].full p {
form[role="search"] p input,
form[role="search"] p textarea {
height: 3rem;
border: 0.1rem solid #c1c1c1;
background: #fff url(input_areas/images/ui/shadow-search.png) repeat-x;
border: none;
background: #fff;
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 @@ -255,7 +265,7 @@ form[role="search"] p button[type="reset"] {
form[role="search"] button[type="submit"] {
float: right;
min-width: 6rem;
height: 3.8rem;
height: 3.7rem;
padding: 0 1rem;
border: none;
color: #333;
Expand Down
3 changes: 1 addition & 2 deletions 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 1.5rem;
padding: 0.5rem 1rem;
margin: 0;
font-size: 1.6rem;
line-height: 1.8rem;
Expand All @@ -40,7 +40,6 @@
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: 7 additions & 8 deletions shared/style_unstable/scrolling.css
Expand Up @@ -26,15 +26,16 @@ nav[data-type="scrollbar"] p {
}

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

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

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

nav[data-type="scrollbar"] li span:not([hidden]) {
display: inline-block;
}
Expand All @@ -67,6 +67,5 @@ 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 ff271e1

Please sign in to comment.