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

DRag

Browse Source
This commit is contained in:
Max Lynch
2013-11-07 16:27:34 -06:00
parent b4a69fa693
commit bbfa3b8c58
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dist/css/ionic.css vendored
View File

@ -2019,7 +2019,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.
@ -3891,7 +3891,7 @@ input[type="file"] {
line-height: 34px; } line-height: 34px; }
select { select {
border: 1px solid #ccc; border: 1px solid #cccccc;
background-color: white; } background-color: white; }
select[multiple], select[multiple],
@ -3950,7 +3950,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 {
@ -3965,7 +3965,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); }
@ -4394,7 +4394,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; }
.padding > .button.block:first-child { .padding > .button.block:first-child {
margin-top: 0; } margin-top: 0; }
@ -4965,9 +4965,9 @@ a.button {
line-height: 1; line-height: 1;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
-webkit-animation: spin .75s linear infinite; -webkit-animation: spin 0.75s linear infinite;
-moz-animation: spin .75s linear infinite; -moz-animation: spin 0.75s linear infinite;
animation: spin .75s linear infinite; } animation: spin 0.75s linear infinite; }
.ion-loading:before { .ion-loading:before {
content: "\e144"; } content: "\e144"; }
@ -4980,9 +4980,9 @@ a.button {
line-height: 1; line-height: 1;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
-webkit-animation: spin .75s linear infinite; -webkit-animation: spin 0.75s linear infinite;
-moz-animation: spin .75s linear infinite; -moz-animation: spin 0.75s linear infinite;
animation: spin .75s linear infinite; } animation: spin 0.75s linear infinite; }
.ion-refreshing:before { .ion-refreshing:before {
content: "\e144"; } content: "\e144"; }

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

@ -1,3 +1,4 @@
@charset "UTF-8";
/** /**
* Mixins * Mixins
* -------------------------------------------------- * --------------------------------------------------
@ -123,7 +124,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" */
@ -138,4 +139,4 @@
right: 0; right: 0;
left: 20px; left: 20px;
-webkit-transform: none; -webkit-transform: none;
transition-delay: .05s, 0s; } transition-delay: 0.05s, 0s; }

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

@ -1033,6 +1033,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
var defaultPrevented = false; var defaultPrevented = false;
ionic.on('mousedown', function(e) { ionic.on('mousedown', function(e) {
// If the child element prevented the drag, don't drag
defaultPrevented = e.defaultPrevented; defaultPrevented = e.defaultPrevented;
}); });

1
js/ext/angular/src/directive/ionicSideMenu.js vendored
View File

@ -68,6 +68,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
var defaultPrevented = false; var defaultPrevented = false;
ionic.on('mousedown', function(e) { ionic.on('mousedown', function(e) {
// If the child element prevented the drag, don't drag
defaultPrevented = e.defaultPrevented; defaultPrevented = e.defaultPrevented;
}); });