diff --git a/gulpfile.js b/gulpfile.js index f57c423ebd..459bf680a7 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -52,19 +52,27 @@ gulp.task('clean', function(done) { del([buildConfig.dist], done); }); -gulp.task('examples', ['sass'], function() { - var exampleSrc = path.join(__dirname, 'src/components/**/examples/**/*'); +gulp.task('e2e', function() { + var e2eSrc = path.join(__dirname, 'src/components/**/test/**/*'); var templateSrc = path.join(__dirname, 'scripts/examples/index.template.html'); - var exampleDest = path.join(__dirname, 'dist/examples/'); + var e2eDest = path.join(__dirname, 'dist/e2e/'); - return gulp.src(exampleSrc) + return gulp.src(e2eSrc) .pipe(gulpif(/index.html/, wrap({ src: templateSrc }))) .pipe(rename(function(file) { - file.dirname = file.dirname.replace('/examples/', '/'); + file.dirname = file.dirname.replace('/test/', '/'); })) - .pipe(gulpif({ isFile: true }, gulp.dest(exampleDest))); + .pipe(gulpif({ isFile: true }, gulp.dest(e2eDest))); +}); + +gulp.task('e2e-watch', ['e2e'], function() { + gulp.watch(buildConfig.src.scss, ['sass']); + return gulp.watch([ + 'src/components/**/test/**/*', + buildConfig.src.examples.concat('scripts/examples/index.template.html') + ], ['e2e']); }); require('./scripts/snapshot/snapshot.task')(gulp, argv, buildConfig); @@ -86,6 +94,7 @@ gulp.task('ng2-rename', function(done) { .on('end', done); }); }); + gulp.task('ng2', ['ng2-rename'], function() { var builder = new SystemJsBuilder(); builder.config({ diff --git a/scripts/snapshot/protractor.config.js b/scripts/snapshot/protractor.config.js index 909cad15b6..fdd50d88f1 100644 --- a/scripts/snapshot/protractor.config.js +++ b/scripts/snapshot/protractor.config.js @@ -8,7 +8,7 @@ exports.config = { // Spec patterns are relative to the location of the spec file. They may // include glob patterns. specs: [ - path.resolve(projectRoot, 'dist/examples/**/*.scenario.js'), + path.resolve(projectRoot, 'dist/e2e/**/e2e.js'), ], // Options to be passed to Jasmine-node. diff --git a/src/components/action-menu/examples/action-menu-default/index.html b/src/components/action-menu/test/action-menu-default/index.html similarity index 100% rename from src/components/action-menu/examples/action-menu-default/index.html rename to src/components/action-menu/test/action-menu-default/index.html diff --git a/src/components/action-menu/examples/action-menu-default/main.js b/src/components/action-menu/test/action-menu-default/main.js similarity index 100% rename from src/components/action-menu/examples/action-menu-default/main.js rename to src/components/action-menu/test/action-menu-default/main.js diff --git a/src/components/alert/examples/alert-default/index.html b/src/components/alert/test/alert-default/index.html similarity index 100% rename from src/components/alert/examples/alert-default/index.html rename to src/components/alert/test/alert-default/index.html diff --git a/src/components/alert/examples/alert-default/main.js b/src/components/alert/test/alert-default/main.js similarity index 100% rename from src/components/alert/examples/alert-default/main.js rename to src/components/alert/test/alert-default/main.js diff --git a/src/components/app/ionic.scss b/src/components/app/ionic.scss index fcff2f779d..b428db8e18 100644 --- a/src/components/app/ionic.scss +++ b/src/components/app/ionic.scss @@ -18,7 +18,7 @@ "typography"; -// Components +// Default Components @import "../aside/aside", "../button/button", @@ -30,6 +30,16 @@ "../toolbar/toolbar"; +// Android Components +@import + "../item/extensions/android/item-android"; + + +// iOS Components +@import + "../item/extensions/ios/item-ios"; + + // Icons @import "../icon/icon"; diff --git a/src/components/app/app_spec.js b/src/components/app/test/app_spec.js similarity index 100% rename from src/components/app/app_spec.js rename to src/components/app/test/app_spec.js diff --git a/src/components/app/examples/figure-it-out/components/stylers.js b/src/components/app/test/figure-it-out/components/stylers.js similarity index 100% rename from src/components/app/examples/figure-it-out/components/stylers.js rename to src/components/app/test/figure-it-out/components/stylers.js diff --git a/src/components/app/examples/figure-it-out/components/tabs-page.js b/src/components/app/test/figure-it-out/components/tabs-page.js similarity index 100% rename from src/components/app/examples/figure-it-out/components/tabs-page.js rename to src/components/app/test/figure-it-out/components/tabs-page.js diff --git a/src/components/app/examples/figure-it-out/index.html b/src/components/app/test/figure-it-out/index.html similarity index 100% rename from src/components/app/examples/figure-it-out/index.html rename to src/components/app/test/figure-it-out/index.html diff --git a/src/components/app/examples/figure-it-out/main.js b/src/components/app/test/figure-it-out/main.js similarity index 100% rename from src/components/app/examples/figure-it-out/main.js rename to src/components/app/test/figure-it-out/main.js diff --git a/src/components/aside/examples/basic/index.html b/src/components/aside/test/basic/index.html similarity index 100% rename from src/components/aside/examples/basic/index.html rename to src/components/aside/test/basic/index.html diff --git a/src/components/aside/examples/basic/main.js b/src/components/aside/test/basic/main.js similarity index 100% rename from src/components/aside/examples/basic/main.js rename to src/components/aside/test/basic/main.js diff --git a/src/components/button/examples/button-block/index.html b/src/components/button/test/button-block/index.html similarity index 100% rename from src/components/button/examples/button-block/index.html rename to src/components/button/test/button-block/index.html diff --git a/src/components/button/examples/button-block/test.scenario.js b/src/components/button/test/button-block/test.scenario.js similarity index 100% rename from src/components/button/examples/button-block/test.scenario.js rename to src/components/button/test/button-block/test.scenario.js diff --git a/src/components/button/examples/button-clear/index.html b/src/components/button/test/button-clear/index.html similarity index 100% rename from src/components/button/examples/button-clear/index.html rename to src/components/button/test/button-clear/index.html diff --git a/src/components/button/examples/button-default/index.html b/src/components/button/test/button-default/index.html similarity index 100% rename from src/components/button/examples/button-default/index.html rename to src/components/button/test/button-default/index.html diff --git a/src/components/button/examples/button-full/index.html b/src/components/button/test/button-full/index.html similarity index 100% rename from src/components/button/examples/button-full/index.html rename to src/components/button/test/button-full/index.html diff --git a/src/components/button/examples/button-outline/index.html b/src/components/button/test/button-outline/index.html similarity index 100% rename from src/components/button/examples/button-outline/index.html rename to src/components/button/test/button-outline/index.html diff --git a/src/components/button/examples/button-sizes/index.html b/src/components/button/test/button-sizes/index.html similarity index 100% rename from src/components/button/examples/button-sizes/index.html rename to src/components/button/test/button-sizes/index.html diff --git a/src/components/checkbox/examples/checkbox-default/index.html b/src/components/checkbox/test/checkbox-default/index.html similarity index 100% rename from src/components/checkbox/examples/checkbox-default/index.html rename to src/components/checkbox/test/checkbox-default/index.html diff --git a/src/components/checkbox/examples/checkbox-default/main.js b/src/components/checkbox/test/checkbox-default/main.js similarity index 100% rename from src/components/checkbox/examples/checkbox-default/main.js rename to src/components/checkbox/test/checkbox-default/main.js diff --git a/src/components/item/examples/item-default/index.html b/src/components/item/examples/item-default/index.html deleted file mode 100644 index d730aa6763..0000000000 --- a/src/components/item/examples/item-default/index.html +++ /dev/null @@ -1,57 +0,0 @@ -
- -
- -
- List/Item Default CSS Tests -
- -
- -
- List Header -
- -
    - -
  • -
    -
    - Item 1 -
    -
    - Label -
    -
    -
    • - -
  • -
    -
    - Item 2 -
    -
    - Label -
    -
    -
    • - -
  • -
    -
    - Item 3 -
    -
    - Label -
    -
    -
    • - -
- - -
- -
- -
diff --git a/src/components/item/examples/item-default/main.js b/src/components/item/extensions/android/item-android.scss similarity index 100% rename from src/components/item/examples/item-default/main.js rename to src/components/item/extensions/android/item-android.scss diff --git a/src/components/item/extensions/ios/item-ios.scss b/src/components/item/extensions/ios/item-ios.scss new file mode 100644 index 0000000000..e48a8a8657 --- /dev/null +++ b/src/components/item/extensions/ios/item-ios.scss @@ -0,0 +1,31 @@ + +// iOS Item +// -------------------------------------------------- + +$item-ios-min-height: 44px !default; +$item-ios-padding-top: 8px !default; +$item-ios-padding-right: 15px !default; +$item-ios-padding-bottom: 7px !default; +$item-ios-padding-left: 15px !default; +$item-ios-accessory-color: #8e8e93 !default; + + + +.list-ios { + + .item { + min-height: $item-ios-min-height; + padding-left: $item-ios-padding-left; + } + + .item-content { + min-height: $item-ios-min-height; + padding: $item-ios-padding-top $item-ios-padding-right $item-ios-padding-bottom 0; + } + + .item-accessory { + color: $item-ios-accessory-color; + color: red; + } + +} diff --git a/src/components/item/item.scss b/src/components/item/item.scss index 3670338ebe..502ef21545 100644 --- a/src/components/item/item.scss +++ b/src/components/item/item.scss @@ -3,12 +3,24 @@ // -------------------------------------------------- $item-min-height: 44px !default; -$item-padding-top: 8px !default; +$item-padding-top: 15px !default; $item-padding-right: 15px !default; -$item-padding-bottom: 7px !default; +$item-padding-bottom: 15px !default; $item-padding-left: 15px !default; +//
  • +//
    +//
    +// Item Title +//
    +//
    +// Badge +//
    +//
    +//
    • + + .item { position: relative; @@ -17,8 +29,8 @@ $item-padding-left: 15px !default; @include flex-align-items(center); min-height: $item-min-height; - - padding-left: $item-padding-left; + margin: 0; + padding: 0; } .item-content { @@ -32,9 +44,7 @@ $item-padding-left: 15px !default; width: 100%; min-height: $item-min-height; - padding-right: $item-padding-right; - padding-top: $item-padding-top; - padding-bottom: $item-padding-bottom; + padding: $item-padding-top $item-padding-right $item-padding-bottom $item-padding-left; } .item-title { diff --git a/src/components/modal/modal.spec.js b/src/components/item/test/item-default/e2e.js similarity index 100% rename from src/components/modal/modal.spec.js rename to src/components/item/test/item-default/e2e.js diff --git a/src/components/item/test/item-default/index.html b/src/components/item/test/item-default/index.html new file mode 100644 index 0000000000..f255c988c2 --- /dev/null +++ b/src/components/item/test/item-default/index.html @@ -0,0 +1,64 @@ +
    + +
    + +
    + List/Item Default CSS Tests +
    + +
    + +
    + +
    + List Header +
    + +
      + +
    • +
      +
      + Item 1 +
      +
      + Label +
      +
      +
      • + +
    • +
      +
      + Item 2 +
      +
      + Label +
      +
      +
      • + +
    • +
      +
      + Item 3 +
      +
      + Label +
      +
      +
      • + +
    + +
    + List Footer +
    + +
    + +
    + +
    + +
    diff --git a/src/components/radio/examples/radio-default/main.js b/src/components/item/test/item-default/main.js similarity index 100% rename from src/components/radio/examples/radio-default/main.js rename to src/components/item/test/item-default/main.js diff --git a/src/components/switch/examples/switch-default/main.js b/src/components/item/test/item-ios-default/e2e.js similarity index 100% rename from src/components/switch/examples/switch-default/main.js rename to src/components/item/test/item-ios-default/e2e.js diff --git a/src/components/item/test/item-ios-default/index.html b/src/components/item/test/item-ios-default/index.html new file mode 100644 index 0000000000..d55514cbfc --- /dev/null +++ b/src/components/item/test/item-ios-default/index.html @@ -0,0 +1,65 @@ +
    + +
    + +
    + iOS List/Item Default CSS Tests +
    + +
    + +
    + +
    + List Header +
    + +
      + +
    • +
      +
      + Item 1 +
      +
      + Label +
      +
      +
      • + +
    • +
      +
      + Item 2 +
      +
      + Label +
      +
      +
      • + +
    • +
      +
      + Item 3 +
      +
      + Label +
      +
      +
      • + +
    + +
    + List Footer +
    + +
    + + +
    + +
    + +
    diff --git a/src/components/view/examples/view-default/main.js b/src/components/item/test/item-ios-default/main.js similarity index 100% rename from src/components/view/examples/view-default/main.js rename to src/components/item/test/item-ios-default/main.js diff --git a/src/components/item/test/item.spec.js b/src/components/item/test/item.spec.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/components/list/list.scss b/src/components/list/list.scss index 2df06d7b14..b1f7ed0150 100644 --- a/src/components/list/list.scss +++ b/src/components/list/list.scss @@ -2,25 +2,49 @@ // List // -------------------------------------------------- -$list-margin: 35px 0 !default; +$list-margin: 35px 0 !default; +$list-content-margin: 10px 0 !default; +//
    +//
    +// List Header +//
    +// +//
    +// List Footer +//
    +//
    + .list { + position: relative; + display: block; margin: $list-margin; - padding: 0; - list-style-type: none; + width: 100%; } .list-header { position: relative; - margin: 35px 15px 10px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } -.list-header + .list { - margin-top: 10px; +.list-header + .list-content { + margin: $list-content-margin; } + +.list-content { + margin: 0; + padding: 0; + list-style-type: none; +} + +.list-footer { + margin: 10px 0; +} + diff --git a/src/components/modal/modal.html b/src/components/modal/modal.html deleted file mode 100644 index 32a64138ad..0000000000 --- a/src/components/modal/modal.html +++ /dev/null @@ -1,3 +0,0 @@ -
    -

    I'm a modal!

    -
    diff --git a/src/components/modal/test/modal.spec.js b/src/components/modal/test/modal.spec.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/components/radio/examples/radio-default/index.html b/src/components/radio/test/radio-default/index.html similarity index 100% rename from src/components/radio/examples/radio-default/index.html rename to src/components/radio/test/radio-default/index.html diff --git a/src/components/radio/test/radio-default/main.js b/src/components/radio/test/radio-default/main.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/components/switch/examples/switch-default/index.html b/src/components/switch/test/switch-default/index.html similarity index 100% rename from src/components/switch/examples/switch-default/index.html rename to src/components/switch/test/switch-default/index.html diff --git a/src/components/switch/test/switch-default/main.js b/src/components/switch/test/switch-default/main.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/components/view/examples/test/index.html b/src/components/view/test/basic/index.html similarity index 100% rename from src/components/view/examples/test/index.html rename to src/components/view/test/basic/index.html diff --git a/src/components/view/examples/test/main.js b/src/components/view/test/basic/main.js similarity index 100% rename from src/components/view/examples/test/main.js rename to src/components/view/test/basic/main.js diff --git a/src/components/view/examples/view-default/index.html b/src/components/view/test/view-default/index.html similarity index 100% rename from src/components/view/examples/view-default/index.html rename to src/components/view/test/view-default/index.html diff --git a/src/components/view/test/view-default/main.js b/src/components/view/test/view-default/main.js new file mode 100644 index 0000000000..e69de29bb2