diff --git a/src/components/app/ionic.scss b/src/components/app/ionic.scss index acd4fd39f9..4dcbbb1498 100644 --- a/src/components/app/ionic.scss +++ b/src/components/app/ionic.scss @@ -31,6 +31,7 @@ "../item/item", "../list/list", "../modal/modal", + "../radio/radio", "../switch/switch", "../tabs/tabs", "../toolbar/toolbar", @@ -48,6 +49,7 @@ "../checkbox/extensions/ios", "../list/extensions/ios", "../item/extensions/ios", + "../radio/extensions/ios", "../switch/extensions/ios"; diff --git a/src/components/checkbox/checkbox.html b/src/components/checkbox/checkbox.html deleted file mode 100644 index 8b13789179..0000000000 --- a/src/components/checkbox/checkbox.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/components/item/item.scss b/src/components/item/item.scss index 3a1eea88d8..4012010388 100644 --- a/src/components/item/item.scss +++ b/src/components/item/item.scss @@ -57,6 +57,7 @@ $item-min-height: 44px !default; .item-title { position: relative; + @include flex(1); @include flex-shrink(1); max-width: 100%; diff --git a/src/components/radio/extensions/ios.scss b/src/components/radio/extensions/ios.scss new file mode 100644 index 0000000000..f2dba066be --- /dev/null +++ b/src/components/radio/extensions/ios.scss @@ -0,0 +1,14 @@ + +// iOS Radio +// -------------------------------------------------- + +$radio-ios-color: #007aff; + + +.radio-group-ios { + + .media-radio { + color: $radio-ios-color; + } + +} diff --git a/src/components/radio/radio.scss b/src/components/radio/radio.scss index e69de29bb2..1353487290 100644 --- a/src/components/radio/radio.scss +++ b/src/components/radio/radio.scss @@ -0,0 +1,45 @@ + +// Radio +// -------------------------------------------------- + +$radio-padding: 0 15px !default; + + +.radio .item-media { + padding: $radio-padding; +} + +.radio-on { + display: none; +} + +.radio-off { + display: block; +} + +.radio[aria-checked=true] { + + .radio-on { + display: block; + } + + .radio-off { + display: none; + } + +} + +.radio[aria-disabled=true] { + pointer-events: none; + opacity: 0.5; + color: gray; + + .media-radio { + color: inherit; + } +} + +.radio .item-media, +.radio .item-content { + pointer-events: none; +} diff --git a/src/components/radio/test/basic/main.html b/src/components/radio/test/basic/main.html index 4a85f186a6..34542ddfb4 100644 --- a/src/components/radio/test/basic/main.html +++ b/src/components/radio/test/basic/main.html @@ -1,41 +1,67 @@ -