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

Dumb dumb dumb dumb dumb

Browse Source
This commit is contained in:
Max Lynch
2013-11-18 10:14:34 -06:00
parent f0b7ef6f89
commit fd0e24def9
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dist/css/ionic.css vendored
View File

@ -183,7 +183,7 @@ sub {
fieldset { fieldset {
margin: 0 2px; margin: 0 2px;
padding: 0.35em 0.625em 0.75em; padding: 0.35em 0.625em 0.75em;
border: 1px solid #c0c0c0; } border: 1px solid silver; }
/** /**
* 1. Correct `color` not being inherited in IE 8/9. * 1. Correct `color` not being inherited in IE 8/9.
@ -2329,7 +2329,7 @@ input[type="checkbox"][readonly] {
border-radius: 50%; border-radius: 50%;
background: white; background: white;
content: ' '; content: ' ';
transition: background-color .1s ease-in-out; } transition: background-color 0.1s ease-in-out; }
/* the checkmark within the box */ /* the checkmark within the box */
.checkbox input:after { .checkbox input:after {
@ -2344,7 +2344,7 @@ input[type="checkbox"][readonly] {
border-right: 0; border-right: 0;
content: ' '; content: ' ';
opacity: 0; opacity: 0;
transition: opacity .05s ease-in-out; transition: opacity 0.05s ease-in-out;
-webkit-transform: rotate(-45deg); -webkit-transform: rotate(-45deg);
transform: rotate(-45deg); } transform: rotate(-45deg); }
@ -2797,7 +2797,7 @@ input[type="range"] {
.button-icon:active, .button-icon.active { .button-icon:active, .button-icon.active {
background: none; background: none;
box-shadow: none; box-shadow: none;
text-shadow: 0px 0px 10px #fff; } text-shadow: 0px 0px 10px white; }
.button-icon .icon { .button-icon .icon {
font-size: 32px; } font-size: 32px; }
@ -3492,7 +3492,7 @@ a.button {
.platform-ios7 .has-header { .platform-ios7 .has-header {
margin-top: 64px; } margin-top: 64px; }
/*! /*
Ionicons, v1.3.5 Ionicons, v1.3.5
Created by Ben Sperry for the Ionic Framework, http://ionicons.com/ Created by Ben Sperry for the Ionic Framework, http://ionicons.com/
https://twitter.com/helloimben https://twitter.com/ionicframework https://twitter.com/helloimben https://twitter.com/ionicframework

5
dist/css/themes/ionic-ios7.css vendored
View File

@ -1,3 +1,4 @@
@charset "UTF-8";
/** /**
* Nav controllers and header bar animations * Nav controllers and header bar animations
*/ */
@ -118,7 +119,7 @@
right: 20px; right: 20px;
transition: 0.2s ease; transition: 0.2s ease;
transition-property: left, right; transition-property: left, right;
transition-delay: 0s, .05s; } transition-delay: 0s, 0.05s; }
.toggle :checked + .track { .toggle :checked + .track {
/* When the toggle is "on" */ /* When the toggle is "on" */
@ -133,4 +134,4 @@
right: 0; right: 0;
left: 20px; left: 20px;
-webkit-transform: none; -webkit-transform: none;
transition-delay: .05s, 0s; } transition-delay: 0.05s, 0s; }

3
dist/js/ionic-angular.js vendored
View File

@ -24624,6 +24624,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate'])
$scope.$watch('isVisible', function(value) { $scope.$watch('isVisible', function(value) {
if(childElement) { if(childElement) {
$animate.leave(childElement); $animate.leave(childElement);
$scope.$broadcast('tab.hidden');
childElement = undefined; childElement = undefined;
} }
if(childScope) { if(childScope) {
@ -24636,6 +24637,8 @@ angular.module('ionic.ui.tabs', ['ngAnimate'])
childElement = clone; childElement = clone;
childElement.addClass('view-full'); childElement.addClass('view-full');
$animate.enter(clone, $element.parent(), $element); $animate.enter(clone, $element.parent(), $element);
$scope.$broadcast('tab.shown');
}); });
} }
}); });