Progress

app/javascript/gabsocial/components/panel/pro_panel.js

@@ -21,6 +21,7 @@ class ProPanel extends PureComponent {
   render() {
     const { intl, isPro } = this.props
 
+    // : todo :
     // if (isPro) return null
 
     return (
@@ -31,7 +32,7 @@ class ProPanel extends PureComponent {
         <Button
           isBlock
           href={URL_GAB_PRO}
-          icon='bold'
+          icon='pro'
           iconSize='14px'
           className={[_s.justifyContentCenter, _s.alignItemsCenter].join(' ')}
         >

app/javascript/gabsocial/components/sidebar_xs.js

@@ -63,10 +63,6 @@ class SidebarXS extends ImmutablePureComponent {
     onCloseSidebar: PropTypes.func.isRequired,
   }
 
-  state = {
-    moreOpen: false,
-  }
-
   componentDidUpdate () {
     if (!me) return
 
@@ -77,27 +73,18 @@ class SidebarXS extends ImmutablePureComponent {
     }
   }
 
-  toggleMore = () => {
-    this.setState({ moreOpen: !this.state.moreOpen })
-  }
-
   handleSidebarClose = () => {
     this.props.onCloseSidebar()
-    this.setState({ moreOpen: false })
   }
 
   render () {
     const { sidebarOpen, intl, account } = this.props
-    const { moreOpen } = this.state
 
     if (!me || !account) return null
 
     const acct = account.get('acct')
     const isPro = account.get('is_pro')
 
-    const moreIcon = moreOpen ? 'minus' : 'plus'
-    const moreContainerStyle = { display: moreOpen ? 'block' : 'none' }
-
     const mainItems = [
       {
         icon: 'user',
@@ -211,7 +198,7 @@ class SidebarXS extends ImmutablePureComponent {
     return (
       <div className={containerClasses}>
         <div className={[_s.default, _s.posFixed, _s.top0, _s.left0, _s.right0, _s.bgBlackOpaque, _s.bottom0].join(' ')} role='button' onClick={this.handleSidebarClose} />
-        <div className={[_s.defaut, _s.posFixed, _s.left0, _s.top0, _s.bottom0, _s.bgPrimary, _s.saveAreaInsetPL, _s.minWidth330PX, _s.borderRight1PX, _s.borderColorSecondary, _s.maxWidth80PC].join(' ')}>
+        <div className={[_s.defaut, _s.posFixed, _s.left0, _s.top0, _s.bottom0, _s.bgPrimary, _s.saveAreaInsetPT, _s.saveAreaInsetPB, _s.saveAreaInsetPL, _s.minWidth330PX, _s.borderRight1PX, _s.borderColorSecondary, _s.maxWidth80PC].join(' ')}>
 
           <div className={[_s.default, _s.flexRow, _s.px15, _s.height53PX, _s.width100PC, _s.borderBottom1PX, _s.borderColorSecondary, _s.alignItemsCenter, _s.justifyContentCenter].join(' ')}>
             <Heading size='h2'>Account Info</Heading>

app/javascript/styles/global.css

@@ -106,9 +106,16 @@
   --navigation_search: var(--solid_color_block) !important;
 }
 
+html {
+  padding-top: env(safe-area-inset-top, 0);
+  padding-right: env(safe-area-inset-right, 0);
+  padding-left: env(safe-area-inset-left, 0);
+  padding-bottom: env(safe-area-inset-bottom, 0);
+}
+
 html,
 body {
-  height: 100%;
+  min-height: 100%;
   margin: 0;
   padding: 0;
   background-color: var(--solid_color_tertiary);

app/views/layouts/application.html.haml

@@ -15,24 +15,16 @@
     %link{ rel: 'apple-touch-icon', sizes: '180x180', href: '/apple-touch-icon.png' }/
     %link{ rel: 'mask-icon', href: '/mask-icon.svg', color: '#2B90D9' }/
         
-    -# iPhone Xs Max (1242px x 2688px)
-    -# %link{ rel: 'apple-touch-startup-image', media: '(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3)', href: '/apple-launch-1242x2688.png' }/
-    -# iPhone Xr (828px x 1792px)
-    -# %link{ rel: 'apple-touch-startup-image', media: '(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2)', href: '/apple-launch-828x1792.png' }/
-    -# iPhone X, Xs (1125px x 2436px)
-    -# %link{ rel: 'apple-touch-startup-image', media: '(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3)', href: '/apple-launch-1125x2436.png' }/
-    -# iPhone 8 Plus, 7 Plus, 6s Plus, 6 Plus (1242px x 2208px)
-    -# %link{ rel: 'apple-touch-startup-image', media: '(device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3)', href: '/apple-launch-1242x2208.png' }/
-    -# iPhone 8, 7, 6s, 6 (750px x 1334px)
-    -# %link{ rel: 'apple-touch-startup-image', media: '(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2)', href: '/apple-launch-750x1334.png' }/
-    -# iPad Pro 12.9" (2048px x 2732px)
-    -# %link{ rel: 'apple-touch-startup-image', media: '(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2)', href: '/apple-launch-2048x2732.png' }/
-    -# iPad Pro 11” (1668px x 2388px)
-    -# %link{ rel: 'apple-touch-startup-image', media: '(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2)', href: '/apple-launch-1668x2388.png' }/
-    -# iPad Pro 10.5" (1668px x 2224px)
-    -# %link{ rel: 'apple-touch-startup-image', media: '(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2)', href: '/apple-launch-1668x2224.png' }/
-    -# iPad Mini, Air (1536px x 2048px)
-    -# %link{ rel: 'apple-touch-startup-image', media: '(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2)', href: '/apple-launch-1536x2048.png' }/
+    %link{ href: 'splash/light/iphone5_splash.png', media: '(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)', rel: 'apple-touch-startup-image' }/
+    %link{ href: 'splash/light/iphone6_splash.png', media: '(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2)', rel: 'apple-touch-startup-image' }/
+    %link{ href: 'splash/light/iphoneplus_splash.png', media: '(device-width: 621px) and (device-height: 1104px) and (-webkit-device-pixel-ratio: 3)', rel: 'apple-touch-startup-image' }/
+    %link{ href: 'splash/light/iphonex_splash.png', media: '(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3)', rel: 'apple-touch-startup-image' }/
+    %link{ href: 'splash/light/iphonexr_splash.png', media: '(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2)', rel: 'apple-touch-startup-image' }/
+    %link{ href: 'splash/light/iphonexsmax_splash.png', media: '(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3)', rel: 'apple-touch-startup-image' }/
+    %link{ href: 'splash/light/ipad_splash.png', media: '(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2)', rel: 'apple-touch-startup-image' }/
+    %link{ href: 'splash/light/ipadpro1_splash.png', media: '(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2)', rel: 'apple-touch-startup-image' }/
+    %link{ href: 'splash/light/ipadpro3_splash.png', media: '(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2)', rel: 'apple-touch-startup-image' }/
+    %link{ href: 'splash/light/ipadpro2_splash.png', media: '(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2)', rel: 'apple-touch-startup-image' }/
 
     %link{ rel: 'manifest', href: '/manifest.json' }/
     %meta{ name: 'msapplication-config', content: '/browserconfig.xml' }/