Woops I broked it and fixed it again

This commit is contained in:
Max Lynch
2013-10-21 21:10:00 -05:00
parent 8690a39beb
commit ddb724dbd3
7 changed files with 42 additions and 20 deletions

View File

@ -370,6 +370,7 @@ 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;

View File

@ -1142,6 +1142,7 @@
.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;
@ -1402,7 +1403,8 @@
.ionic .bar .title + .buttons { .ionic .bar .title + .buttons {
position: absolute; position: absolute;
top: 5px; top: 5px;
right: 5px; } right: 5px;
bottom: 5px; }
.ionic .bar-default .button { .ionic .bar-default .button {
color: #333333; color: #333333;
background-color: white; background-color: white;
@ -1531,10 +1533,12 @@
background: none; background: none;
box-shadow: none; box-shadow: none;
font-size: 17px; } font-size: 17px; }
.ionic .bar [class^="icon-"],
.ionic .bar [class*=" icon-"] {
font-size: 24px; }
.ionic .bar .button-icon { .ionic .bar .button-icon {
border: 1px solid transparent; border: 1px solid transparent;
background-color: transparent; background-color: transparent; }
font-size: 24px; }
.ionic .bar-header { .ionic .bar-header {
top: 0; } top: 0; }
.ionic .bar-footer { .ionic .bar-footer {
@ -1837,7 +1841,8 @@
border: 1px solid #dddddd; border: 1px solid #dddddd;
z-index: 2; z-index: 2;
margin-top: -1px; margin-top: -1px;
padding: 15px; padding: 15px 45px 15px 15px;
font-size: 16px;
-webkit-transition: margin-left 0.2s ease-in-out, margin-right 0.2s ease-in-out, left 0.2s ease-in-out; } -webkit-transition: margin-left 0.2s ease-in-out, margin-right 0.2s ease-in-out, left 0.2s ease-in-out; }
.ionic .list-item-content i { .ionic .list-item-content i {
position: absolute; position: absolute;
@ -1850,12 +1855,32 @@
padding-left: 45px; } padding-left: 45px; }
.ionic .list-icon-left .list-item-content i { .ionic .list-icon-left .list-item-content i {
left: 7.5px; } left: 7.5px; }
.ionic .list-icon-right .list-item-content {
padding-right: 45px; }
.ionic .list-icon-right .list-item-content i { .ionic .list-icon-right .list-item-content i {
right: 7.5px; } right: 7.5px; }
.ionic .list-icon-left.list-icon-right .list-item-content i:last-child { .ionic .list-icon-left.list-icon-right .list-item-content i:last-child {
left: auto; } left: auto; }
.ionic a .list-item-content:after,
.ionic button .list-item-content:after {
position: absolute;
top: 0;
right: 11px;
display: flex;
height: 100%;
color: #ccc;
content: "\e0fc";
text-transform: none;
font-weight: normal;
font-style: normal;
font-variant: normal;
font-size: 16px;
font-family: 'ionicons';
line-height: 1;
speak: none;
-webkit-font-smoothing: antialiased;
align-items: center; }
.ionic a.list-icon-right .list-item-content:after,
.ionic button.list-icon-right .list-item-content:after {
display: none; }
.ionic .list-thumbnail h2 { .ionic .list-thumbnail h2 {
overflow: hidden; overflow: hidden;
margin: 0 0 8px 0; margin: 0 0 8px 0;
@ -1870,7 +1895,7 @@
.ionic .list-thumbnail .list-item-content { .ionic .list-thumbnail .list-item-content {
padding-left: 95px; padding-left: 95px;
min-height: 80px; } min-height: 80px; }
.ionic .list-thumbnail .list-item-content img { .ionic .list-thumbnail .list-item-content .thumbnail {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@ -1953,13 +1978,9 @@
border-left: 1px solid #dddddd; border-left: 1px solid #dddddd;
border-right: 1px solid #dddddd; } border-right: 1px solid #dddddd; }
.ionic .list-refresher { .ionic .list-refresher {
background-color: red;
height: 0; height: 0;
overflow: hidden; } overflow: hidden; }
.ionic .list-refresher-content {
padding: 20px;
text-align: center; }
.ionic .list-refreshing {
-webkit-transition: height 0.2s ease-in-out; }
.ionic form { .ionic form {
margin: 0 0 1.42857; } margin: 0 0 1.42857; }
.ionic legend { .ionic legend {

1
dist/css/ionic.css vendored
View File

@ -1449,6 +1449,7 @@ 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;

View File

@ -356,8 +356,7 @@ angular.module('ionic.ui.content', [])
if(attr.hasTabs) { if(attr.hasTabs) {
c.addClass('has-tabs'); c.addClass('has-tabs');
} }
var e = transclude($scope); $element.append(transclude($scope));
console.log(e);
}; };
} }
}; };

View File

@ -25,8 +25,7 @@ angular.module('ionic.ui.content', [])
if(attr.hasTabs) { if(attr.hasTabs) {
c.addClass('has-tabs'); c.addClass('has-tabs');
} }
var e = transclude($scope); $element.append(transclude($scope));
console.log(e);
}; };
} }
}; };

View File

@ -74,6 +74,7 @@ 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;

View File

@ -28,9 +28,9 @@
<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>
<div class="content-plain has-header has-footer"> <content>
<div id="map"></div> <div id="map"></div>
</div> </content>
<div class="bar bar-footer bar-dark"> <div class="bar bar-footer bar-dark">
<button ng-click="centerOnMe()" class="button button-icon"><i class="icon-ios7-navigate"></i></button> <button ng-click="centerOnMe()" class="button button-icon"><i class="icon-ios7-navigate"></i></button>
</div> </div>