Merge pull request #2173 from brave/rewards-settings

Rewards settings style
brave · Apr 23, 2019 · b0e01ff · b0e01ff
2 parents 9434151 + 9ba457c
commit b0e01ff
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/components/brave_rewards/resources/ui/components/adsBox.tsx b/components/brave_rewards/resources/ui/components/adsBox.tsx
@@ -51,8 +51,8 @@ class AdsBox extends React.Component<Props, State> {
       <DisabledContent
         type={'ads'}
       >
-        • {getLocale('adsDisabledTextOne')} <br />
-        • {getLocale('adsDisabledTextTwo')}
+        {getLocale('adsDisabledTextOne')} <br />
+        {getLocale('adsDisabledTextTwo')}
       </DisabledContent>
     )
   }
@@ -86,7 +86,7 @@ class AdsBox extends React.Component<Props, State> {
     const { adsPerHour } = this.props.rewardsData.adsData
 
     return (
-      <Grid columns={1} customStyle={{ maxWidth: '270px', margin: '0 auto' }}>
+      <Grid columns={1} customStyle={{ margin: '0 auto' }}>
         <Column size={1} customStyle={{ justifyContent: 'center', flexWrap: 'wrap' }}>
           <ControlWrapper text={getLocale('adsPerHour')}>
             <Select

diff --git a/components/brave_rewards/resources/ui/components/contributeBox.tsx b/components/brave_rewards/resources/ui/components/contributeBox.tsx
@@ -77,8 +77,8 @@ class ContributeBox extends React.Component<Props, State> {
       <DisabledContent
         type={'contribute'}
       >
-        • {getLocale('contributionDisabledText1')} <br />
-        • {getLocale('contributionDisabledText2')}
+        {getLocale('contributionDisabledText1')} <br />
+        {getLocale('contributionDisabledText2')}
       </DisabledContent>
     )
   }
@@ -120,7 +120,7 @@ class ContributeBox extends React.Component<Props, State> {
     }
 
     return (
-      <Grid columns={1} customStyle={{ maxWidth: '270px', margin: '0 auto' }}>
+      <Grid columns={1} customStyle={{ margin: '0 auto' }}>
         <Column size={1} customStyle={{ justifyContent: 'center', flexWrap: 'wrap' }}>
           <ControlWrapper text={getLocale('contributionMonthly')}>
             <Select

diff --git a/components/brave_rewards/resources/ui/components/donationsBox.tsx b/components/brave_rewards/resources/ui/components/donationsBox.tsx
@@ -51,8 +51,8 @@ class DonationBox extends React.Component<Props, State> {
       <DisabledContent
         type={'donation'}
       >
-        • {getLocale('donationDisabledText1')}<br/>
-        • {getLocale('donationDisabledText2')}
+        {getLocale('donationDisabledText1')}<br/>
+        {getLocale('donationDisabledText2')}
       </DisabledContent>
     )
   }

diff --git a/components/brave_rewards/resources/ui/components/settingsPage.tsx b/components/brave_rewards/resources/ui/components/settingsPage.tsx
@@ -117,7 +117,7 @@ class SettingsPage extends React.Component<Props, {}> {
     }
 
     return (
-      <>
+      <div style={{ width: '100%' }}>
         {grants.map((grant?: Rewards.Grant, index?: number) => {
           if (!grant || !grant.promotionId) {
             return null
@@ -129,7 +129,7 @@ class SettingsPage extends React.Component<Props, {}> {
             </div>
           )
         })}
-      </>
+      </div>
     )
   }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -277,7 +277,7 @@
     "@types/react-redux": "6.0.4",
     "@types/redux-logger": "^3.0.7",
     "awesome-typescript-loader": "^5.2.1",
-    "brave-ui": "github:brave/brave-ui#f2762fd62577aa5e177b462ead9c3c32ef8d915a",
+    "brave-ui": "github:brave/brave-ui#120b4f17c65a23c9f4dd54b1f61e6e5c10751c82",
     "css-loader": "^2.1.1",
     "csstype": "^2.5.5",
     "deep-freeze-node": "^1.1.3",