From a554047eba6e75f8e1f49d5fdd213fe58cee0fec Mon Sep 17 00:00:00 2001
From: DylanXie123 <dylanxie123@outlook.com>
Date: Sat, 14 Dec 2019 21:42:05 +0800
Subject: [PATCH] fix css bug

---
 assets/fonts/Keyboard-Icon.ttf | Bin 4480 -> 4476 bytes
 assets/html/mathquill.css      |  22 +++++++++
 lib/src/widgets/keyboard.dart  |  79 +++++++++++++++++----------------
 lib/src/widgets/result.dart    |   1 +
 pubspec.yaml                   |   2 +-
 5 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/assets/fonts/Keyboard-Icon.ttf b/assets/fonts/Keyboard-Icon.ttf
index 0b6c81daf0a13006e97774f999468259a732de4b..e37d33f9ba24184c9e7ab50ac3a7fa521043aae4 100644
GIT binary patch
delta 1790
zcmZ8iTZmOv7+&|wUTd$l_c{CQa~Ut=jLm4J)yz0U<z=GA%DiBbCWbndV3IkQkVbGO
zG82Okjv*Ei^cX~lK3FdUzSN80L(%1>m!PNUsR%Oa+h-J_%|3hYf3LOwwZ6;$pZVci
zL+7Wv_gtU<lMs56ko5H7L$fb7^Mk(<5^fPfCJ*C<ev{uMBu*e+dHCpwlVe2fLHsP@
z^)DZLVYYc<;2h!$hzF0(o}42k9YlP!ieH&Mdg#&?`xoMGu*R9WW3Qed93v!ut{Nwt
zUtYM%>YM2_|B}5;HjsVfHFAS|OK$bf@DaMM_Zfeh4)^}yJGx_&;~VMJ_|(Y6)OcCw
zO?13bl#OL{9A{&A-9vN=!;=#m=z2OjF|uxGWOzvF(LY4){gO~y9?~?1INXTsBuO~q
zM(XNDr4UZLy0+EP&Rk(ts?_P$NJzcbs_xxDXx$Zj7m=xX-%`pel?cHxzZG3gYwf)$
zQd%>}q;qGyl#&Y(+=^y1ajumnr5B2E!L%0M+QOL>Q<PL?o|SmA)-;2PRvE?^rJR}>
zAr5f<=zWG#Mw!)Hbl2j6Rw1X%NI@?)2Ay{?#?_tns+dJ%Om2l?oJ+wHr5zXCShuWR
z8wxQPKneV8trk}nVQGjZ(A4YMV$cB407NMeh306UXTUaCF1a^zK0KZ`l~STBg_YV#
zk*EwwLlaX3$7cD~tc|sWlunr-RccLCI#1FDU@>0pS+JVSB+lvLthN;fYWm2i)w_*j
zkbyF;;Rr>x(J{WjJ|@qQH^>F@3;B(fgwz|uy{FW6I^O$0UGB|^qWgo9-srlwSP>G6
z%&+Wpy!Qh!X$7GfmkfJKlcc#g1rS>GS__;fiS0z4B^qR7cZ`|0aFv`pGiM!#N_`P<
zk<eK38P`x2a#o5fX>mi)wI3CuwItKp31nfk|NU`koInC9B$kfL;$mW-9GA#ku|+W#
z-hh5H?mHolaQ@^(pAeRqohG>>F?PkQlx$>stqpC!Ed+(FoXXP`Mb=Kb3CM>P#I9Ng
zLcl{_+o<3ni#^p{XxYSaI0fYMFI*5@A-AnO1h#_PTW?8NvcJxfQ+J>N7>CMzxSzIL
zST;J-%$|2qfY1K-oEgD<vU`8lgz>ZNbsxA`90TY)-CcBqyp#BW8JSC*Gv)g_>C4{N
z9XwdG-}<Wj`noH!i$2IdXY;*DyMZ=)H+j)JYuE5*QTDFcce+K1r`vVD*ajvhH&7J$
zS~|Lx_Urt^u`$lMmO@uht#C$X2CPYqRaU4JLMfDuUdS3k1znY`0jS)&RRdrzCY7}%
z+zfm|<AyG=v=*BdU7}kRCE$Z_LAljw+k+x5YNbq4_@d9gX@yJm;T$61i$3!(N@89T
z2BD~A5UC9V0huJ@-X4Khs(F<qD)$)4r<1RQnC1Mj`)`-M*=j1qx|mcQ&>LQ0dpBqA
zCQuXxU|PBy)<z=8mb>#B9#z4j9RBtZt-xqgcvPi{=uC;p%BqwFG{!4@gu|$$W-JT|
z%4Cr}5$m93aXqU;o@1SEu-Q(al1?hGO+XQOKi@1Nct~^^_F*>wg|<}HyB5sZJ+Yx+
zk2vR2^rQX|c#3{Uy(NUIY{^V#&8Ee!@JMm)|6O4Z$f;NdIhtH~*xz777u`>%4#f4p
z6DO)a5b|T^z1jcX`9kmRxSTHZw!}4dGv;i=Z&z<Vu8!Z!gYvrkSruxd`b1s7axH#M
F{{^Z0t!V%N

delta 1777
zcmYjSPl#1j9KPqC|L2}_@40{8d-L9%8K)VW(U`29aYjYc2n_#(<w8Owozxm48!3s2
z2A)J{t0*6ZW)eu70vD!XyEZNg3R)D%fD2u;Xc4rijS+q4spR24F28er{O<SrzVCP5
zKcgqdKHS<B<@xJTL>8mSy+40+?nvvg&F7*hi?C+qu^~UFKO<g`c;)=D6N_sj{w3lA
zh&R2qaCok@RG&e77V*fjxy9pAlZ+t#HpH*b9Xon%hrWaO2EK9X_`;hfB8rnJKNQX*
zN-uwRH7+YMO>f3$qs`I&=&k6-=$GhD?-U&;6TM4x&l$G6xsl91NoJ>J$ERnfnw8u_
zrW%8!)!QORy1()wb;G_IO|#T{Ki<j*O_ESbHJ6sgln~Cim9A1Ith%sGBb`tmbyoY-
zNhKT34tWIDDX9?DQaULO;|%GY+*a6jPB+Q0;#SGhs*H2N81r^zr`@$SsncX2Wr9)`
zD@9XdnpUS=a3RD%QMQEO+L(4Gy%9PNh-j>KaX!!3jwww@Ok$&+R|anqA`-{35{&d(
zW7fLd=aWPAWS-|*>r!)t);Nz7DJ`Q+ceNX7R1bTfDa{+6eNt8VL^B)lzNM9FH1bs;
z$Oh1;2WEilWbMhKEYRFod-#dMTEDw&ODP!VMo7zfA`1IZBkKS(V*pF{<TbvHrmfVe
z5SiAwltq%YjL{n?4X7C{Mb3FHwlzPN=p-zqLMue87xi5sVk)CZL^T<wH{!2*8^u8~
z+xt{p?n2v{>CI#lnV24*SVP7}g`Bvexl_7w+JisFc<xr!gU-1jpL8-VK|-uG%M#P>
zrwDXVS7k>?k(i{;RbiwK^5fATfKg7VQ*Q$a;{jC=Ar_1p&USWfQ)rNbrG-G#VVSR*
zk5oyn0?kN;i>TG_aOFY)0(WGIAIYH^bWhEa&<=U`%0d^xb|t@a{sv>utv7v16ZL{h
z00cSs!3SFK`0>5fpzKP?1MSLzVo|0mn|X~Ucp#tcs|G<c+~kzWq{y`?lq#)nBZCEC
z0K<N;5SOF42`+*;y**Ubf(e{sbH%%8=z-Qmzujw{T0pWyciZ`^)^ji#3V<}lW0$;~
zx8eLEf6sZ!L?~l8XJvYzRdX)y6<)VpltPqz=fK7L2G+3jT~EKFU4H;UbzgW*R@3G9
zvuI6pIyxWy5&cbuqNr?4^`6#~r0gBnPtnFO>0Q;QyO{1_GKHrxwr=grES~=jGCtZj
z$o>r*z&LEF7?ZJKsZxaoe_TVa35C!J9INGWfJv`xLn&nP(xsClm`tB&2iCzb+U-x3
zP3%b1cZ{;M8%&KBSsXJ$6O|370&KIYBTR<-1hWk}I{Br>>eA#=;jHfw3Xd#un2ZLG
zFrFH}!b1X1nKL+WxFh-=q1e%!ZBK49wm|8#Gr=Q-8nss&c(!}rB(at(Uf5k;NP@r^
zeZ^e`j{~&<@99NNjl{*m3-|Bs%!dT6TB**Y&S8_p6m3if5F3#RgJS>yNtMwCcbHS6
zRqQDmC>=geVy)7ug15Uq$q%T6V&X+A4MtF=?o7J_!n~DjKMy#4yXY`uu!}WE{D6`&
z&rjM669OlN8-o>YU$bUhf=uiTPdy_FfoDhSf--?%65N8fQHSrD1?8gX%B=k<9=&zz
z&u<Q9oBoOt7XCA$<<8Qz2jBE&Z#-K;ZuYiikLn6JHGaCcl&#K|`Ahsd|4lT-R`G?n
Ke&uTRJ^2p^gRmU{

diff --git a/assets/html/mathquill.css b/assets/html/mathquill.css
index 09adf61..a33c5a8 100644
--- a/assets/html/mathquill.css
+++ b/assets/html/mathquill.css
@@ -94,6 +94,28 @@
 .mq-math-mode .mq-font {
   font: 1em "Times New Roman", serif;
 }
+.mq-math-mode .mq-supsub {
+  text-align: left;
+  font-size: 90%;
+  vertical-align: -0.5em;
+}
+.mq-math-mode .mq-supsub.mq-sup-only {
+  vertical-align: .5em;
+}
+.mq-math-mode .mq-supsub.mq-sup-only .mq-sup {
+  display: inline-block;
+  vertical-align: text-bottom;
+}
+.mq-math-mode .mq-supsub .mq-sup {
+  display: block;
+}
+.mq-math-mode .mq-supsub .mq-sub {
+  display: block;
+  float: left;
+}
+.mq-math-mode .mq-supsub .mq-binary-operator {
+  padding: 0 .1em;
+}
 .mq-math-mode .mq-supsub .mq-fraction {
   font-size: 70%;
 }
diff --git a/lib/src/widgets/keyboard.dart b/lib/src/widgets/keyboard.dart
index 3ef785c..0d49983 100644
--- a/lib/src/widgets/keyboard.dart
+++ b/lib/src/widgets/keyboard.dart
@@ -194,47 +194,50 @@ class _ExpandKeyBoardState extends State<ExpandKeyBoard> with TickerProviderStat
   }
 
   Widget _buildAnimation(BuildContext context, Widget child) {
-    return Container(
-      margin: EdgeInsets.symmetric(horizontal: 5.0),
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.only(topRight: Radius.circular(20.0),topLeft: Radius.circular(20.0)),
+    return Padding(
+      padding: EdgeInsets.symmetric(horizontal: 5.0),
+      child: Material(
         color: Colors.blueAccent[400],
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: <Widget>[
-          SizedBox(
-            height: arrowAnimation.value,
-            width: double.infinity,
-            child: FlatButton(
-              splashColor: Colors.transparent,
-              highlightColor: Colors.transparent,
-              onPressed: () {
-                final setting = Provider.of<SettingModel>(context, listen: false);
-                if (animationController.status == AnimationStatus.dismissed) {
-                  animationController.forward();
-                  setting.changeKeyboardMode(true);
-                } else {
-                  animationController.reverse();
-                  setting.changeKeyboardMode(false);
-                }
-              },
-              child: Icon(
-                (keyboardAnimation.value > _height*0.8)?Icons.keyboard_arrow_down:Icons.keyboard_arrow_up,
-                color: Colors.grey[200],
+        borderRadius: BorderRadius.only(
+          topRight: Radius.circular(20.0),
+          topLeft: Radius.circular(20.0),
+        ),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: <Widget>[
+            SizedBox(
+              height: arrowAnimation.value,
+              width: double.infinity,
+              child: FlatButton(
+                splashColor: Colors.transparent,
+                highlightColor: Colors.transparent,
+                onPressed: () {
+                  final setting = Provider.of<SettingModel>(context, listen: false);
+                  if (animationController.status == AnimationStatus.dismissed) {
+                    animationController.forward();
+                    setting.changeKeyboardMode(true);
+                  } else {
+                    animationController.reverse();
+                    setting.changeKeyboardMode(false);
+                  }
+                },
+                child: Icon(
+                  (keyboardAnimation.value > _height*0.8)?Icons.keyboard_arrow_down:Icons.keyboard_arrow_up,
+                  color: Colors.grey[200],
+                ),
               ),
             ),
-          ),
-          SizedBox(
-            height: keyboardAnimation.value,
-            child: GridView.count(
-              physics: NeverScrollableScrollPhysics(),
-              crossAxisCount: 7,
-              children: _buildUpButton(),
-              childAspectRatio: AspectRatio,
+            SizedBox(
+              height: keyboardAnimation.value,
+              child: GridView.count(
+                physics: NeverScrollableScrollPhysics(),
+                crossAxisCount: 7,
+                children: _buildUpButton(),
+                childAspectRatio: AspectRatio,
+              ),
             ),
-          ),
-        ],
+          ],
+        ),
       ),
     );
   }
@@ -475,7 +478,7 @@ class _ExpandKeyBoardState extends State<ExpandKeyBoard> with TickerProviderStat
 
     button.add(MyButton(
       child: Icon(// expo
-        IconData(0xe905, fontFamily: 'Keyboard'),
+        IconData(0xe906, fontFamily: 'Keyboard'),
         color: fontColor,
         size: iconSize,
       ),
diff --git a/lib/src/widgets/result.dart b/lib/src/widgets/result.dart
index fa17b80..b007f3c 100644
--- a/lib/src/widgets/result.dart
+++ b/lib/src/widgets/result.dart
@@ -34,6 +34,7 @@ class _ResultState extends State<Result> with TickerProviderStateMixin {
       height: animation.value,
       width: double.infinity,
       alignment: Alignment.centerRight,
+      padding: EdgeInsets.symmetric(horizontal: 10.0, vertical: 2.0),
       child: Consumer<MathModel>(
         builder: (_, model, __) {
           String text;
diff --git a/pubspec.yaml b/pubspec.yaml
index 2493725..24de32e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: A scientific & intutive calculator written in Flutter.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.3.4+2
+version: 1.3.5+3
 
 environment:
   sdk: ">=2.5.0 <3.0.0"