Merge pull request #1962 from luixxiul/braverypanel-design

align .switchcontrol
brave · May 28, 2016 · f3f4a12 · f3f4a12
2 parents 3674390 + 6f7e7ad
commit f3f4a12
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/js/components/switchControl.js b/js/components/switchControl.js
@@ -59,7 +59,7 @@ class SwitchControl extends ImmutableComponent {
       {
         this.props.rightl10nId && this.props.topl10nId
         ? <div className='switchControlText'><div className='switchControlRightText'><div className='switchSpacer'>&nbsp;</div><span className='switchControlRightText' data-l10n-id={this.props.rightl10nId} /></div></div>
-        : <span>
+        : <span className='switchControlRight'>
           {this.props.rightl10nId
           ? <span className='switchControlRightText' data-l10n-id={this.props.rightl10nId} />
           : null}

diff --git a/less/switchControls.less b/less/switchControls.less
@@ -3,6 +3,7 @@
 
 .switchControl {
   display: flex;
+  align-items: center;
   padding: 5px;
 
   &.disabled {
@@ -43,8 +44,12 @@
     margin: auto 5px auto 0;
   }
 
-  .switchControlRightText {
-    margin: auto 0 auto 5px;
+  .switchControlRight {
+    display: flex;
+
+    .switchControlRightText {
+      margin: auto 0 auto 5px;
+    }
   }
 
   .switchControlTopText {