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

Derpty do

Browse Source
This commit is contained in:
Max Lynch
2013-10-21 21:11:49 -05:00
parent ddb724dbd3
commit 7c97202ebd
5 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dist/css/ionic-ios7.css vendored
View File

@ -370,20 +370,19 @@ body, .ionic-body {
.content { .content {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%;
top: 0; top: 0;
bottom: 0; bottom: 0;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch; } -webkit-overflow-scrolling: touch; }
.has-header { .has-header {
margin-top: 44px; } top: 44px; }
.has-footer { .has-footer {
margin-bottom: 44px; } bottom: 44px; }
.has-tabs { .has-tabs {
margin-bottom: 84px; } bottom: 84px; }
.page, .full-section { .page, .full-section {
position: fixed; position: fixed;

7
dist/css/ionic-scoped.css vendored
View File

@ -1142,17 +1142,16 @@
.ionic .content { .ionic .content {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%;
top: 0; top: 0;
bottom: 0; bottom: 0;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch; } -webkit-overflow-scrolling: touch; }
.ionic .has-header { .ionic .has-header {
margin-top: 44px; } top: 44px; }
.ionic .has-footer { .ionic .has-footer {
margin-bottom: 44px; } bottom: 44px; }
.ionic .has-tabs { .ionic .has-tabs {
margin-bottom: 84px; } bottom: 84px; }
.ionic .page, .ionic .full-section { .ionic .page, .ionic .full-section {
position: fixed; position: fixed;
top: 0; top: 0;

7
dist/css/ionic.css vendored
View File

@ -1449,20 +1449,19 @@ body, .ionic-body {
.content { .content {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%;
top: 0; top: 0;
bottom: 0; bottom: 0;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch; } -webkit-overflow-scrolling: touch; }
.has-header { .has-header {
margin-top: 44px; } top: 44px; }
.has-footer { .has-footer {
margin-bottom: 44px; } bottom: 44px; }
.has-tabs { .has-tabs {
margin-bottom: 84px; } bottom: 84px; }
.page, .full-section { .page, .full-section {
position: fixed; position: fixed;

9
scss/ionic/_scaffolding.scss
View File

@ -74,7 +74,6 @@ body, .ionic-body {
.content { .content {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%;
top: 0; top: 0;
bottom: 0; bottom: 0;
overflow: auto; overflow: auto;
@ -84,18 +83,16 @@ body, .ionic-body {
// 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
.has-header { .has-header {
//top: $bar-height; top: $bar-height;
margin-top: $bar-height;
} }
.has-footer { .has-footer {
//bottom: $bar-height; bottom: $bar-height;
margin-bottom: $bar-height;
} }
// Specify that a content area will have tabs // Specify that a content area will have tabs
.has-tabs { .has-tabs {
margin-bottom: 84px; bottom: 84px;
} }
.page, .full-section { .page, .full-section {

2
starters/map/index.html
View File

@ -28,7 +28,7 @@
<div class="bar bar-header bar-dark"> <div class="bar bar-header bar-dark">
<h1 class="title">Map</h1> <h1 class="title">Map</h1>
</div> </div>
<content> <content has-header="true" has-footer="true">
<div id="map"></div> <div id="map"></div>
</content> </content>
<div class="bar bar-footer bar-dark"> <div class="bar bar-footer bar-dark">