javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,040 Commits 194 Branches 964 Tags
b6a73f08071017e82d471dc12ac94de36649e466
Commit Graph

2040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Lynch
cbed88d5e7 Fixed button and header colors 2013-09-10 11:06:12 -05:00
Adam Bradley
8ba2411eb0 form row fixes 2013-09-10 11:00:28 -05:00
Max Lynch
5a35604cbd Merge branch 'master' of https://github.com/driftyco/ionic 
Conflicts:
	dist/ionic.css
 2013-09-10 10:48:09 -05:00
Max Lynch
7a57d2d1c5 Icon-only buttons and rightside button groups 2013-09-10 10:45:13 -05:00
Adam Bradley
f342b725dd renamed scss variables 2013-09-10 10:41:11 -05:00
Adam Bradley
d7dc50539c form group rounded corners 2013-09-10 08:44:38 -05:00
Adam Bradley
1ee6027ff8 text input updates 2013-09-09 20:43:42 -05:00
Max Lynch
30718279a5 Nice login style 2013-09-09 19:56:12 -05:00
Adam Bradley
78ab65c2b7 conflict fix 
Conflicts:
	dist/ionic.css
	scss/ionic/_structure-variables.scss
 2013-09-09 19:09:52 -05:00
Adam Bradley
c18dded02c text inputs 2013-09-09 19:06:22 -05:00
Max Lynch
a7101adcba Button on right side 2013-09-09 17:36:35 -05:00
Max Lynch
58d13c4af8 Header button love 2013-09-09 17:29:30 -05:00
Max Lynch
c7b0728fad Progress on header bar box sizing 2013-09-09 16:44:55 -05:00
Max Lynch
4a963f41f3 Merge branch 'master' of https://github.com/driftyco/ionic 
Conflicts:
	dist/ionic.css
 2013-09-09 15:45:11 -05:00
Max Lynch
c02effede2 Headers and some segmented stuff 2013-09-09 15:44:41 -05:00
Adam Bradley
debb795402 content layout and forms 2013-09-09 15:39:54 -05:00
Adam Bradley
4d02a3e268 make watch 2013-09-09 12:20:20 -05:00
Max Lynch
2d14bdc2f7 Small header tweak 2013-09-09 12:09:22 -05:00
Adam Bradley
bcaef572fe removing compass 2013-09-09 12:06:18 -05:00
Max Lynch
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
Adam Bradley
6749883b21 changed panels to cards 2013-09-09 11:50:22 -05:00
Adam Bradley
90af1d241d moved colors to themes 2013-09-09 11:50:08 -05:00
Adam Bradley
04dcb645d4 compass config, css refererence updates 2013-09-09 11:40:12 -05:00
Max Lynch
cf7cd9cb3a Start task in own task 2013-09-08 22:47:18 -05:00
Max Lynch
46f4da7118 Task shit 2013-09-08 22:09:57 -05:00
Max Lynch
6ae11762f0 Extending ionic tool to have multiple task support. 2013-09-08 21:52:33 -05:00
Max Lynch
6c89a3d68e Having fun with ASCII Art 
Yay
 2013-09-08 19:25:48 -05:00
Max Lynch
f9ea86ce63 Ionic tool - write template folder correctly. 2013-09-08 18:34:11 -05:00
Max Lynch
99dd52b69b Small license change 2013-09-08 17:10:50 -05:00
Max Lynch
6457b30bc8 Updated license to Apache 2.0 
We decided it's probably a better fit.
 2013-09-08 16:25:01 -05:00
Max Lynch
90f806d469 Updated node modules, ionic build tool 
Starting working on the ionic build tool.
 2013-09-08 13:44:39 -05:00
Max Lynch
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
Max Lynch
8261b2c89b Updated Readme a bit 2013-09-08 13:04:45 -05:00
Max Lynch
16c3b757b2 Added hacking libraries to Karma test file. 2013-09-08 12:43:26 -05:00
Max Lynch
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
Max Lynch
56f7ee5c9c Messing with hack example of TabBarController and Test 2013-09-08 01:35:54 -05:00
Max Lynch
4f9cd01810 Created chemistry tool 2013-09-06 19:19:16 -05:00
Max Lynch
962a3a60a2 Some angular stuff 2013-09-05 16:28:13 -05:00
Max Lynch
f62000254d Correct nested directives and shared scope thing 2013-09-05 11:04:59 -05:00
Max Lynch
4f7e87bfcc Random angular stuff and testing things 2013-09-04 17:00:29 -05:00
Max Lynch
7794ce1a7a More doc shit 2013-09-03 17:09:23 -05:00
Max Lynch
0a8b8340c5 Dark button 2013-09-03 15:11:54 -05:00
Max Lynch
ddb6cc6737 Basic docs stuff 2013-09-03 15:05:42 -05:00
Max Lynch
038d5eb7ce Updated landing page of docs 2013-09-03 11:44:54 -05:00
Max Lynch
f3cd9b6cd0 Messing with bars 2013-09-03 11:41:52 -05:00
Max Lynch
568f13f7b7 App possible 2013-09-01 19:29:42 -05:00
Max Lynch
527e0d3f51 Toderp 2013-09-01 19:25:36 -05:00
Max Lynch
66979e11fe Added basic toderp 2013-09-01 17:00:05 -05:00
Max Lynch
69fb09316a Added Bootstrap 3 style panels 2013-09-01 10:25:47 -05:00
Max Lynch
344f69cc5f Menu 2013-08-31 22:37:10 -05:00