From 7ecca98c5036794d977daea896c7f8b636359598 Mon Sep 17 00:00:00 2001 From: Ben Sperry Date: Sun, 6 Oct 2013 15:35:24 -0500 Subject: [PATCH] committnig in order to sync branch --- dist/ionic-ios7.css | 1 + dist/ionic.css | 1 + ionix.sublime-project | 8 ++ ionix.sublime-workspace | 203 ++++++++++++++++++++++++++++++++++++ scss/ionic/_animations.scss | 3 + 5 files changed, 216 insertions(+) create mode 100644 ionix.sublime-project create mode 100644 ionix.sublime-workspace diff --git a/dist/ionic-ios7.css b/dist/ionic-ios7.css index ddc316d8ad..aeeca0cb7a 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. diff --git a/dist/ionic.css b/dist/ionic.css index 61d06fbd1b..6b034ee7ba 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"); diff --git a/ionix.sublime-project b/ionix.sublime-project new file mode 100644 index 0000000000..c424f9349a --- /dev/null +++ b/ionix.sublime-project @@ -0,0 +1,8 @@ +{ + "folders": + [ + { + "path": "/Users/ben/git/ionic" + } + ] +} diff --git a/ionix.sublime-workspace b/ionix.sublime-workspace new file mode 100644 index 0000000000..cc3b788e7d --- /dev/null +++ b/ionix.sublime-workspace @@ -0,0 +1,203 @@ +{ + "auto_complete": + { + "selected_items": + [ + [ + "siz", + "font-size" + ] + ] + }, + "buffers": + [ + ], + "build_system": "", + "command_palette": + { + "height": 0.0, + "selected_items": + [ + ], + "width": 0.0 + }, + "console": + { + "height": 0.0 + }, + "distraction_free": + { + "menu_visible": true, + "show_minimap": false, + "show_open_files": false, + "show_tabs": false, + "side_bar_visible": false, + "status_bar_visible": false + }, + "file_history": + [ + "/Users/ben/git/framework-prototypes/scss/framework/theme/default/_variables.scss", + "/Users/ben/git/ionic-site/scss/_docs.scss", + "/Users/ben/git/framework-prototypes/scss/framework/structure/_mixins.scss", + "/Users/ben/git/framework-prototypes/scss/framework/theme/default/_button.scss", + "/Users/ben/git/framework-prototypes/scss/framework/structure/_button.scss", + "/Users/ben/git/ionic-site/css/bootstrap.css", + "/Users/ben/git/ionic-site/scss/_homepage.scss", + "/Users/ben/Library/Application Support/Sublime Text 2/Packages/User/Preferences.sublime-settings", + "/Users/ben/git/framework-prototypes/Makefile", + "/Users/ben/git/mobilemaker/lib/sass/bootstrap/_navbar.scss", + "/Users/ben/git/mobilemaker/mobilemaker/templates/site/customers.html", + "/Users/ben/git/mobilemaker/lib/sass/site/_customers.scss", + "/Users/ben/git/mobilemaker/mobilemaker/templates/site/educational.html", + "/Users/ben/git/mobilemaker/mobilemaker/templates/site/nonprofit.html", + "/Users/ben/git/mobilemaker/mobilemaker/templates/site/features.html", + "/Users/ben/git/mobilemaker/lib/sass/site/_about.scss", + "/Users/ben/git/mobilemaker/mobilemaker/templates/site/about.html", + "/Users/ben/git/mobilemaker/lib/sass/site/_educational.scss", + "/Users/ben/git/mobilemaker/lib/sass/site/_signup.scss", + "/Users/ben/git/mobilemaker/lib/sass/site/_features.scss", + "/Users/ben/git/mobilemaker/lib/sass/site/_plans.scss", + "/Users/ben/git/mobilemaker/mobilemaker/templates/site/plans.html", + "/Users/ben/git/mobilemaker/lib/sass/site/_colors.scss", + "/Users/ben/git/mobilemaker/lib/sass/site/_support.scss", + "/Users/ben/git/mobilemaker/mobilemaker/templates/site/signup.html", + "/Users/ben/git/mobilemaker/lib/sass/site.scss", + "/Users/ben/git/mobilemaker/lib/sass/site/_assets.scss", + "/Users/ben/git/mobilemaker/lib/sass/bootstrap/_navs.scss", + "/Users/ben/git/mobilemaker/lib/sass/bootstrap/_buttons.scss", + "/Users/ben/git/mobilemaker/lib/sass/site/_site.scss", + "/Users/ben/Dropbox/codiqa/ website/2.0/template/index.html", + "/Users/ben/Dropbox/ ben_sperry/web/2013/css/main.css", + "/Users/ben/Dropbox/codiqa/ website/2.0/template/style.css", + "/Users/ben/Dropbox/codiqa/themes/custom_5-30-13/jquery.mobile-1.3.1/example.html", + "/Users/ben/Downloads/jquery-mobile-theme-164209-0/themes/jqm.css" + ], + "find": + { + "height": 35.0 + }, + "find_in_files": + { + "height": 0.0, + "where_history": + [ + ] + }, + "find_state": + { + "case_sensitive": false, + "find_history": + [ + "p", + "body", + "h4", + "p {", + ".p", + "cta", + "love", + "navbar-brand", + "codiqa", + "green", + "btn", + "green", + "logo", + "tree", + ".btn-success", + "btn", + "free", + ".form-control", + "form", + "border-radius", + "huge", + "tn btn-transparent btn-huge", + "green", + "\n}", + ".container", + "fieldEmail", + "ui-li", + "box-shadow", + "ui-btn-down-c ui-shadow", + "0", + ".ui-bar-a .ui-shadow, .ui-bar-b .ui-shadow, .ui-bar-c .ui-shadow", + ".ui-btn-inner" + ], + "highlight": true, + "in_selection": false, + "preserve_case": false, + "regex": false, + "replace_history": + [ + ], + "reverse": false, + "show_context": true, + "use_buffer2": true, + "whole_word": false, + "wrap": true + }, + "groups": + [ + { + "sheets": + [ + ] + } + ], + "incremental_find": + { + "height": 0.0 + }, + "input": + { + "height": 0.0 + }, + "layout": + { + "cells": + [ + [ + 0, + 0, + 1, + 1 + ] + ], + "cols": + [ + 0.0, + 1.0 + ], + "rows": + [ + 0.0, + 1.0 + ] + }, + "menu_visible": true, + "replace": + { + "height": 0.0 + }, + "save_all_on_build": true, + "select_file": + { + "height": 0.0, + "selected_items": + [ + ], + "width": 0.0 + }, + "select_project": + { + "height": 0.0, + "selected_items": + [ + ], + "width": 0.0 + }, + "show_minimap": true, + "show_open_files": true, + "show_tabs": true, + "side_bar_visible": true, + "side_bar_width": 193.0, + "status_bar_visible": true +} diff --git a/scss/ionic/_animations.scss b/scss/ionic/_animations.scss index c138f0e2f1..715ce6d64c 100644 --- a/scss/ionic/_animations.scss +++ b/scss/ionic/_animations.scss @@ -6,10 +6,13 @@ $bezier-function: cubic-bezier(.1, .7, .1, 1); // Start it down low -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); + -webkit-transition: -webkit-transform 0.25s, opacity 0.25s; transition: -webkit-transform 0.25s, opacity 0.25s; + -webkit-transition-timing-function: $bezier-function; transition-timing-function: $bezier-function; + -webkit-animation-fill-mode: forwards; }