mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-07 06:57:02 +08:00
Merge branch 'master' of https://github.com/driftyco/ionic
This commit is contained in:
Max Lynch
8
dist/css/ionic.css
vendored
8
dist/css/ionic.css
vendored
@ -1246,7 +1246,7 @@ sub {
|
||||
fieldset {
|
||||
margin: 0 2px;
|
||||
padding: 0.35em 0.625em 0.75em;
|
||||
border: 1px solid silver; }
|
||||
border: 1px solid #c0c0c0; }
|
||||
|
||||
/**
|
||||
* 1. Correct `color` not being inherited in IE 8/9.
|
||||
@ -2455,7 +2455,7 @@ select:focus,
|
||||
input[type="file"]:focus,
|
||||
input[type="radio"]:focus,
|
||||
input[type="checkbox"]:focus {
|
||||
outline: thin dotted #333333;
|
||||
outline: thin dotted #333;
|
||||
outline: 5px auto -webkit-focus-ring-color;
|
||||
outline-offset: -2px; }
|
||||
|
||||
@ -2777,7 +2777,7 @@ input[type="checkbox"][readonly] {
|
||||
border: none;
|
||||
background: none; }
|
||||
.button.button-icon:active, .button.button-icon.active {
|
||||
text-shadow: 0px 0px 10px white;
|
||||
text-shadow: 0px 0px 10px #fff;
|
||||
box-shadow: none;
|
||||
background: none; }
|
||||
|
||||
@ -2960,7 +2960,7 @@ a.button {
|
||||
width: 100%;
|
||||
background-color: white;
|
||||
border-radius: 2px;
|
||||
border: 1px solid #dddddd; }
|
||||
border: 1px solid #ddd; }
|
||||
|
||||
.card-header {
|
||||
padding: 10px;
|
||||
|
||||
14
ionix.sublime-project
Normal file
14
ionix.sublime-project
Normal file
@ -0,0 +1,14 @@
|
||||
{
|
||||
"folders":
|
||||
[
|
||||
{
|
||||
"path": "/Users/ben/git/ionic"
|
||||
},
|
||||
{
|
||||
"path": "/Users/ben/git/ionic-site"
|
||||
},
|
||||
{
|
||||
"path": "/Users/ben/git/ionicons"
|
||||
}
|
||||
]
|
||||
}
|
||||
240
ionix.sublime-workspace
Normal file
240
ionix.sublime-workspace
Normal file
@ -0,0 +1,240 @@
|
||||
{
|
||||
"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/ionic/example/toderp2/index.html",
|
||||
"/Users/ben/git/ionic/scss/ionic/_animations.scss",
|
||||
"/Users/ben/git/ionic/scss/ionic/_actionSheet.scss",
|
||||
"/Users/ben/git/ionic/test/modals.html",
|
||||
"/Users/ben/git/ionic/scss/ionic/_modal.scss",
|
||||
"/Users/ben/git/ionic/scss/ionic/_button.scss",
|
||||
"/Users/ben/git/ionic/scss/ionic/_mixins.scss",
|
||||
"/Users/ben/git/ionic-site/index.html",
|
||||
"/Users/ben/git/ionic-site/scss/_homepage.scss",
|
||||
"/Users/ben/git/ionic-site/scss/_blog.scss",
|
||||
"/Users/ben/git/ionic-site/_layouts/blog.html",
|
||||
"/Users/ben/git/ionic-site/_posts/2013-09-30-announcing-ionic.markdown",
|
||||
"/Users/ben/git/ionic-site/_layouts/docs.html",
|
||||
"/Users/ben/git/ionic-site/_layouts/getting-started.html",
|
||||
"/Users/ben/git/ionicons/stylesheet.css",
|
||||
"/Users/ben/git/ionic-site/scss/ionic.scss",
|
||||
"/Users/ben/git/ionicons/css/stylesheet.css",
|
||||
"/Users/ben/git/ionic-site/_site/img/ionic_logo.svg",
|
||||
"/Users/ben/git/ionicons/index.html",
|
||||
"/Users/ben/git/ionic-site/scss/_syntax.scss",
|
||||
"/Users/ben/git/ionic-site/_posts/2013-09-30-welcome.markdown",
|
||||
"/Users/ben/git/ionic-site/README.md",
|
||||
"/Users/ben/git/ionic/test/buttons.html",
|
||||
"/Users/ben/git/ionic/scss/ionic/_variables.scss",
|
||||
"/Users/ben/git/ionic/scss/ionic/ionic.scss",
|
||||
"/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/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":
|
||||
[
|
||||
"checkm",
|
||||
"mic",
|
||||
"plus",
|
||||
"play",
|
||||
"person",
|
||||
"pause",
|
||||
"minus",
|
||||
"drag",
|
||||
"navicon",
|
||||
"upload",
|
||||
"font-size",
|
||||
"icons",
|
||||
"12px",
|
||||
"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
|
||||
}
|
||||
Reference in New Issue
Block a user