Skip to content

Commit

Permalink
Lots of cleanup. Fixed #25, progress on #68
Browse files Browse the repository at this point in the history
  • Loading branch information
mlynch committed Nov 4, 2013
1 parent 8cb701a commit bd8e081
Show file tree
Hide file tree
Showing 27 changed files with 133 additions and 1,420 deletions.
33 changes: 22 additions & 11 deletions dist/css/ionic-ios7.css
Expand Up @@ -182,7 +182,7 @@ sub {
fieldset {
margin: 0 2px;
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.
Expand Down Expand Up @@ -386,6 +386,17 @@ body, .ionic-body {
.has-tabs {
bottom: 84px; }

.pane {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1;
background-color: #fff; }

.page, .full-section {
position: fixed;
top: 0;
Expand Down Expand Up @@ -1730,7 +1741,7 @@ input[type="file"] {
line-height: 34px; }

select {
border: 1px solid #ccc;
border: 1px solid #cccccc;
background-color: white; }

select[multiple],
Expand Down Expand Up @@ -1802,7 +1813,7 @@ input[type="checkbox"][readonly] {
right: 20px;
transition: 0.2s ease;
transition-property: left, right;
transition-delay: 0s, .05s; }
transition-delay: 0s, 0.05s; }

.toggle :checked + .track {
/* When the toggle is "on" */
Expand All @@ -1817,7 +1828,7 @@ input[type="checkbox"][readonly] {
right: 0;
left: 20px;
-webkit-transform: none;
transition-delay: .05s, 0s; }
transition-delay: 0.05s, 0s; }

.item-radio {
padding: 0; }
Expand Down Expand Up @@ -2102,7 +2113,7 @@ input[type="range"] {
.button.button-icon:active, .button.button-icon.active {
background: none;
box-shadow: none;
text-shadow: 0px 0px 10px #fff; }
text-shadow: 0px 0px 10px white; }
.button.block, .button.button-full {
margin-top: 10px;
margin-bottom: 10px; }
Expand Down Expand Up @@ -2446,9 +2457,9 @@ a.button {
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-animation: spin .75s linear infinite;
-moz-animation: spin .75s linear infinite;
animation: spin .75s linear infinite; }
-webkit-animation: spin 0.75s linear infinite;
-moz-animation: spin 0.75s linear infinite;
animation: spin 0.75s linear infinite; }
.ion-loading:before {
content: "\e144"; }

Expand All @@ -2461,9 +2472,9 @@ a.button {
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-animation: spin .75s linear infinite;
-moz-animation: spin .75s linear infinite;
animation: spin .75s linear infinite; }
-webkit-animation: spin 0.75s linear infinite;
-moz-animation: spin 0.75s linear infinite;
animation: spin 0.75s linear infinite; }
.ion-refreshing:before {
content: "\e144"; }

Expand Down
34 changes: 22 additions & 12 deletions dist/css/ionic-scoped.css
Expand Up @@ -210,7 +210,7 @@
transform: rotate(360deg); } }
}
.ionic .ion {
font-family: 'Ionicons' !important;
font-family: "Ionicons" !important;
speak: none !important;
font-style: normal !important;
font-weight: normal !important;
Expand Down Expand Up @@ -1192,7 +1192,7 @@
.ionic fieldset {
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
border: 1px solid #c0c0c0; }
border: 1px solid silver; }
.ionic legend {
padding: 0;
/* 2 */
Expand Down Expand Up @@ -1317,6 +1317,16 @@
bottom: 44px; }
.ionic .has-tabs {
bottom: 84px; }
.ionic .pane {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1;
background-color: #fff; }
.ionic .page, .ionic .full-section {
position: fixed;
top: 0;
Expand Down Expand Up @@ -2546,7 +2556,7 @@
.ionic input[type="file"] {
line-height: 34px; }
.ionic select {
border: 1px solid #ccc;
border: 1px solid #cccccc;
background-color: white; }
.ionic select[multiple],
.ionic select[size] {
Expand Down Expand Up @@ -2595,7 +2605,7 @@
border-radius: 50%;
background: white;
content: ' ';
transition: background-color .1s ease-in-out; }
transition: background-color 0.1s ease-in-out; }
.ionic .checkbox input:after {
position: absolute;
top: 34%;
Expand All @@ -2608,7 +2618,7 @@
border-right: 0;
content: ' ';
opacity: 0;
transition: opacity .05s ease-in-out;
transition: opacity 0.05s ease-in-out;
-webkit-transform: rotate(-45deg);
transform: rotate(-45deg); }
.ionic .checkbox input:checked:before {
Expand Down Expand Up @@ -2960,7 +2970,7 @@
.ionic .button.button-icon:active, .ionic .button.button-icon.active {
background: none;
box-shadow: none;
text-shadow: 0px 0px 10px #fff; }
text-shadow: 0px 0px 10px white; }
.ionic .button.block, .ionic .button.button-full {
margin-top: 10px;
margin-bottom: 10px; }
Expand Down Expand Up @@ -3210,9 +3220,9 @@
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-animation: spin .75s linear infinite;
-moz-animation: spin .75s linear infinite;
animation: spin .75s linear infinite; }
-webkit-animation: spin 0.75s linear infinite;
-moz-animation: spin 0.75s linear infinite;
animation: spin 0.75s linear infinite; }
.ionic .ion-loading:before {
content: "\e144"; }
.ionic .ion-refreshing {
Expand All @@ -3224,9 +3234,9 @@
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-animation: spin .75s linear infinite;
-moz-animation: spin .75s linear infinite;
animation: spin .75s linear infinite; }
-webkit-animation: spin 0.75s linear infinite;
-moz-animation: spin 0.75s linear infinite;
animation: spin 0.75s linear infinite; }
.ionic .ion-refreshing:before {
content: "\e144"; }
.ionic .hidden,
Expand Down
35 changes: 23 additions & 12 deletions dist/css/ionic.css
Expand Up @@ -7,7 +7,7 @@
font-style: normal; }

