183 Commits

Author SHA1 Message Date
30718279a5 Nice login style 2013-09-09 19:56:12 -05:00
78ab65c2b7 conflict fix
Conflicts:
	dist/ionic.css
	scss/ionic/_structure-variables.scss
2013-09-09 19:09:52 -05:00
c18dded02c text inputs 2013-09-09 19:06:22 -05:00
a7101adcba Button on right side 2013-09-09 17:36:35 -05:00
58d13c4af8 Header button love 2013-09-09 17:29:30 -05:00
c7b0728fad Progress on header bar box sizing 2013-09-09 16:44:55 -05:00
4a963f41f3 Merge branch 'master' of https://github.com/driftyco/ionic
Conflicts:
	dist/ionic.css
2013-09-09 15:45:11 -05:00
c02effede2 Headers and some segmented stuff 2013-09-09 15:44:41 -05:00
debb795402 content layout and forms 2013-09-09 15:39:54 -05:00
4d02a3e268 make watch 2013-09-09 12:20:20 -05:00
2d14bdc2f7 Small header tweak 2013-09-09 12:09:22 -05:00
bcaef572fe removing compass 2013-09-09 12:06:18 -05:00
0ba0343f11 Button bars and default styles for header buttons
Added a new segmented button bar that stretches, also set the default
styles for header buttons.
2013-09-09 11:59:03 -05:00
6749883b21 changed panels to cards 2013-09-09 11:50:22 -05:00
90af1d241d moved colors to themes 2013-09-09 11:50:08 -05:00
04dcb645d4 compass config, css refererence updates 2013-09-09 11:40:12 -05:00
cf7cd9cb3a Start task in own task 2013-09-08 22:47:18 -05:00
46f4da7118 Task shit 2013-09-08 22:09:57 -05:00
6ae11762f0 Extending ionic tool to have multiple task support. 2013-09-08 21:52:33 -05:00
6c89a3d68e Having fun with ASCII Art
Yay
2013-09-08 19:25:48 -05:00
f9ea86ce63 Ionic tool - write template folder correctly. 2013-09-08 18:34:11 -05:00
99dd52b69b Small license change 2013-09-08 17:10:50 -05:00
6457b30bc8 Updated license to Apache 2.0
We decided it's probably a better fit.
2013-09-08 16:25:01 -05:00
90f806d469 Updated node modules, ionic build tool
Starting working on the ionic build tool.
2013-09-08 13:44:39 -05:00
6fd0179e49 Removed page event stuff
We've decided not to model the framework off of "pages" so the page
event stuff doesn't fit. Also removed some other event stuff since we
haven't really discussed that yet.
2013-09-08 13:07:26 -05:00
8261b2c89b Updated Readme a bit 2013-09-08 13:04:45 -05:00
16c3b757b2 Added hacking libraries to Karma test file. 2013-09-08 12:43:26 -05:00
5baadf6d9f Updated to use controller list not tabs
This is more inline with iOS style, where the controllers that show
content drive the tabs, not the tab list.
2013-09-08 01:47:27 -05:00
56f7ee5c9c Messing with hack example of TabBarController and Test 2013-09-08 01:35:54 -05:00
4f9cd01810 Created chemistry tool 2013-09-06 19:19:16 -05:00
962a3a60a2 Some angular stuff 2013-09-05 16:28:13 -05:00
f62000254d Correct nested directives and shared scope thing 2013-09-05 11:04:59 -05:00
4f7e87bfcc Random angular stuff and testing things 2013-09-04 17:00:29 -05:00
7794ce1a7a More doc shit 2013-09-03 17:09:23 -05:00
0a8b8340c5 Dark button 2013-09-03 15:11:54 -05:00
ddb6cc6737 Basic docs stuff 2013-09-03 15:05:42 -05:00
038d5eb7ce Updated landing page of docs 2013-09-03 11:44:54 -05:00
f3cd9b6cd0 Messing with bars 2013-09-03 11:41:52 -05:00
568f13f7b7 App possible 2013-09-01 19:29:42 -05:00
527e0d3f51 Toderp 2013-09-01 19:25:36 -05:00
66979e11fe Added basic toderp 2013-09-01 17:00:05 -05:00
69fb09316a Added Bootstrap 3 style panels 2013-09-01 10:25:47 -05:00
344f69cc5f Menu 2013-08-31 22:37:10 -05:00
b8213934a4 Added panels 2013-08-31 22:35:47 -05:00
a2bf7f014b Docs 2013-08-31 22:05:15 -05:00
5ac9b83258 Added basic docs 2013-08-31 21:50:09 -05:00
34f7c94d1b Renamed panel to menu 2013-08-31 19:05:55 -05:00
3f84ba6b86 moved panel to menu 2013-08-31 19:01:39 -05:00
d8d0c39dcc Bar button twaks 2013-08-31 18:55:02 -05:00
279079b1ec Fixed panel buttons zindex 2013-08-31 18:49:48 -05:00