javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 15:07:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #7

Browse Source
This commit is contained in:
Adam Bradley
2013-08-26 13:16:22 -05:00
parent 1d32058739
commit 3362303b7d
5 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dist/framework-with-theme.css vendored
View File

@ -78,6 +78,12 @@ main > * {
overflow: auto; overflow: auto;
height: 0; } height: 0; }
.ptr-content .pulling {
display: none; }
.ptr-content .refreshing {
display: none; }
.button { .button {
position: relative; position: relative;
display: block; display: block;
@ -100,7 +106,8 @@ main > * {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
box-orient: horizontal; box-orient: horizontal;
box-sizing: border-box; box-sizing: border-box;
height: 50px; height: 44px;
padding: 8px;
/* /*
.title + .button:last-child, .title + .button:last-child,
.button + .button:last-child, .button + .button:last-child,
@ -118,7 +125,7 @@ main > * {
display: block; display: block;
width: 100%; width: 100%;
*/ */
line-height: 30px; line-height: 26px;
margin: 0; margin: 0;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
@ -142,10 +149,10 @@ main > * {
/* Pad top/bottom of content so it doesn't hide behind .bar-title and .bar-tab. /* Pad top/bottom of content so it doesn't hide behind .bar-title and .bar-tab.
Note: For these to work, content must come after both bars in the markup */ Note: For these to work, content must come after both bars in the markup */
.bar-header ~ main, .has-header { .bar-header ~ main, .has-header {
top: 50px; } top: 44px; }
.has-footer { .has-footer {
bottom: 50px; } bottom: 44px; }
/* Bar docked to bottom used for primary app navigation */ /* Bar docked to bottom used for primary app navigation */
.tabs { .tabs {
@ -319,7 +326,6 @@ a.list-item {
background-color: white; background-color: white;
border-style: solid; border-style: solid;
border-width: 0; border-width: 0;
padding: 10px;
/* /*
Disabled temporarily because it's annoying for testing. Disabled temporarily because it's annoying for testing.
@media screen and (orientation : landscape) { @media screen and (orientation : landscape) {

2
scss/framework/structure/_bar.scss
View File

@ -15,6 +15,8 @@
height: $barHeight; height: $barHeight;
padding: $barPaddingPortrait;
// Title inside of a bar is centered // Title inside of a bar is centered
.title { .title {
/* /*

8
scss/framework/structure/_variables.scss
View File

@ -15,11 +15,13 @@ $baseLineHeightComputed: floor($baseFontSize * $baseLineHeight); // ~20px
$contentPadding: 10px; $contentPadding: 10px;
// Bar stuff // Bar stuff
$barHeight: 50px !default; $barHeight: 44px !default;
$barLineHeight: 50px !default; $barLineHeight: 44px !default;
$barTitleFontSize: $fontSizeLarge; $barTitleFontSize: $fontSizeLarge;
$barTitleLineHeightComputed: 30px;//$barHeight - 2; $barTitleLineHeightComputed: 26px;//$barHeight - 2;
$barPaddingVertical: (($barHeight - $baseLineHeightComputed) / 2); $barPaddingVertical: (($barHeight - $baseLineHeightComputed) / 2);
$barPaddingPortrait: 8px;
$barPaddingLandscape : 5px;

2
scss/framework/theme/default/_bar.scss
View File

@ -3,8 +3,6 @@
border-style: solid; border-style: solid;
border-width: 0; border-width: 0;
padding: $barPaddingPortrait;
&.bar-header { &.bar-header {
border-bottom-width: 1px; border-bottom-width: 1px;
} }

6
scss/framework/theme/default/_variables.scss
View File

@ -45,9 +45,6 @@ $buttonDarkBorder: #111;
// //
// Bars // Bars
$barPaddingPortrait: 10px;
$barPaddingLandscape : 5px;
$barBackground: white; $barBackground: white;
// Bar variations // Bar variations
@ -74,7 +71,8 @@ $barDangerBorderColor: #bc4435;
$barDarkBackground: #444; $barDarkBackground: #444;
$barDarkBorderColor: #111; $barDarkBorderColor: #111;
//
// Lists // Lists
$listDividerBackground: #f5f5f5; $listDividerBackground: #f5f5f5;
$listDividerColor: #222; $listDividerColor: #222;