204 Commits

Author SHA1 Message Date
ccf90871f1 Very basic back and forth and splash for Toderp 2013-09-10 21:16:26 -05:00
1ca594b0cc toderp with tasks screen 2013-09-10 21:07:51 -05:00
48d4c32173 Toderp working with login and signup! 2013-09-10 20:37:41 -05:00
fc1a8270c0 Toderp shit and Angular 1.2.0rc2 2013-09-10 16:12:50 -05:00
7231a42e9f textarea 2013-09-10 15:33:37 -05:00
9dcadc5563 reorder css properties via CSScomb 2013-09-10 15:33:37 -05:00
659e0e0a9e Reorganized bar SCSS and removed flexbox from secondary
Secondary bars don't need flexbox, so they are removed.
2013-09-10 14:34:46 -05:00
2fefe19b65 renamed .form-group to .input-group 2013-09-10 14:25:43 -05:00
137a4d339c Twitter tweak 2013-09-10 13:57:26 -05:00
41ee7fbd64 Merge branch 'master' of https://github.com/driftyco/framework-prototypes
Conflicts:
	dist/ionic.css
	scss/ionic/structure/_bar.scss
2013-09-10 13:54:30 -05:00
292ff90193 css structure combine 2013-09-10 13:49:08 -05:00
d2b0f7f12a Start of test code for JS plugins 2013-09-10 11:38:32 -05:00
ef4a50e0b8 Glow for button icon 2013-09-10 11:38:20 -05:00
8faf9064f9 Fixed #15 - title z-index blocking buttons 2013-09-10 11:08:22 -05:00
cbed88d5e7 Fixed button and header colors 2013-09-10 11:06:12 -05:00
8ba2411eb0 form row fixes 2013-09-10 11:00:28 -05:00
5a35604cbd Merge branch 'master' of https://github.com/driftyco/ionic
Conflicts:
	dist/ionic.css
2013-09-10 10:48:09 -05:00
7a57d2d1c5 Icon-only buttons and rightside button groups 2013-09-10 10:45:13 -05:00
f342b725dd renamed scss variables 2013-09-10 10:41:11 -05:00
d7dc50539c form group rounded corners 2013-09-10 08:44:38 -05:00
1ee6027ff8 text input updates 2013-09-09 20:43:42 -05:00
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