.ion {
font-family: 'Ionicons' !important;
font-family: "Ionicons" !important;
speak: none !important;
font-style: normal !important;
font-weight: normal !important;
Expand Down Expand Up @@ -1521,7 +1521,7 @@ sub {
fieldset {
margin: 0 2px;
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.
Expand Down Expand Up @@ -1725,6 +1725,17 @@ body, .ionic-body {
.has-tabs {
bottom: 84px; }

.pane {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1;
background-color: #fff; }

.page, .full-section {
position: fixed;
top: 0;
Expand Down Expand Up @@ -3133,7 +3144,7 @@ input[type="file"] {
line-height: 34px; }

select {
border: 1px solid #ccc;
border: 1px solid #cccccc;
background-color: white; }

select[multiple],
Expand Down Expand Up @@ -3188,7 +3199,7 @@ input[type="checkbox"][readonly] {
border-radius: 50%;
background: white;
content: ' ';
transition: background-color .1s ease-in-out; }
transition: background-color 0.1s ease-in-out; }

/* the checkmark within the box */
.checkbox input:after {
Expand All @@ -3203,7 +3214,7 @@ input[type="checkbox"][readonly] {
border-right: 0;
content: ' ';
opacity: 0;
transition: opacity .05s ease-in-out;
transition: opacity 0.05s ease-in-out;
-webkit-transform: rotate(-45deg);
transform: rotate(-45deg); }

Expand Down Expand Up @@ -3583,7 +3594,7 @@ input[type="range"] {
.button.button-icon:active, .button.button-icon.active {
background: none;
box-shadow: none;
text-shadow: 0px 0px 10px #fff; }
text-shadow: 0px 0px 10px white; }
.button.block, .button.button-full {
margin-top: 10px;
margin-bottom: 10px; }
Expand Down Expand Up @@ -4105,9 +4116,9 @@ a.button {
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-animation: spin .75s linear infinite;
-moz-animation: spin .75s linear infinite;
animation: spin .75s linear infinite; }
-webkit-animation: spin 0.75s linear infinite;
-moz-animation: spin 0.75s linear infinite;
animation: spin 0.75s linear infinite; }
.ion-loading:before {
content: "\e144"; }

Expand All @@ -4120,9 +4131,9 @@ a.button {
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-animation: spin .75s linear infinite;
-moz-animation: spin .75s linear infinite;
animation: spin .75s linear infinite; }
-webkit-animation: spin 0.75s linear infinite;
-moz-animation: spin 0.75s linear infinite;
animation: spin 0.75s linear infinite; }
.ion-refreshing:before {
content: "\e144"; }

Expand Down
20 changes: 16 additions & 4 deletions dist/js/ionic-angular.js
Expand Up @@ -340,6 +340,15 @@ angular.module('ionic.ui.checkbox', [])

angular.module('ionic.ui.content', [])

.directive('pane', function() {
return {
restrict: 'E',
replace: true,
transclude: true,
template: '<div class="pane" ng-transclude></div>'
}
})

// The content directive is a core scrollable content area
// that is part of many View hierarchies
.directive('content', function() {
Expand Down Expand Up @@ -858,17 +867,20 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
$scope.sideMenuCtrl = this;
})

.directive('sideMenuCtrl', function() {
.directive('sideMenus', function() {
return {
restrict: 'CA',
restrict: 'ECA',
controller: 'SideMenuCtrl',
replace: true,
transclude: true,
template: '<div ng-transclude></div>'
};
})

.directive('sideMenuContent', ['Gesture', function(Gesture) {
return {
restrict: 'CA',
require: '^sideMenuCtrl',
require: '^sideMenus',
scope: true,
compile: function(element, attr, transclude) {
return function($scope, $element, $attr, sideMenuCtrl) {
Expand Down Expand Up @@ -911,7 +923,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
.directive('menu', function() {
return {
restrict: 'E',
require: '^sideMenuCtrl',
require: '^sideMenus',
replace: true,
transclude: true,
scope: {
Expand Down

0 comments on commit bd8e081

Please sign in to comment.