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
3,964 Commits 194 Branches 964 Tags
aba7c155f95f812604ce3032603333fafeaa361f
Commit Graph

3964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brandy Carney
aba7c155f9 Merge branch '2.0' into loading 2016-04-02 12:56:10 -04:00
Brandy Carney
6125e1c622 Merge pull request #5939 from driftyco/menutoggle-edge-fix 
fix(button): normalize generated button class names
 2016-04-01 16:35:54 -04:00
Brandy Carney
783a4e5029 Merge pull request #5992 from manucorporat/ion-fixed 
feat(ion-content): adds <ion-fixed> for non-scrollable page content
 2016-04-01 15:58:14 -04:00
Brandy Carney
e2e92b80ae Merge pull request #5995 from roblouie/patch-1 
fix(segment): display activated style outside toolbar
 2016-04-01 15:12:21 -04:00
Brandy Carney
ddb885b42f Merge branch '2.0' into loading 2016-04-01 15:05:48 -04:00
Brandy Carney
53bebc74ea test(loading): add another page for navigation 2016-04-01 15:05:40 -04:00
perry
9613881236 chore(dgeni): debugging fix this doc link rel to TS 1.8 path bug 2016-04-01 13:18:08 -05:00
perry
50d2d0875b chore(dgeni): TS 1.8 dgeni tweak and CI perf improvements 2016-04-01 13:07:18 -05:00
Brandy Carney
128a8342e1 test(loading): add another page to the loading test 2016-04-01 14:00:36 -04:00
Brandy Carney
d21a682bad docs(loading): remove the enableBackdropDismiss and update demo 
references #5426
 2016-04-01 13:37:47 -04:00
perry
ff17cf836c chore(dgeni): some docs don't have a relativePath 2016-04-01 12:30:52 -05:00
Brandy Carney
3bce7ba2dc docs(demos): add API demos for loading indicator 
references #5426
 2016-04-01 13:14:06 -04:00
Brandy Carney
dae37e7d9c feat(loading): add ability to hide spinner in the config or options 
tweak css to add a max width to the loading indicator

references #5426
 2016-04-01 13:13:43 -04:00
perry
b832b4c502 docs(dgeni): fix doc update link 2016-04-01 11:57:31 -05:00
Adam Bradley
f30660d2fd Merge pull request #6006 from driftyco/strict-mode-fn-fix 
chore(): move nested functions out of if blocks
 2016-03-31 16:03:24 -05:00
Tim Lancina
3df1ad5192 chore(): move nested functions out of if blocks 2016-03-31 16:00:43 -05:00
Adam Bradley
55fb60e09b docs(): fix typo 2016-03-31 09:23:28 -05:00
Adam Bradley
5524acfa55 Merge remote-tracking branch 'origin/2.0' into 2.0 2016-03-31 08:58:35 -05:00
Adam Bradley
b8cb12e25e chore(): remove console.debugs 2016-03-31 08:58:08 -05:00
Adam Bradley
e31898ac19 Merge pull request #5956 from Tenvan/2.0 
chore(ts): add 'any' return types
 2016-03-30 20:14:26 -05:00
Rob
87a8f8dbc1 match syntax of ios.scss file 
Updated the syntax of the fix to match ios style
 2016-03-30 20:05:55 -05:00
Rob
b1226cbb41 segment.wp: display active style outside toolbar 
In the iOS and Android styles the segment-activated class lives directly under segment-button.  However in the Windows Phone version these styles live only under toolbar, causing the styles to not be applied properly if the ion-segment is used outside of a toolbar.
 2016-03-30 19:54:15 -05:00
Manu Mtz.-Almeida
442d135dae feat(ion-content): adds <ion-fixed> for non-scrollable page content 
closes #5987
 2016-03-30 21:07:32 +02:00
Brandy Carney
c25164943f Merge branch '2.0' into loading 2016-03-29 10:44:00 -04:00
Brandy Carney
a485cd00ed feat(loading): add loading indicator component and styles 
this is the initial commit - still needs work

references #5426
 2016-03-28 17:35:49 -04:00
Tim Lancina
5f621abfcf fix(button): normalize generated button class names 
Addresses https://github.com/driftyco/ionic/issues/5938.
 2016-03-24 18:05:41 -05:00
Adam Bradley
ba6f92b992 Merge pull request #5930 from trongrg/bugfix/ion-infinite-scroll 
fix(ion-infinite-scroll): fix error leaving page
 2016-03-24 07:29:05 -05:00
