Skip to content
This repository has been archived by the owner on Oct 9, 2018. It is now read-only.

Commit

Permalink
updates for issue #651
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Neil committed Feb 8, 2013
1 parent 31e2bfe commit 273b9e4
Show file tree
Hide file tree
Showing 11 changed files with 350 additions and 17 deletions.
2 changes: 1 addition & 1 deletion JakeVersion
View file
Expand Up @@ -2,5 +2,5 @@
"major": 0,
"minor": 9,
"revision": 6,
"build": 92
"build": 93
}
2 changes: 1 addition & 1 deletion pkg/bbui-min.css
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pkg/bbui-min.js
View file

Large diffs are not rendered by default.

105 changes: 104 additions & 1 deletion pkg/bbui.css
View file
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

/* VERSION: 0.9.6.92*/
/* VERSION: 0.9.6.93*/

body, html {
padding:0;
Expand Down Expand Up @@ -2140,6 +2140,109 @@ body, html {
font-size:28pt;
}

/* =================================================
BB10 Title Bar for 720x720
=================================================*/

.bb-bb10-title-bar-1280x768-720x720 {
position:absolute;
top:0px;
left:0px;
right:0px;
border-bottom-width: 2px;
border-bottom-style: solid;
font-size: 39pt;
z-index:1000;
}

.bb-bb10-title-bar-portrait-720x720 {
height:95px;
}

.bb-bb10-title-bar-landscape-720x720 {
height:95px;
}

.bb-bb10-title-bar-caption-720x720 {
text-align:center;
height:100%;
padding:0px;
margin:0px;
overflow: hidden;
white-space:nowrap;
text-overflow: ellipsis;
text-overflow: -blackberry-fade;
}

.bb-bb10-title-bar-caption-portrait-720x720 {
line-height:95px;
}

.bb-bb10-title-bar-caption-landscape-720x720 {
line-height:95px;
}

.bb-bb10-title-bar-caption-details-img-720x720 {
margin-left: 105px;
}

.bb-bb10-title-bar-caption-left-720x720 {
text-align:left;
line-height:95px;
height:100%;
padding:0px;
padding-left: 10px;
margin:0px;
overflow: hidden;
white-space:nowrap;
text-overflow: ellipsis;
text-overflow: -blackberry-fade;
}
.bb-bb10-title-bar-accent-text-720x720 {
color:#606060;
text-align:left;
padding-top:2px;
padding-left: 10px;
margin-top:-13px;
font-size: 29pt;
overflow: hidden;
white-space:nowrap;
text-overflow: ellipsis;
text-overflow: -blackberry-fade;
}

.bb-bb10-title-bar-720x720 img
{
position:relative;
float:left;
margin-top: 0px;
height:95px;
width:95px;
}

.bb-bb10-titlebar-button-container-720x720
{
position: absolute;
top: 0px;
border-width:2px;
border-style: solid;
border-radius:10px;
padding: 4px;
margin: 6px;
}

.bb-bb10-titlebar-button-720x720 {
border-width:1px;
border-radius:5px;
line-height:40px;
height:55px;
padding-top:12px;
padding-left: 35px;
padding-right: 35px;
font-size:28pt;
}


/* =================================================
BB10 Title Bar for 1024x600
=================================================*/
Expand Down
14 changes: 11 additions & 3 deletions pkg/bbui.js
View file
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

/* VERSION: 0.9.6.92*/
/* VERSION: 0.9.6.93*/

bb = {
scroller: null,
Expand Down Expand Up @@ -3273,7 +3273,9 @@ bb.screen = {
return 65;
} else if (bb.device.is1280x768 || bb.device.is1280x720) {
return 111;
} else {
} else if (bb.device.is720x720) {
return 95;
}else {
return 111;
}
}
Expand Down Expand Up @@ -3615,6 +3617,8 @@ bb.titleBar = {
res = '1024x600';
} else if (bb.device.is1280x768 || bb.device.is1280x720) {
res = '1280x768-1280x720';
} else if (bb.device.is720x720) {
res = '720x720';
}

// Insert our title area
Expand Down Expand Up @@ -3736,7 +3740,9 @@ bb.titleBar = {
caption.style['line-height'] = '40px';
} else if (bb.device.is1280x768 || bb.device.is1280x720) {
caption.style['line-height'] = '70px';
} else {
} else if (bb.device.is720x720) {
caption.style['line-height'] = '55px';
}else {
caption.style['line-height'] = '70px';
}
accentText = document.createElement('div');
Expand Down Expand Up @@ -3863,6 +3869,8 @@ bb.titleBar = {
res = '1024x600';
} else if (bb.device.is1280x768 || bb.device.is1280x720) {
res = '1280x768-1280x720';
} else if (bb.device.is720x720) {
res = '720x720';
}

if (bb.options.coloredTitleBar) {
Expand Down
105 changes: 104 additions & 1 deletion samples/bbui.css
View file
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

/* VERSION: 0.9.6.92*/
/* VERSION: 0.9.6.93*/

body, html {
padding:0;
Expand Down Expand Up @@ -2140,6 +2140,109 @@ body, html {
font-size:28pt;
}

/* =================================================
BB10 Title Bar for 720x720
=================================================*/

.bb-bb10-title-bar-1280x768-720x720 {
position:absolute;
top:0px;
left:0px;
right:0px;
border-bottom-width: 2px;
border-bottom-style: solid;
font-size: 39pt;
z-index:1000;
}

.bb-bb10-title-bar-portrait-720x720 {
height:95px;
}

.bb-bb10-title-bar-landscape-720x720 {
height:95px;
}

.bb-bb10-title-bar-caption-720x720 {
text-align:center;
height:100%;
padding:0px;
margin:0px;
overflow: hidden;
white-space:nowrap;
text-overflow: ellipsis;
text-overflow: -blackberry-fade;
}

.bb-bb10-title-bar-caption-portrait-720x720 {
line-height:95px;
}

.bb-bb10-title-bar-caption-landscape-720x720 {
line-height:95px;
}

.bb-bb10-title-bar-caption-details-img-720x720 {
margin-left: 105px;
}

.bb-bb10-title-bar-caption-left-720x720 {
text-align:left;
line-height:95px;
height:100%;
padding:0px;
padding-left: 10px;
margin:0px;
overflow: hidden;
white-space:nowrap;
text-overflow: ellipsis;
text-overflow: -blackberry-fade;
}
.bb-bb10-title-bar-accent-text-720x720 {
color:#606060;
text-align:left;
padding-top:2px;
padding-left: 10px;
margin-top:-13px;
font-size: 29pt;
overflow: hidden;
white-space:nowrap;
text-overflow: ellipsis;
text-overflow: -blackberry-fade;
}

.bb-bb10-title-bar-720x720 img
{
position:relative;
float:left;
margin-top: 0px;
height:95px;
width:95px;
}

.bb-bb10-titlebar-button-container-720x720
{
position: absolute;
top: 0px;
border-width:2px;
border-style: solid;
border-radius:10px;
padding: 4px;
margin: 6px;
}

.bb-bb10-titlebar-button-720x720 {
border-width:1px;
border-radius:5px;
line-height:40px;
height:55px;
padding-top:12px;
padding-left: 35px;
padding-right: 35px;
font-size:28pt;
}


/* =================================================
BB10 Title Bar for 1024x600
=================================================*/
Expand Down
14 changes: 11 additions & 3 deletions samples/bbui.js
View file
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

/* VERSION: 0.9.6.92*/
/* VERSION: 0.9.6.93*/

bb = {
scroller: null,
Expand Down Expand Up @@ -3273,7 +3273,9 @@ bb.screen = {
return 65;
} else if (bb.device.is1280x768 || bb.device.is1280x720) {
return 111;
} else {
} else if (bb.device.is720x720) {
return 95;
}else {
return 111;
}
}
Expand Down Expand Up @@ -3615,6 +3617,8 @@ bb.titleBar = {
res = '1024x600';
} else if (bb.device.is1280x768 || bb.device.is1280x720) {
res = '1280x768-1280x720';
} else if (bb.device.is720x720) {
res = '720x720';
}

// Insert our title area
Expand Down Expand Up @@ -3736,7 +3740,9 @@ bb.titleBar = {
caption.style['line-height'] = '40px';
} else if (bb.device.is1280x768 || bb.device.is1280x720) {
caption.style['line-height'] = '70px';
} else {
} else if (bb.device.is720x720) {
caption.style['line-height'] = '55px';
}else {
caption.style['line-height'] = '70px';
}
accentText = document.createElement('div');
Expand Down Expand Up @@ -3863,6 +3869,8 @@ bb.titleBar = {
res = '1024x600';
} else if (bb.device.is1280x768 || bb.device.is1280x720) {
res = '1280x768-1280x720';
} else if (bb.device.is720x720) {
res = '720x720';
}

if (bb.options.coloredTitleBar) {
Expand Down
4 changes: 2 additions & 2 deletions samples/js/titlePillButtons.js
View file
Expand Up @@ -28,11 +28,11 @@ function titlePillButtons_UnInit() {
// Adjust the height of the scroller based on orientation
function titlePillButtons_HandleResize(element, init) {
var actionBarHeight = bb.screen.getActionBarHeight(),
headerHeight = bb.device.isPlayBook ? 64 : 106,
headerHeight = bb.device.isPlayBook ? 64 : 101,
scrollerHeight = 0,
scroller = (init == true) ? element.getElementById('myScroller') : document.getElementById('myScroller');
// Calculate the height of the scroller
scrollerHeight = window.innerHeight - headerHeight - actionBarHeight - headerHeight;
scrollerHeight = window.innerHeight - bb.screen.getTitleBarHeight() - actionBarHeight - headerHeight;
scroller.style.height = scrollerHeight + 'px';
if (!init) {
scroller.refresh();
Expand Down

0 comments on commit 273b9e4

Please sign in to comment.