fix(radio): fix styles

A-l-y-l-e · Oct 14, 2018 · d2c76cd · d2c76cd
1 parent ff73206
commit d2c76cd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/app/docs/components/field-demo/basic-field/basic-field.component.html b/src/app/docs/components/field-demo/basic-field/basic-field.component.html
@@ -1,6 +1,6 @@
 <p>
   <ly-radio-group [formControl]="appearance">
-    <p>Appearance:</p>
+    <span>Appearance:</span>
     <ly-radio value="standard" checked>Standard</ly-radio>
     <ly-radio value="outlined">Outlined</ly-radio>
     <ly-radio value="filled">Filled</ly-radio>

diff --git a/src/lib/radio/radio.service.ts b/src/lib/radio/radio.service.ts
@@ -5,11 +5,13 @@ const STYLE_PRIORITY = -2;
 
 const styles = ({
   root: {
-    display: 'flex',
-    flexWrap: 'wrap'
+    display: 'inline-block'
   },
   labelContent: {
     padding: '0 0.5em'
+  },
+  radioButton: {
+    display: 'inline-block'
   }
 });
 

diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts
@@ -47,12 +47,12 @@ const styles = theme => ({
     whiteSpace: 'nowrap',
     position: 'relative',
     display: 'flex',
-    alignItems: 'center'
+    alignItems: 'baseline'
   },
   container: {
     position: 'relative',
-    height: 'calc(1em * 3)',
     width: '1.5em',
+    margin: 'auto',
     '&>div *': {
       margin: 'auto',
       borderRadius: '50%',
@@ -72,7 +72,7 @@ const styles = theme => ({
     }
   }
 });
-// console.log('module.id', module.id);
+
 @Component({
   selector: 'ly-radio-group',
   template: `<ng-content></ng-content>`,
@@ -339,7 +339,8 @@ export class LyRadio implements OnInit, OnDestroy {
     this._ripple = new Ripple(this.theme.config, this.ngZone, this._rippleService.classes, this._radioContainer.nativeElement, this._elementRef.nativeElement);
     this._ripple.setConfig({
       centered: true,
-      radius: 'containerSize'
+      radius: 'containerSize',
+      percentageToIncrease: 100
     });
   }
 
@@ -361,7 +362,9 @@ export class LyRadio implements OnInit, OnDestroy {
     private ngZone: NgZone,
     public coreStyles: LyCoreStyles,
     private _rippleService: LyRippleService
-  ) { }
+  ) {
+    _renderer.addClass(_elementRef.nativeElement, radioGroup._radioService.classes.radioButton);
+  }
 }
 
 @NgModule({