From 63b081e3973c7b2c8778998acd1867432e2e2d08 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Mon, 7 Oct 2013 12:58:11 -0500 Subject: [PATCH] removed grid system --- dist/ionic-ios7.css | 610 +------------------------------ dist/ionic.css | 613 +------------------------------- scss/ionic-ios7/ionic-ios7.scss | 1 - scss/ionic/_grid.scss | 346 ------------------ scss/ionic/_mixins.scss | 130 ------- scss/ionic/ionic.scss | 1 - 6 files changed, 16 insertions(+), 1685 deletions(-) delete mode 100644 scss/ionic/_grid.scss diff --git a/dist/ionic-ios7.css b/dist/ionic-ios7.css index cbea98357d..c6d3c4716a 100644 --- a/dist/ionic-ios7.css +++ b/dist/ionic-ios7.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; /** * Adapted from normalize.css and some reset.css. We don't care even one * bit about old IE, so we don't need any hacks for that in here. @@ -181,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. @@ -384,603 +385,6 @@ body { .rounded { border-radius: 4px; } -.container { - margin-right: auto; - margin-left: auto; - padding-left: 15px; - padding-right: 15px; - *zoom: 1; } - .container:before, .container:after { - display: table; - content: ""; - line-height: 0; } - .container:after { - clear: both; } - -.row { - margin-left: -15px; - margin-right: -15px; - *zoom: 1; } - .row:before, .row:after { - display: table; - content: ""; - line-height: 0; } - .row:after { - clear: both; } - -.col-xs-1, -.col-xs-2, -.col-xs-3, -.col-xs-4, -.col-xs-5, -.col-xs-6, -.col-xs-7, -.col-xs-8, -.col-xs-9, -.col-xs-10, -.col-xs-11, -.col-xs-12, -.col-sm-1, -.col-sm-2, -.col-sm-3, -.col-sm-4, -.col-sm-5, -.col-sm-6, -.col-sm-7, -.col-sm-8, -.col-sm-9, -.col-sm-10, -.col-sm-11, -.col-sm-12, -.col-md-1, -.col-md-2, -.col-md-3, -.col-md-4, -.col-md-5, -.col-md-6, -.col-md-7, -.col-md-8, -.col-md-9, -.col-md-10, -.col-md-11, -.col-md-12, -.col-lg-1, -.col-lg-2, -.col-lg-3, -.col-lg-4, -.col-lg-5, -.col-lg-6, -.col-lg-7, -.col-lg-8, -.col-lg-9, -.col-lg-10, -.col-lg-11, -.col-lg-12 { - position: relative; - padding-right: 15px; - padding-left: 15px; - min-height: 1px; } - -.col-xs-1, -.col-xs-2, -.col-xs-3, -.col-xs-4, -.col-xs-5, -.col-xs-6, -.col-xs-7, -.col-xs-8, -.col-xs-9, -.col-xs-10, -.col-xs-11 { - float: left; } - -.col-xs-1 { - width: 8.33333%; } - -.col-xs-2 { - width: 16.66667%; } - -.col-xs-3 { - width: 25%; } - -.col-xs-4 { - width: 33.33333%; } - -.col-xs-5 { - width: 41.66667%; } - -.col-xs-6 { - width: 50%; } - -.col-xs-7 { - width: 58.33333%; } - -.col-xs-8 { - width: 66.66667%; } - -.col-xs-9 { - width: 75%; } - -.col-xs-10 { - width: 83.33333%; } - -.col-xs-11 { - width: 91.66667%; } - -.col-xs-12 { - width: 100%; } - -@media (min-width: 768px) { - .container { - max-width: 750px; } - - .col-sm-1, - .col-sm-2, - .col-sm-3, - .col-sm-4, - .col-sm-5, - .col-sm-6, - .col-sm-7, - .col-sm-8, - .col-sm-9, - .col-sm-10, - .col-sm-11 { - float: left; } - - .col-sm-1 { - width: 8.33333%; } - - .col-sm-2 { - width: 16.66667%; } - - .col-sm-3 { - width: 25%; } - - .col-sm-4 { - width: 33.33333%; } - - .col-sm-5 { - width: 41.66667%; } - - .col-sm-6 { - width: 50%; } - - .col-sm-7 { - width: 58.33333%; } - - .col-sm-8 { - width: 66.66667%; } - - .col-sm-9 { - width: 75%; } - - .col-sm-10 { - width: 83.33333%; } - - .col-sm-11 { - width: 91.66667%; } - - .col-sm-12 { - width: 100%; } - - .col-sm-push-1 { - left: 8.33333%; } - - .col-sm-push-2 { - left: 16.66667%; } - - .col-sm-push-3 { - left: 25%; } - - .col-sm-push-4 { - left: 33.33333%; } - - .col-sm-push-5 { - left: 41.66667%; } - - .col-sm-push-6 { - left: 50%; } - - .col-sm-push-7 { - left: 58.33333%; } - - .col-sm-push-8 { - left: 66.66667%; } - - .col-sm-push-9 { - left: 75%; } - - .col-sm-push-10 { - left: 83.33333%; } - - .col-sm-push-11 { - left: 91.66667%; } - - .col-sm-pull-1 { - right: 8.33333%; } - - .col-sm-pull-2 { - right: 16.66667%; } - - .col-sm-pull-3 { - right: 25%; } - - .col-sm-pull-4 { - right: 33.33333%; } - - .col-sm-pull-5 { - right: 41.66667%; } - - .col-sm-pull-6 { - right: 50%; } - - .col-sm-pull-7 { - right: 58.33333%; } - - .col-sm-pull-8 { - right: 66.66667%; } - - .col-sm-pull-9 { - right: 75%; } - - .col-sm-pull-10 { - right: 83.33333%; } - - .col-sm-pull-11 { - right: 91.66667%; } - - .col-sm-offset-1 { - margin-left: 8.33333%; } - - .col-sm-offset-2 { - margin-left: 16.66667%; } - - .col-sm-offset-3 { - margin-left: 25%; } - - .col-sm-offset-4 { - margin-left: 33.33333%; } - - .col-sm-offset-5 { - margin-left: 41.66667%; } - - .col-sm-offset-6 { - margin-left: 50%; } - - .col-sm-offset-7 { - margin-left: 58.33333%; } - - .col-sm-offset-8 { - margin-left: 66.66667%; } - - .col-sm-offset-9 { - margin-left: 75%; } - - .col-sm-offset-10 { - margin-left: 83.33333%; } - - .col-sm-offset-11 { - margin-left: 91.66667%; } } -@media (min-width: 992px) { - .container { - max-width: 970px; } - - .col-md-1, - .col-md-2, - .col-md-3, - .col-md-4, - .col-md-5, - .col-md-6, - .col-md-7, - .col-md-8, - .col-md-9, - .col-md-10, - .col-md-11 { - float: left; } - - .col-md-1 { - width: 8.33333%; } - - .col-md-2 { - width: 16.66667%; } - - .col-md-3 { - width: 25%; } - - .col-md-4 { - width: 33.33333%; } - - .col-md-5 { - width: 41.66667%; } - - .col-md-6 { - width: 50%; } - - .col-md-7 { - width: 58.33333%; } - - .col-md-8 { - width: 66.66667%; } - - .col-md-9 { - width: 75%; } - - .col-md-10 { - width: 83.33333%; } - - .col-md-11 { - width: 91.66667%; } - - .col-md-12 { - width: 100%; } - - .col-md-push-0 { - left: auto; } - - .col-md-push-1 { - left: 8.33333%; } - - .col-md-push-2 { - left: 16.66667%; } - - .col-md-push-3 { - left: 25%; } - - .col-md-push-4 { - left: 33.33333%; } - - .col-md-push-5 { - left: 41.66667%; } - - .col-md-push-6 { - left: 50%; } - - .col-md-push-7 { - left: 58.33333%; } - - .col-md-push-8 { - left: 66.66667%; } - - .col-md-push-9 { - left: 75%; } - - .col-md-push-10 { - left: 83.33333%; } - - .col-md-push-11 { - left: 91.66667%; } - - .col-md-pull-0 { - right: auto; } - - .col-md-pull-1 { - right: 8.33333%; } - - .col-md-pull-2 { - right: 16.66667%; } - - .col-md-pull-3 { - right: 25%; } - - .col-md-pull-4 { - right: 33.33333%; } - - .col-md-pull-5 { - right: 41.66667%; } - - .col-md-pull-6 { - right: 50%; } - - .col-md-pull-7 { - right: 58.33333%; } - - .col-md-pull-8 { - right: 66.66667%; } - - .col-md-pull-9 { - right: 75%; } - - .col-md-pull-10 { - right: 83.33333%; } - - .col-md-pull-11 { - right: 91.66667%; } - - .col-md-offset-0 { - margin-left: 0; } - - .col-md-offset-1 { - margin-left: 8.33333%; } - - .col-md-offset-2 { - margin-left: 16.66667%; } - - .col-md-offset-3 { - margin-left: 25%; } - - .col-md-offset-4 { - margin-left: 33.33333%; } - - .col-md-offset-5 { - margin-left: 41.66667%; } - - .col-md-offset-6 { - margin-left: 50%; } - - .col-md-offset-7 { - margin-left: 58.33333%; } - - .col-md-offset-8 { - margin-left: 66.66667%; } - - .col-md-offset-9 { - margin-left: 75%; } - - .col-md-offset-10 { - margin-left: 83.33333%; } - - .col-md-offset-11 { - margin-left: 91.66667%; } } -@media (min-width: 1200px) { - .container { - max-width: 1170px; } - - .col-lg-1, - .col-lg-2, - .col-lg-3, - .col-lg-4, - .col-lg-5, - .col-lg-6, - .col-lg-7, - .col-lg-8, - .col-lg-9, - .col-lg-10, - .col-lg-11 { - float: left; } - - .col-lg-1 { - width: 8.33333%; } - - .col-lg-2 { - width: 16.66667%; } - - .col-lg-3 { - width: 25%; } - - .col-lg-4 { - width: 33.33333%; } - - .col-lg-5 { - width: 41.66667%; } - - .col-lg-6 { - width: 50%; } - - .col-lg-7 { - width: 58.33333%; } - - .col-lg-8 { - width: 66.66667%; } - - .col-lg-9 { - width: 75%; } - - .col-lg-10 { - width: 83.33333%; } - - .col-lg-11 { - width: 91.66667%; } - - .col-lg-12 { - width: 100%; } - - .col-lg-push-0 { - left: auto; } - - .col-lg-push-1 { - left: 8.33333%; } - - .col-lg-push-2 { - left: 16.66667%; } - - .col-lg-push-3 { - left: 25%; } - - .col-lg-push-4 { - left: 33.33333%; } - - .col-lg-push-5 { - left: 41.66667%; } - - .col-lg-push-6 { - left: 50%; } - - .col-lg-push-7 { - left: 58.33333%; } - - .col-lg-push-8 { - left: 66.66667%; } - - .col-lg-push-9 { - left: 75%; } - - .col-lg-push-10 { - left: 83.33333%; } - - .col-lg-push-11 { - left: 91.66667%; } - - .col-lg-pull-0 { - right: auto; } - - .col-lg-pull-1 { - right: 8.33333%; } - - .col-lg-pull-2 { - right: 16.66667%; } - - .col-lg-pull-3 { - right: 25%; } - - .col-lg-pull-4 { - right: 33.33333%; } - - .col-lg-pull-5 { - right: 41.66667%; } - - .col-lg-pull-6 { - right: 50%; } - - .col-lg-pull-7 { - right: 58.33333%; } - - .col-lg-pull-8 { - right: 66.66667%; } - - .col-lg-pull-9 { - right: 75%; } - - .col-lg-pull-10 { - right: 83.33333%; } - - .col-lg-pull-11 { - right: 91.66667%; } - - .col-lg-offset-0 { - margin-left: 0; } - - .col-lg-offset-1 { - margin-left: 8.33333%; } - - .col-lg-offset-2 { - margin-left: 16.66667%; } - - .col-lg-offset-3 { - margin-left: 25%; } - - .col-lg-offset-4 { - margin-left: 33.33333%; } - - .col-lg-offset-5 { - margin-left: 41.66667%; } - - .col-lg-offset-6 { - margin-left: 50%; } - - .col-lg-offset-7 { - margin-left: 58.33333%; } - - .col-lg-offset-8 { - margin-left: 66.66667%; } - - .col-lg-offset-9 { - margin-left: 75%; } - - .col-lg-offset-10 { - margin-left: 83.33333%; } - - .col-lg-offset-11 { - margin-left: 91.66667%; } } p { margin: 0 0 10px; } @@ -1847,7 +1251,7 @@ select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333; + outline: thin dotted #333333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -1934,7 +1338,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" */ @@ -1949,7 +1353,7 @@ input[type="checkbox"][readonly] { right: 0; left: 20px; -webkit-transform: none; - transition-delay: .05s, 0s; } + transition-delay: 0.05s, 0s; } /* hide a radio button's icon by default */ .radio-item [class^="icon-"], @@ -2174,7 +1578,7 @@ input[type="checkbox"][readonly] { border: none; background: none; } .button.button-icon:active, .button.button-icon.active { - text-shadow: 0px 0px 10px #fff; + text-shadow: 0px 0px 10px white; box-shadow: none; background: none; } @@ -2357,7 +1761,7 @@ a.button { width: 100%; background-color: white; border-radius: 2px; - border: 1px solid #ddd; } + border: 1px solid #dddddd; } .card-header { padding: 10px; diff --git a/dist/ionic.css b/dist/ionic.css index 597134ae4e..e9e7a2c530 100644 --- a/dist/ionic.css +++ b/dist/ionic.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; @font-face { font-family: 'ionicon-test'; src: url("fonts/ionicon-test.eot"); @@ -246,7 +247,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. @@ -442,603 +443,6 @@ body { .rounded { border-radius: 4px; } -.container { - margin-right: auto; - margin-left: auto; - padding-left: 15px; - padding-right: 15px; - *zoom: 1; } - .container:before, .container:after { - display: table; - content: ""; - line-height: 0; } - .container:after { - clear: both; } - -.row { - margin-left: -15px; - margin-right: -15px; - *zoom: 1; } - .row:before, .row:after { - display: table; - content: ""; - line-height: 0; } - .row:after { - clear: both; } - -.col-xs-1, -.col-xs-2, -.col-xs-3, -.col-xs-4, -.col-xs-5, -.col-xs-6, -.col-xs-7, -.col-xs-8, -.col-xs-9, -.col-xs-10, -.col-xs-11, -.col-xs-12, -.col-sm-1, -.col-sm-2, -.col-sm-3, -.col-sm-4, -.col-sm-5, -.col-sm-6, -.col-sm-7, -.col-sm-8, -.col-sm-9, -.col-sm-10, -.col-sm-11, -.col-sm-12, -.col-md-1, -.col-md-2, -.col-md-3, -.col-md-4, -.col-md-5, -.col-md-6, -.col-md-7, -.col-md-8, -.col-md-9, -.col-md-10, -.col-md-11, -.col-md-12, -.col-lg-1, -.col-lg-2, -.col-lg-3, -.col-lg-4, -.col-lg-5, -.col-lg-6, -.col-lg-7, -.col-lg-8, -.col-lg-9, -.col-lg-10, -.col-lg-11, -.col-lg-12 { - position: relative; - padding-right: 15px; - padding-left: 15px; - min-height: 1px; } - -.col-xs-1, -.col-xs-2, -.col-xs-3, -.col-xs-4, -.col-xs-5, -.col-xs-6, -.col-xs-7, -.col-xs-8, -.col-xs-9, -.col-xs-10, -.col-xs-11 { - float: left; } - -.col-xs-1 { - width: 8.33333%; } - -.col-xs-2 { - width: 16.66667%; } - -.col-xs-3 { - width: 25%; } - -.col-xs-4 { - width: 33.33333%; } - -.col-xs-5 { - width: 41.66667%; } - -.col-xs-6 { - width: 50%; } - -.col-xs-7 { - width: 58.33333%; } - -.col-xs-8 { - width: 66.66667%; } - -.col-xs-9 { - width: 75%; } - -.col-xs-10 { - width: 83.33333%; } - -.col-xs-11 { - width: 91.66667%; } - -.col-xs-12 { - width: 100%; } - -@media (min-width: 768px) { - .container { - max-width: 750px; } - - .col-sm-1, - .col-sm-2, - .col-sm-3, - .col-sm-4, - .col-sm-5, - .col-sm-6, - .col-sm-7, - .col-sm-8, - .col-sm-9, - .col-sm-10, - .col-sm-11 { - float: left; } - - .col-sm-1 { - width: 8.33333%; } - - .col-sm-2 { - width: 16.66667%; } - - .col-sm-3 { - width: 25%; } - - .col-sm-4 { - width: 33.33333%; } - - .col-sm-5 { - width: 41.66667%; } - - .col-sm-6 { - width: 50%; } - - .col-sm-7 { - width: 58.33333%; } - - .col-sm-8 { - width: 66.66667%; } - - .col-sm-9 { - width: 75%; } - - .col-sm-10 { - width: 83.33333%; } - - .col-sm-11 { - width: 91.66667%; } - - .col-sm-12 { - width: 100%; } - - .col-sm-push-1 { - left: 8.33333%; } - - .col-sm-push-2 { - left: 16.66667%; } - - .col-sm-push-3 { - left: 25%; } - - .col-sm-push-4 { - left: 33.33333%; } - - .col-sm-push-5 { - left: 41.66667%; } - - .col-sm-push-6 { - left: 50%; } - - .col-sm-push-7 { - left: 58.33333%; } - - .col-sm-push-8 { - left: 66.66667%; } - - .col-sm-push-9 { - left: 75%; } - - .col-sm-push-10 { - left: 83.33333%; } - - .col-sm-push-11 { - left: 91.66667%; } - - .col-sm-pull-1 { - right: 8.33333%; } - - .col-sm-pull-2 { - right: 16.66667%; } - - .col-sm-pull-3 { - right: 25%; } - - .col-sm-pull-4 { - right: 33.33333%; } - - .col-sm-pull-5 { - right: 41.66667%; } - - .col-sm-pull-6 { - right: 50%; } - - .col-sm-pull-7 { - right: 58.33333%; } - - .col-sm-pull-8 { - right: 66.66667%; } - - .col-sm-pull-9 { - right: 75%; } - - .col-sm-pull-10 { - right: 83.33333%; } - - .col-sm-pull-11 { - right: 91.66667%; } - - .col-sm-offset-1 { - margin-left: 8.33333%; } - - .col-sm-offset-2 { - margin-left: 16.66667%; } - - .col-sm-offset-3 { - margin-left: 25%; } - - .col-sm-offset-4 { - margin-left: 33.33333%; } - - .col-sm-offset-5 { - margin-left: 41.66667%; } - - .col-sm-offset-6 { - margin-left: 50%; } - - .col-sm-offset-7 { - margin-left: 58.33333%; } - - .col-sm-offset-8 { - margin-left: 66.66667%; } - - .col-sm-offset-9 { - margin-left: 75%; } - - .col-sm-offset-10 { - margin-left: 83.33333%; } - - .col-sm-offset-11 { - margin-left: 91.66667%; } } -@media (min-width: 992px) { - .container { - max-width: 970px; } - - .col-md-1, - .col-md-2, - .col-md-3, - .col-md-4, - .col-md-5, - .col-md-6, - .col-md-7, - .col-md-8, - .col-md-9, - .col-md-10, - .col-md-11 { - float: left; } - - .col-md-1 { - width: 8.33333%; } - - .col-md-2 { - width: 16.66667%; } - - .col-md-3 { - width: 25%; } - - .col-md-4 { - width: 33.33333%; } - - .col-md-5 { - width: 41.66667%; } - - .col-md-6 { - width: 50%; } - - .col-md-7 { - width: 58.33333%; } - - .col-md-8 { - width: 66.66667%; } - - .col-md-9 { - width: 75%; } - - .col-md-10 { - width: 83.33333%; } - - .col-md-11 { - width: 91.66667%; } - - .col-md-12 { - width: 100%; } - - .col-md-push-0 { - left: auto; } - - .col-md-push-1 { - left: 8.33333%; } - - .col-md-push-2 { - left: 16.66667%; } - - .col-md-push-3 { - left: 25%; } - - .col-md-push-4 { - left: 33.33333%; } - - .col-md-push-5 { - left: 41.66667%; } - - .col-md-push-6 { - left: 50%; } - - .col-md-push-7 { - left: 58.33333%; } - - .col-md-push-8 { - left: 66.66667%; } - - .col-md-push-9 { - left: 75%; } - - .col-md-push-10 { - left: 83.33333%; } - - .col-md-push-11 { - left: 91.66667%; } - - .col-md-pull-0 { - right: auto; } - - .col-md-pull-1 { - right: 8.33333%; } - - .col-md-pull-2 { - right: 16.66667%; } - - .col-md-pull-3 { - right: 25%; } - - .col-md-pull-4 { - right: 33.33333%; } - - .col-md-pull-5 { - right: 41.66667%; } - - .col-md-pull-6 { - right: 50%; } - - .col-md-pull-7 { - right: 58.33333%; } - - .col-md-pull-8 { - right: 66.66667%; } - - .col-md-pull-9 { - right: 75%; } - - .col-md-pull-10 { - right: 83.33333%; } - - .col-md-pull-11 { - right: 91.66667%; } - - .col-md-offset-0 { - margin-left: 0; } - - .col-md-offset-1 { - margin-left: 8.33333%; } - - .col-md-offset-2 { - margin-left: 16.66667%; } - - .col-md-offset-3 { - margin-left: 25%; } - - .col-md-offset-4 { - margin-left: 33.33333%; } - - .col-md-offset-5 { - margin-left: 41.66667%; } - - .col-md-offset-6 { - margin-left: 50%; } - - .col-md-offset-7 { - margin-left: 58.33333%; } - - .col-md-offset-8 { - margin-left: 66.66667%; } - - .col-md-offset-9 { - margin-left: 75%; } - - .col-md-offset-10 { - margin-left: 83.33333%; } - - .col-md-offset-11 { - margin-left: 91.66667%; } } -@media (min-width: 1200px) { - .container { - max-width: 1170px; } - - .col-lg-1, - .col-lg-2, - .col-lg-3, - .col-lg-4, - .col-lg-5, - .col-lg-6, - .col-lg-7, - .col-lg-8, - .col-lg-9, - .col-lg-10, - .col-lg-11 { - float: left; } - - .col-lg-1 { - width: 8.33333%; } - - .col-lg-2 { - width: 16.66667%; } - - .col-lg-3 { - width: 25%; } - - .col-lg-4 { - width: 33.33333%; } - - .col-lg-5 { - width: 41.66667%; } - - .col-lg-6 { - width: 50%; } - - .col-lg-7 { - width: 58.33333%; } - - .col-lg-8 { - width: 66.66667%; } - - .col-lg-9 { - width: 75%; } - - .col-lg-10 { - width: 83.33333%; } - - .col-lg-11 { - width: 91.66667%; } - - .col-lg-12 { - width: 100%; } - - .col-lg-push-0 { - left: auto; } - - .col-lg-push-1 { - left: 8.33333%; } - - .col-lg-push-2 { - left: 16.66667%; } - - .col-lg-push-3 { - left: 25%; } - - .col-lg-push-4 { - left: 33.33333%; } - - .col-lg-push-5 { - left: 41.66667%; } - - .col-lg-push-6 { - left: 50%; } - - .col-lg-push-7 { - left: 58.33333%; } - - .col-lg-push-8 { - left: 66.66667%; } - - .col-lg-push-9 { - left: 75%; } - - .col-lg-push-10 { - left: 83.33333%; } - - .col-lg-push-11 { - left: 91.66667%; } - - .col-lg-pull-0 { - right: auto; } - - .col-lg-pull-1 { - right: 8.33333%; } - - .col-lg-pull-2 { - right: 16.66667%; } - - .col-lg-pull-3 { - right: 25%; } - - .col-lg-pull-4 { - right: 33.33333%; } - - .col-lg-pull-5 { - right: 41.66667%; } - - .col-lg-pull-6 { - right: 50%; } - - .col-lg-pull-7 { - right: 58.33333%; } - - .col-lg-pull-8 { - right: 66.66667%; } - - .col-lg-pull-9 { - right: 75%; } - - .col-lg-pull-10 { - right: 83.33333%; } - - .col-lg-pull-11 { - right: 91.66667%; } - - .col-lg-offset-0 { - margin-left: 0; } - - .col-lg-offset-1 { - margin-left: 8.33333%; } - - .col-lg-offset-2 { - margin-left: 16.66667%; } - - .col-lg-offset-3 { - margin-left: 25%; } - - .col-lg-offset-4 { - margin-left: 33.33333%; } - - .col-lg-offset-5 { - margin-left: 41.66667%; } - - .col-lg-offset-6 { - margin-left: 50%; } - - .col-lg-offset-7 { - margin-left: 58.33333%; } - - .col-lg-offset-8 { - margin-left: 66.66667%; } - - .col-lg-offset-9 { - margin-left: 75%; } - - .col-lg-offset-10 { - margin-left: 83.33333%; } - - .col-lg-offset-11 { - margin-left: 91.66667%; } } p { margin: 0 0 10px; } @@ -1935,7 +1339,7 @@ select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333; + outline: thin dotted #333333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -2014,11 +1418,12 @@ input[type="checkbox"][readonly] { height: 28px; border-radius: 50%; background-color: white; - transition: -webkit-transform 0.1s ease-in-out; } + transition: -webkit-transform 0.1s ease-in-out; + /* used to create a larger hit area to slide the handle */ } .toggle .handle:before { position: absolute; - content: '.'; - color: transparent; + content: " "; + display: table; left: -14px; top: -11px; padding: 14px 30px; } @@ -2256,7 +1661,7 @@ input[type="checkbox"][readonly] { border: none; background: none; } .button.button-icon:active, .button.button-icon.active { - text-shadow: 0px 0px 10px #fff; + text-shadow: 0px 0px 10px white; box-shadow: none; background: none; } @@ -2439,7 +1844,7 @@ a.button { width: 100%; background-color: white; border-radius: 2px; - border: 1px solid #ddd; } + border: 1px solid #dddddd; } .card-header { padding: 10px; diff --git a/scss/ionic-ios7/ionic-ios7.scss b/scss/ionic-ios7/ionic-ios7.scss index 8966bcce27..66682bc04e 100644 --- a/scss/ionic-ios7/ionic-ios7.scss +++ b/scss/ionic-ios7/ionic-ios7.scss @@ -11,7 +11,6 @@ "../ionic/scaffolding", "../ionic/platform", "../ionic/util", - "../ionic/grid", "../ionic/type", // Nav diff --git a/scss/ionic/_grid.scss b/scss/ionic/_grid.scss deleted file mode 100644 index 763f03c877..0000000000 --- a/scss/ionic/_grid.scss +++ /dev/null @@ -1,346 +0,0 @@ -// -// Grid system -// -------------------------------------------------- - - -// Set the container width, and override it for fixed navbars in media queries -.container { - @include container-fixed(); -} - -// mobile first defaults -.row { - @include make-row(); -} - -// Common styles for small and large grid columns -.col-xs-1, -.col-xs-2, -.col-xs-3, -.col-xs-4, -.col-xs-5, -.col-xs-6, -.col-xs-7, -.col-xs-8, -.col-xs-9, -.col-xs-10, -.col-xs-11, -.col-xs-12, -.col-sm-1, -.col-sm-2, -.col-sm-3, -.col-sm-4, -.col-sm-5, -.col-sm-6, -.col-sm-7, -.col-sm-8, -.col-sm-9, -.col-sm-10, -.col-sm-11, -.col-sm-12, -.col-md-1, -.col-md-2, -.col-md-3, -.col-md-4, -.col-md-5, -.col-md-6, -.col-md-7, -.col-md-8, -.col-md-9, -.col-md-10, -.col-md-11, -.col-md-12, -.col-lg-1, -.col-lg-2, -.col-lg-3, -.col-lg-4, -.col-lg-5, -.col-lg-6, -.col-lg-7, -.col-lg-8, -.col-lg-9, -.col-lg-10, -.col-lg-11, -.col-lg-12 { - position: relative; - padding-right: ($grid-gutter-width / 2); - // Inner gutter via padding - padding-left: ($grid-gutter-width / 2); - // Prevent columns from collapsing when empty - min-height: 1px; -} - - -// Extra small grid -// -// Grid classes for extra small devices like smartphones. No offset, push, or -// pull classes are present here due to the size of the target. -// -// Note that `.col-xs-12` doesn't get floated on purpose—there's no need since -// it's full-width. - -.col-xs-1, -.col-xs-2, -.col-xs-3, -.col-xs-4, -.col-xs-5, -.col-xs-6, -.col-xs-7, -.col-xs-8, -.col-xs-9, -.col-xs-10, -.col-xs-11 { - float: left; -} -.col-xs-1 { width: percentage((1 / $grid-columns)); } -.col-xs-2 { width: percentage((2 / $grid-columns)); } -.col-xs-3 { width: percentage((3 / $grid-columns)); } -.col-xs-4 { width: percentage((4 / $grid-columns)); } -.col-xs-5 { width: percentage((5 / $grid-columns)); } -.col-xs-6 { width: percentage((6 / $grid-columns)); } -.col-xs-7 { width: percentage((7 / $grid-columns)); } -.col-xs-8 { width: percentage((8 / $grid-columns)); } -.col-xs-9 { width: percentage((9 / $grid-columns)); } -.col-xs-10 { width: percentage((10/ $grid-columns)); } -.col-xs-11 { width: percentage((11/ $grid-columns)); } -.col-xs-12 { width: 100%; } - - -// Small grid -// -// Columns, offsets, pushes, and pulls for the small device range, from phones -// to tablets. -// -// Note that `.col-sm-12` doesn't get floated on purpose—there's no need since -// it's full-width. - -@media (min-width: $screen-tablet) { - .container { - max-width: $container-tablet; - } - - .col-sm-1, - .col-sm-2, - .col-sm-3, - .col-sm-4, - .col-sm-5, - .col-sm-6, - .col-sm-7, - .col-sm-8, - .col-sm-9, - .col-sm-10, - .col-sm-11 { - float: left; - } - .col-sm-1 { width: percentage((1 / $grid-columns)); } - .col-sm-2 { width: percentage((2 / $grid-columns)); } - .col-sm-3 { width: percentage((3 / $grid-columns)); } - .col-sm-4 { width: percentage((4 / $grid-columns)); } - .col-sm-5 { width: percentage((5 / $grid-columns)); } - .col-sm-6 { width: percentage((6 / $grid-columns)); } - .col-sm-7 { width: percentage((7 / $grid-columns)); } - .col-sm-8 { width: percentage((8 / $grid-columns)); } - .col-sm-9 { width: percentage((9 / $grid-columns)); } - .col-sm-10 { width: percentage((10/ $grid-columns)); } - .col-sm-11 { width: percentage((11/ $grid-columns)); } - .col-sm-12 { width: 100%; } - - // Push and pull columns for source order changes - .col-sm-push-1 { left: percentage((1 / $grid-columns)); } - .col-sm-push-2 { left: percentage((2 / $grid-columns)); } - .col-sm-push-3 { left: percentage((3 / $grid-columns)); } - .col-sm-push-4 { left: percentage((4 / $grid-columns)); } - .col-sm-push-5 { left: percentage((5 / $grid-columns)); } - .col-sm-push-6 { left: percentage((6 / $grid-columns)); } - .col-sm-push-7 { left: percentage((7 / $grid-columns)); } - .col-sm-push-8 { left: percentage((8 / $grid-columns)); } - .col-sm-push-9 { left: percentage((9 / $grid-columns)); } - .col-sm-push-10 { left: percentage((10/ $grid-columns)); } - .col-sm-push-11 { left: percentage((11/ $grid-columns)); } - - .col-sm-pull-1 { right: percentage((1 / $grid-columns)); } - .col-sm-pull-2 { right: percentage((2 / $grid-columns)); } - .col-sm-pull-3 { right: percentage((3 / $grid-columns)); } - .col-sm-pull-4 { right: percentage((4 / $grid-columns)); } - .col-sm-pull-5 { right: percentage((5 / $grid-columns)); } - .col-sm-pull-6 { right: percentage((6 / $grid-columns)); } - .col-sm-pull-7 { right: percentage((7 / $grid-columns)); } - .col-sm-pull-8 { right: percentage((8 / $grid-columns)); } - .col-sm-pull-9 { right: percentage((9 / $grid-columns)); } - .col-sm-pull-10 { right: percentage((10/ $grid-columns)); } - .col-sm-pull-11 { right: percentage((11/ $grid-columns)); } - - // Offsets - .col-sm-offset-1 { margin-left: percentage((1 / $grid-columns)); } - .col-sm-offset-2 { margin-left: percentage((2 / $grid-columns)); } - .col-sm-offset-3 { margin-left: percentage((3 / $grid-columns)); } - .col-sm-offset-4 { margin-left: percentage((4 / $grid-columns)); } - .col-sm-offset-5 { margin-left: percentage((5 / $grid-columns)); } - .col-sm-offset-6 { margin-left: percentage((6 / $grid-columns)); } - .col-sm-offset-7 { margin-left: percentage((7 / $grid-columns)); } - .col-sm-offset-8 { margin-left: percentage((8 / $grid-columns)); } - .col-sm-offset-9 { margin-left: percentage((9 / $grid-columns)); } - .col-sm-offset-10 { margin-left: percentage((10/ $grid-columns)); } - .col-sm-offset-11 { margin-left: percentage((11/ $grid-columns)); } -} - - -// Medium grid -// -// Columns, offsets, pushes, and pulls for the desktop device range. -// -// Note that `.col-md-12` doesn't get floated on purpose—there's no need since -// it's full-width. - -@media (min-width: $screen-desktop) { - .container { - max-width: $container-desktop; - } - .col-md-1, - .col-md-2, - .col-md-3, - .col-md-4, - .col-md-5, - .col-md-6, - .col-md-7, - .col-md-8, - .col-md-9, - .col-md-10, - .col-md-11 { - float: left; - } - .col-md-1 { width: percentage((1 / $grid-columns)); } - .col-md-2 { width: percentage((2 / $grid-columns)); } - .col-md-3 { width: percentage((3 / $grid-columns)); } - .col-md-4 { width: percentage((4 / $grid-columns)); } - .col-md-5 { width: percentage((5 / $grid-columns)); } - .col-md-6 { width: percentage((6 / $grid-columns)); } - .col-md-7 { width: percentage((7 / $grid-columns)); } - .col-md-8 { width: percentage((8 / $grid-columns)); } - .col-md-9 { width: percentage((9 / $grid-columns)); } - .col-md-10 { width: percentage((10/ $grid-columns)); } - .col-md-11 { width: percentage((11/ $grid-columns)); } - .col-md-12 { width: 100%; } - - // Push and pull columns for source order changes - .col-md-push-0 { left: auto; } - .col-md-push-1 { left: percentage((1 / $grid-columns)); } - .col-md-push-2 { left: percentage((2 / $grid-columns)); } - .col-md-push-3 { left: percentage((3 / $grid-columns)); } - .col-md-push-4 { left: percentage((4 / $grid-columns)); } - .col-md-push-5 { left: percentage((5 / $grid-columns)); } - .col-md-push-6 { left: percentage((6 / $grid-columns)); } - .col-md-push-7 { left: percentage((7 / $grid-columns)); } - .col-md-push-8 { left: percentage((8 / $grid-columns)); } - .col-md-push-9 { left: percentage((9 / $grid-columns)); } - .col-md-push-10 { left: percentage((10/ $grid-columns)); } - .col-md-push-11 { left: percentage((11/ $grid-columns)); } - - .col-md-pull-0 { right: auto; } - .col-md-pull-1 { right: percentage((1 / $grid-columns)); } - .col-md-pull-2 { right: percentage((2 / $grid-columns)); } - .col-md-pull-3 { right: percentage((3 / $grid-columns)); } - .col-md-pull-4 { right: percentage((4 / $grid-columns)); } - .col-md-pull-5 { right: percentage((5 / $grid-columns)); } - .col-md-pull-6 { right: percentage((6 / $grid-columns)); } - .col-md-pull-7 { right: percentage((7 / $grid-columns)); } - .col-md-pull-8 { right: percentage((8 / $grid-columns)); } - .col-md-pull-9 { right: percentage((9 / $grid-columns)); } - .col-md-pull-10 { right: percentage((10/ $grid-columns)); } - .col-md-pull-11 { right: percentage((11/ $grid-columns)); } - - // Offsets - .col-md-offset-0 { margin-left: 0; } - .col-md-offset-1 { margin-left: percentage((1 / $grid-columns)); } - .col-md-offset-2 { margin-left: percentage((2 / $grid-columns)); } - .col-md-offset-3 { margin-left: percentage((3 / $grid-columns)); } - .col-md-offset-4 { margin-left: percentage((4 / $grid-columns)); } - .col-md-offset-5 { margin-left: percentage((5 / $grid-columns)); } - .col-md-offset-6 { margin-left: percentage((6 / $grid-columns)); } - .col-md-offset-7 { margin-left: percentage((7 / $grid-columns)); } - .col-md-offset-8 { margin-left: percentage((8 / $grid-columns)); } - .col-md-offset-9 { margin-left: percentage((9 / $grid-columns)); } - .col-md-offset-10 { margin-left: percentage((10/ $grid-columns)); } - .col-md-offset-11 { margin-left: percentage((11/ $grid-columns)); } -} - - -// Large grid -// -// Columns, offsets, pushes, and pulls for the large desktop device range. -// -// Note that `.col-lg-12` doesn't get floated on purpose—there's no need since -// it's full-width. - -@media (min-width: $screen-lg-desktop) { - .container { - max-width: $container-lg-desktop; - } - - .col-lg-1, - .col-lg-2, - .col-lg-3, - .col-lg-4, - .col-lg-5, - .col-lg-6, - .col-lg-7, - .col-lg-8, - .col-lg-9, - .col-lg-10, - .col-lg-11 { - float: left; - } - .col-lg-1 { width: percentage((1 / $grid-columns)); } - .col-lg-2 { width: percentage((2 / $grid-columns)); } - .col-lg-3 { width: percentage((3 / $grid-columns)); } - .col-lg-4 { width: percentage((4 / $grid-columns)); } - .col-lg-5 { width: percentage((5 / $grid-columns)); } - .col-lg-6 { width: percentage((6 / $grid-columns)); } - .col-lg-7 { width: percentage((7 / $grid-columns)); } - .col-lg-8 { width: percentage((8 / $grid-columns)); } - .col-lg-9 { width: percentage((9 / $grid-columns)); } - .col-lg-10 { width: percentage((10/ $grid-columns)); } - .col-lg-11 { width: percentage((11/ $grid-columns)); } - .col-lg-12 { width: 100%; } - - // Push and pull columns for source order changes - .col-lg-push-0 { left: auto; } - .col-lg-push-1 { left: percentage((1 / $grid-columns)); } - .col-lg-push-2 { left: percentage((2 / $grid-columns)); } - .col-lg-push-3 { left: percentage((3 / $grid-columns)); } - .col-lg-push-4 { left: percentage((4 / $grid-columns)); } - .col-lg-push-5 { left: percentage((5 / $grid-columns)); } - .col-lg-push-6 { left: percentage((6 / $grid-columns)); } - .col-lg-push-7 { left: percentage((7 / $grid-columns)); } - .col-lg-push-8 { left: percentage((8 / $grid-columns)); } - .col-lg-push-9 { left: percentage((9 / $grid-columns)); } - .col-lg-push-10 { left: percentage((10/ $grid-columns)); } - .col-lg-push-11 { left: percentage((11/ $grid-columns)); } - - .col-lg-pull-0 { right: auto; } - .col-lg-pull-1 { right: percentage((1 / $grid-columns)); } - .col-lg-pull-2 { right: percentage((2 / $grid-columns)); } - .col-lg-pull-3 { right: percentage((3 / $grid-columns)); } - .col-lg-pull-4 { right: percentage((4 / $grid-columns)); } - .col-lg-pull-5 { right: percentage((5 / $grid-columns)); } - .col-lg-pull-6 { right: percentage((6 / $grid-columns)); } - .col-lg-pull-7 { right: percentage((7 / $grid-columns)); } - .col-lg-pull-8 { right: percentage((8 / $grid-columns)); } - .col-lg-pull-9 { right: percentage((9 / $grid-columns)); } - .col-lg-pull-10 { right: percentage((10/ $grid-columns)); } - .col-lg-pull-11 { right: percentage((11/ $grid-columns)); } - - // Offsets - .col-lg-offset-0 { margin-left: 0; } - .col-lg-offset-1 { margin-left: percentage((1 / $grid-columns)); } - .col-lg-offset-2 { margin-left: percentage((2 / $grid-columns)); } - .col-lg-offset-3 { margin-left: percentage((3 / $grid-columns)); } - .col-lg-offset-4 { margin-left: percentage((4 / $grid-columns)); } - .col-lg-offset-5 { margin-left: percentage((5 / $grid-columns)); } - .col-lg-offset-6 { margin-left: percentage((6 / $grid-columns)); } - .col-lg-offset-7 { margin-left: percentage((7 / $grid-columns)); } - .col-lg-offset-8 { margin-left: percentage((8 / $grid-columns)); } - .col-lg-offset-9 { margin-left: percentage((9 / $grid-columns)); } - .col-lg-offset-10 { margin-left: percentage((10/ $grid-columns)); } - .col-lg-offset-11 { margin-left: percentage((11/ $grid-columns)); } -} diff --git a/scss/ionic/_mixins.scss b/scss/ionic/_mixins.scss index 0ad22c562c..2cf71ef9f0 100644 --- a/scss/ionic/_mixins.scss +++ b/scss/ionic/_mixins.scss @@ -387,133 +387,3 @@ -webkit-box-flex: $flex; -moz-box-flex: $flex; } - -// Grid System -// ----------- - -// Centered container element -@mixin container-fixed() { - margin-right: auto; - margin-left: auto; - padding-left: ($grid-gutter-width / 2); - padding-right: ($grid-gutter-width / 2); - @include clearfix(); -} - -// Creates a wrapper for a series of columns -@mixin make-row($gutter: $grid-gutter-width) { - margin-left: ($gutter / -2); - margin-right: ($gutter / -2); - @include clearfix(); -} - -// Generate the extra small columns -@mixin make-xs-column($columns, $gutter: $grid-gutter-width) { - position: relative; - float: left; - width: percentage(($columns / $grid-columns)); - // Prevent columns from collapsing when empty - min-height: 1px; - // Inner gutter via padding - padding-left: ($gutter / 2); - padding-right: ($gutter / 2); -} - -// Generate the small columns -@mixin make-sm-column($columns, $gutter: $grid-gutter-width) { - position: relative; - // Prevent columns from collapsing when empty - min-height: 1px; - // Inner gutter via padding - padding-left: ($gutter / 2); - padding-right: ($gutter / 2); - - // Calculate width based on number of columns available - @media (min-width: $screen-sm) { - float: left; - width: percentage(($columns / $grid-columns)); - } -} - -// Generate the small column offsets -@mixin make-sm-column-offset($columns) { - @media (min-width: $screen-sm) { - margin-left: percentage(($columns / $grid-columns)); - } -} -@mixin make-sm-column-push($columns) { - @media (min-width: $screen-sm) { - left: percentage(($columns / $grid-columns)); - } -} -@mixin make-sm-column-pull($columns) { - @media (min-width: $screen-sm) { - right: percentage(($columns / $grid-columns)); - } -} - -// Generate the medium columns -@mixin make-md-column($columns, $gutter: $grid-gutter-width) { - position: relative; - // Prevent columns from collapsing when empty - min-height: 1px; - // Inner gutter via padding - padding-left: ($gutter / 2); - padding-right: ($gutter / 2); - - // Calculate width based on number of columns available - @media (min-width: $screen-md) { - float: left; - width: percentage(($columns / $grid-columns)); - } -} - -// Generate the large column offsets -@mixin make-md-column-offset($columns) { - @media (min-width: $screen-md) { - margin-left: percentage(($columns / $grid-columns)); - } -} -@mixin make-md-column-push($columns) { - @media (min-width: $screen-md) { - left: percentage(($columns / $grid-columns)); - } -} -@mixin make-md-column-pull($columns) { - @media (min-width: $screen-md) { - right: percentage(($columns / $grid-columns)); - } -} - -// Generate the large columns -@mixin make-lg-column($columns, $gutter: $grid-gutter-width) { - position: relative; - // Prevent columns from collapsing when empty - min-height: 1px; - // Inner gutter via padding - padding-left: ($gutter / 2); - padding-right: ($gutter / 2); - - // Calculate width based on number of columns available - @media (min-width: $screen-lg) { - float: left; - width: percentage(($columns / $grid-columns)); - } -} - -// Generate the large column offsets -@mixin make-lg-column-offset($columns) { - @media (min-width: $screen-lg) { - margin-left: percentage(($columns / $grid-columns)); - } -} -@mixin make-lg-column-push($columns) { - @media (min-width: $screen-lg) { - left: percentage(($columns / $grid-columns)); - } -} -@mixin make-lg-column-pull($columns) { - @media (min-width: $screen-lg) { - right: percentage(($columns / $grid-columns)); - } -} diff --git a/scss/ionic/ionic.scss b/scss/ionic/ionic.scss index d9547ae3a0..283c011635 100644 --- a/scss/ionic/ionic.scss +++ b/scss/ionic/ionic.scss @@ -11,7 +11,6 @@ "reset", "scaffolding", "util", - "grid", "type", // Action Sheet