Trong Tran
05823f9e62 fix(ion-infinite-scroll): Fix error leaving page 
This fix [5760](https://github.com/driftyco/ionic/issues/5760)
 2016-03-24 18:32:22 +07:00
Adam Bradley
349c577cb9 fix(card): maintain card width when absolute positioned 2016-03-23 23:54:57 -05:00
Adam Bradley
7a827277a9 feat(img): create ion-img 
ion-img is useful for virtual scrolling. It allows ionic to control
image HTTP requests, along with controlling when images should be
rendered within the DOM.
 2016-03-23 23:51:20 -05:00
Brandy Carney
9a23a925a4 fix(toolbar): fix wp back button in toolbar 
references #5923
 2016-03-23 13:35:16 -04:00
Brandy Carney
0e91a69257 fix(searchbar): fix the border color and toolbar padding 
references #5921
 2016-03-23 13:11:13 -04:00
Brandy Carney
7dc58ef2dd fix(toolbar): fix back button for md mode 
fixes #5923
 2016-03-23 12:53:06 -04:00
Brandy Carney
5fc77b5081 chore(sass): fix linter errors 2016-03-23 12:33:56 -04:00
Brandy Carney
5ca6bf404a fix(searchbar): add padding around the floating searchbar wp 
fixes #5921
 2016-03-23 12:32:41 -04:00
Brandy Carney
30bb005ad8 fix(sass): change map-get to use color function in default themes 
references #5445
 2016-03-22 19:24:03 -04:00
Brandy Carney
8b5cf7cab6 Merge branch 'sass-color-map' into 2.0 2016-03-22 18:23:36 -04:00
Brandy Carney
487f5efe03 Merge branch '2.0' into sass-color-map 2016-03-22 18:10:13 -04:00
Brandy Carney
5f2e737904 feat(sass): add support for contrast in color map for wp mode 
BREAKING CHANGE:

Can now pass contrast to the colors map:

```
$colors-wp: (

  primary: (
    base: #327eff,
    contrast: yellow
  ),
  secondary: (
    base: #32db64,
    contrast: hotpink
  ),
  danger: #d91e18,
  light: #f4f4f4,
  dark: #222
) !default;
```

references #5445
 2016-03-22 18:07:59 -04:00
Brandy Carney
9efa3ea3e6 feat(sass): add support for contrast color in MD mode colors map 
BREAKING CHANGE:

Can now pass contrast to the colors map:

```
$colors-md: (

  primary: (
    base: #327eff,
    contrast: yellow
  ),
  secondary: (
    base: #32db64,
    contrast: hotpink
  ),
  danger: #d91e18,
  light: #f4f4f4,
  dark: #222
) !default;
```

references #5445
 2016-03-22 17:53:08 -04:00
Brandy Carney
ff1a8ac6c7 feat(sass): add the ability to pass a contrast color in the colors map to iOS 
this adds the functions necessary for the other modes as well

BREAKING CHANGE:

Can now pass contrast to the colors map:

```
$colors-ios: (

  primary: (
    base: #327eff,
    contrast: yellow
  ),
  secondary: (
    base: #32db64,
    contrast: hotpink
  ),
  danger: #d91e18,
  light: #f4f4f4,
  dark: #222
) !default;
```

references #5445
 2016-03-22 17:14:39 -04:00
Brandy Carney
210b4eda08 Merge pull request #5867 from manucorporat/fix-action-sheet-safari 
fix(action-sheet): action sheet button no longer shortens when activated in Safari
 2016-03-21 14:20:22 -04:00
Adam Bradley
29e9e595af Merge pull request #5879 from manucorporat/fix-swipeBackEnabled 
fix(Nav): fixes swipeBackEnabled as attribute
 2016-03-18 10:09:34 -05:00
Manu Mtz.-Almeida
17c38862cc fix(Nav): fixes swipeBackEnabled as attribute 
closes #5653
 2016-03-18 16:04:28 +01:00
Adam Bradley
7b1d7aa1c7 Merge pull request #5868 from abotz/patch-1 
docs(action-sheet): fix docs typo
 2016-03-17 21:30:58 -05:00
Andrew Botz
a7e699e1fc Update action-sheet.ts 
Fixed typo of 'shoule' to 'should'
 2016-03-17 20:53:49 -05:00
Manu Mtz.-Almeida
6d55abcb83 fix(action-sheet): action sheet button shortens when activated in Safari 
closes #5828
 2016-03-17 21:14:05 +01:00
Brandy Carney
3e88fe9f31 fix(input): add event emitters for blur and focus to the ion-input component 
fixes #5487
 2016-03-16 12:46:27 -04:00
Brandy Carney
904775430b docs(refresher): update docs on enabled property 2016-03-16 10:52:28 -04:00
Ralf Stich
45647c4f49 lacks return-type annotation, implicitly has an 'any' return type 
Fix for tsc with 'noImplicitAny' option
 2016-03-16 10:14:48 +01:00