mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-07 06:57:02 +08:00
Fixes #7
This commit is contained in:
16
dist/framework-with-theme.css
vendored
16
dist/framework-with-theme.css
vendored
@ -78,6 +78,12 @@ main > * {
|
||||
overflow: auto;
|
||||
height: 0; }
|
||||
|
||||
.ptr-content .pulling {
|
||||
display: none; }
|
||||
|
||||
.ptr-content .refreshing {
|
||||
display: none; }
|
||||
|
||||
.button {
|
||||
position: relative;
|
||||
display: block;
|
||||
@ -100,7 +106,8 @@ main > * {
|
||||
-webkit-box-orient: horizontal;
|
||||
box-orient: horizontal;
|
||||
box-sizing: border-box;
|
||||
height: 50px;
|
||||
height: 44px;
|
||||
padding: 8px;
|
||||
/*
|
||||
.title + .button:last-child,
|
||||
.button + .button:last-child,
|
||||
@ -118,7 +125,7 @@ main > * {
|
||||
display: block;
|
||||
width: 100%;
|
||||
*/
|
||||
line-height: 30px;
|
||||
line-height: 26px;
|
||||
margin: 0;
|
||||
text-align: center;
|
||||
white-space: nowrap;
|
||||
@ -142,10 +149,10 @@ main > * {
|
||||
/* 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 */
|
||||
.bar-header ~ main, .has-header {
|
||||
top: 50px; }
|
||||
top: 44px; }
|
||||
|
||||
.has-footer {
|
||||
bottom: 50px; }
|
||||
bottom: 44px; }
|
||||
|
||||
/* Bar docked to bottom used for primary app navigation */
|
||||
.tabs {
|
||||
@ -319,7 +326,6 @@ a.list-item {
|
||||
background-color: white;
|
||||
border-style: solid;
|
||||
border-width: 0;
|
||||
padding: 10px;
|
||||
/*
|
||||
Disabled temporarily because it's annoying for testing.
|
||||
@media screen and (orientation : landscape) {
|
||||
|
||||
@ -15,6 +15,8 @@
|
||||
|
||||
height: $barHeight;
|
||||
|
||||
padding: $barPaddingPortrait;
|
||||
|
||||
// Title inside of a bar is centered
|
||||
.title {
|
||||
/*
|
||||
|
||||
@ -15,11 +15,13 @@ $baseLineHeightComputed: floor($baseFontSize * $baseLineHeight); // ~20px
|
||||
$contentPadding: 10px;
|
||||
|
||||
// Bar stuff
|
||||
$barHeight: 50px !default;
|
||||
$barLineHeight: 50px !default;
|
||||
$barHeight: 44px !default;
|
||||
$barLineHeight: 44px !default;
|
||||
$barTitleFontSize: $fontSizeLarge;
|
||||
$barTitleLineHeightComputed: 30px;//$barHeight - 2;
|
||||
$barTitleLineHeightComputed: 26px;//$barHeight - 2;
|
||||
$barPaddingVertical: (($barHeight - $baseLineHeightComputed) / 2);
|
||||
$barPaddingPortrait: 8px;
|
||||
$barPaddingLandscape : 5px;
|
||||
|
||||
|
||||
|
||||
|
||||
@ -3,8 +3,6 @@
|
||||
border-style: solid;
|
||||
border-width: 0;
|
||||
|
||||
padding: $barPaddingPortrait;
|
||||
|
||||
&.bar-header {
|
||||
border-bottom-width: 1px;
|
||||
}
|
||||
|
||||
@ -45,9 +45,6 @@ $buttonDarkBorder: #111;
|
||||
|
||||
//
|
||||
// Bars
|
||||
$barPaddingPortrait: 10px;
|
||||
$barPaddingLandscape : 5px;
|
||||
|
||||
$barBackground: white;
|
||||
|
||||
// Bar variations
|
||||
@ -74,7 +71,8 @@ $barDangerBorderColor: #bc4435;
|
||||
|
||||
$barDarkBackground: #444;
|
||||
$barDarkBorderColor: #111;
|
||||
//
|
||||
|
||||
|
||||
// Lists
|
||||
$listDividerBackground: #f5f5f5;
|
||||
$listDividerColor: #222;
|
||||
|
||||
Reference in New Issue
Block a user