From fe7bef2e81ff90d244946e4262cace6a76007303 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Fri, 27 Sep 2013 16:24:15 -0500 Subject: [PATCH] Removed some uncessary stuff --- dist/ionic-ios7.css | 4 ++-- dist/ionic.css | 14 +++++++------- dist/ionic.js | 2 +- dist/ionicIcons.css | 14 +++++++------- js/platform.js | 2 +- scss/ionic/_platform.scss | 6 +++--- scss/ionic/ionic.scss | 5 +++-- 7 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dist/ionic-ios7.css b/dist/ionic-ios7.css index b207b31b9a..175dcf2285 100644 --- a/dist/ionic-ios7.css +++ b/dist/ionic-ios7.css @@ -372,8 +372,8 @@ body { .platform-ios7 .bar { height: 64px; } - .platform-ios7 .bar .title { - line-height: 84px; } + .platform-ios7 .bar > * { + margin-top: 20px; } .platform-ios7 .has-header { top: 64px; } diff --git a/dist/ionic.css b/dist/ionic.css index febb0d2b97..e2af8193d4 100644 --- a/dist/ionic.css +++ b/dist/ionic.css @@ -370,13 +370,6 @@ body { background-color: #fff; -webkit-overflow-scrolling: touch; } -.platform-ios7 .bar { - height: 64px; } - .platform-ios7 .bar .title { - line-height: 84px; } -.platform-ios7 .has-header { - top: 64px; } - .padded { padding: 10px; } @@ -2244,3 +2237,10 @@ a.button { .slide-in-up.leave-active { -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); } + +.platform-ios7 .bar { + height: 64px; } + .platform-ios7 .bar > * { + margin-top: 20px; } +.platform-ios7 .has-header { + top: 64px; } diff --git a/dist/ionic.js b/dist/ionic.js index 5281d76a19..7b2e318da4 100644 --- a/dist/ionic.js +++ b/dist/ionic.js @@ -10,7 +10,7 @@ window.ionic = { detect: function() { var platforms = []; - var platform = this._checkPlatforms(platforms); + this._checkPlatforms(platforms); for(var i = 0; i < platforms.length; i++) { document.body.classList.add('platform-' + platforms[i]); diff --git a/dist/ionicIcons.css b/dist/ionicIcons.css index 9a7a9d3fce..c90ebcadd3 100644 --- a/dist/ionicIcons.css +++ b/dist/ionicIcons.css @@ -440,13 +440,6 @@ body { background-color: #fff; -webkit-overflow-scrolling: touch; } -.platform-ios7 .bar { - height: 64px; } - .platform-ios7 .bar .title { - line-height: 84px; } -.platform-ios7 .has-header { - top: 64px; } - .padded { padding: 10px; } @@ -2314,3 +2307,10 @@ a.button { .slide-in-up.leave-active { -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); } + +.platform-ios7 .bar { + height: 64px; } + .platform-ios7 .bar > * { + margin-top: 20px; } +.platform-ios7 .has-header { + top: 64px; } diff --git a/js/platform.js b/js/platform.js index 90aa6b7666..06b7dbf708 100644 --- a/js/platform.js +++ b/js/platform.js @@ -4,7 +4,7 @@ detect: function() { var platforms = []; - var platform = this._checkPlatforms(platforms); + this._checkPlatforms(platforms); for(var i = 0; i < platforms.length; i++) { document.body.classList.add('platform-' + platforms[i]); diff --git a/scss/ionic/_platform.scss b/scss/ionic/_platform.scss index 182f2cdb9f..96938c464d 100644 --- a/scss/ionic/_platform.scss +++ b/scss/ionic/_platform.scss @@ -1,9 +1,9 @@ .platform-ios7 { .bar { - height: 64px; + height: 64px; - .title { - line-height: 84px; + > * { + margin-top: 20px; } } diff --git a/scss/ionic/ionic.scss b/scss/ionic/ionic.scss index 114875ab88..c1c5c64051 100644 --- a/scss/ionic/ionic.scss +++ b/scss/ionic/ionic.scss @@ -8,7 +8,6 @@ // Base "reset", "scaffolding", - "platform", "util", "grid", "type", @@ -37,4 +36,6 @@ "card", // Animations - "animations"; + "animations", + + "platform";