From 896d9d02b2103ac41c58098fb574a4e8c876041c Mon Sep 17 00:00:00 2001 From: rishabh2609 Date: Tue, 16 Oct 2018 13:44:51 +0530 Subject: [PATCH] minor changes --- public/images/startup.png | Bin 1842 -> 16146 bytes src/actions/index.js | 2 +- src/components/Events/Events.css | 1 + src/components/Events/Events.jsx | 4 ++-- src/components/OnBoarding/OnBoarding.css | 24 +++++++++++++++++++++-- src/components/OnBoarding/OnBoarding.jsx | 10 +++++----- src/components/User/User.css | 1 + 7 files changed, 32 insertions(+), 10 deletions(-) diff --git a/public/images/startup.png b/public/images/startup.png index b65f7c545740f2f731930c5d432f1cef6de578ea..a7e9150633340f4b3eefc5ddc28148b8b89212d5 100644 GIT binary patch literal 16146 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 N-4}TAj=KoA{0ZFE*5CjD delta 1807 zcmV+q2k`ikezFdbBu4~iK}|sb0I`n?{9y$E001CkNK#Dz0D2|>0Dy!50Qvv`0D$NK z0Cg|`0P0`>06Lfe02gqax=}m;0007FOGiWi0IH26GLaz{e*gz`Nliru;tB}|9wbfe ziirRK1^`J!K~!ko<(OM+O<5Snf7Q~Ol2FuT6v2bmWvEMLA}(>6#JGfUNxU%Agv2E- zePAZjh!8RtCQ{c4BP1x|mdrGir%og)ky1*dgAS=w7`G17R<-|mIIG8A`|Q*1Q*AxW zx1aX6zqNn=f3wbB-}kK*Maxx+27mrogu+ z2O+9i)j*_E!d!%y@&5R(LW0czcn}TZE|P zGDAHje>_0sL7KVx@n0drny|6&38` z973EX+7X$^6GRP}OkolmsYJZt6Hf{K{o?ykXokEXhqG2?yXY#ff%P!WF>jS2%Pod7 z#C5;;aXdwcy$mwBEuNX?)4NGWS9BTTnC01sf2g%S#{~$n#2>yhj}aB5S>9f}M3mFl z72O>n7F)ha2r)W%--;qcdB_S0V@DBUzU7PJ0zxbdiSC3D%Prp&gcupTpMwxP{o!XJ z#BP^&DMB3g98rQeXL&LaZyjICRfHJm2OmorqQvwsb=H?xh|-XMKVVxCVp;Hh8a0UQ zf8hO8vvPb{V6qmuyeAR0Objz7o;wI}j^!-o7(%?HSMd2IL=7qa1pJ1$ZzUNRjSz?H z8I@`z)Ll;;#d!ik9Po$lN;P7G%bSO&q>tx_1QN_FY~?RgAr6x0n4LmI6}|llSdI{* zfJ8pyOD2)bJcQWl89#;Blp6^Eoviu*e~^U`>;2&a9ZNaO$a75RYs7O0y!~5Cb4YLU`-TP1Ce=hzuV9*flT@QRs@OU&2DOJ3dF-#^6P|_j=*aP4 z-q_bTy!*wuh-X$74=-UNrKSqzeTLy_ks* zYyAsI^}r7^q5`kIOHx<~32ZeT^DCAT1;kT{I1|ZVu!1xTKi=&4uQ8mT5#kO#JtXXA zjY-wwq@!6q+d!UZz~U%IRPvpvVOxv@dlpI@r7F+S|3cs(>S5yrY(|KAe-6)&=35AS zjswUryF(%VwITsp@dA+>8MFiGrio6X8gat){Ck9WMpkgYBx=p{4{*f}LWs;r@CoE2 zZUe9qAx5|&1_uwJ0@r2INix0Sr>@w&2$32oUTgybYd_x=5o1n*aw#B>HNoz1EJBR8 zV$%@fROI+WL<5P`AU3&Tf4)VC?IB~oK!|Y;&wMHnh5oCcjfdF?G2M!pMwhIx!H4o-G!7MX?l*qV_D@o)rj7wE!tHks$5 z*!4dLEYQM##V9s#-$Wjz^ZVf88scy6I==U6HoJ}^0+wRV2;Ut}f0r@KFFYI`>!hcK zTvl57&uKqcB7bL&YdhP3Wqaab3;%G9BV;h!vAwFZDAL(&x~3UC;tuE8!}3U5F9;l& zhT`kDD0X?Qkw#h%CR_C{nr+;6oM?pl>hMLhYYG9jMRO>mA+vq&@ZFjZpYP~n-M+Mz zz$et>TY^~n)QRE}6 z4~zf+03~!qSaf7zbY(hYa%Ew3WdJfTF*q$TFfA}SR4_L>GcY (dispatch) => { services.registerEvent(formData).then((data) => { if (data.success) { dispatch(success('EVENT_REGISTERED_SUCCESS', data)); - SweetAlert('Registered SuccessFully', 'success'); + SweetAlert('Registered Successfully', 'success'); dispatch(getRegisteredEvents()); } else { dispatch(failure('EVENT_REGISTERED_FAILURE', data)); diff --git a/src/components/Events/Events.css b/src/components/Events/Events.css index 8649ca0..0d03f4d 100644 --- a/src/components/Events/Events.css +++ b/src/components/Events/Events.css @@ -29,6 +29,7 @@ body, html { border: 0px solid; transition: all 0.2s ease; margin-bottom: 20px; + min-width: 100%; } #events-page .card:hover { box-shadow: 0px 0px 10px 0px #565656; diff --git a/src/components/Events/Events.jsx b/src/components/Events/Events.jsx index b5b0e0f..64e9816 100644 --- a/src/components/Events/Events.jsx +++ b/src/components/Events/Events.jsx @@ -11,7 +11,7 @@ const checkUser = (registerEvent, eventCategory, eventName, history) => { if ((localStorage.getItem('token') ? jwtDecode(localStorage.getItem('token')).name : null)) { registerEvent(eventCategory, eventName); } else { - SweetAlert('Please Login to Register for an event', 'error'); + SweetAlert('Please Login to Register for an event', 'warning'); history.push('/'); } }; @@ -231,7 +231,7 @@ class Events extends React.Component { const str = e.eventName; if (str.match(re)) { return ( -
+
); diff --git a/src/components/OnBoarding/OnBoarding.css b/src/components/OnBoarding/OnBoarding.css index 191bc88..4801b36 100644 --- a/src/components/OnBoarding/OnBoarding.css +++ b/src/components/OnBoarding/OnBoarding.css @@ -2,13 +2,22 @@ min-height: 100vh; margin: 0px; animation-name: fade-in; - animation-duration: 0.3s; - animation-timing-function: ease-in-out; + animation-duration: 0.3s; + background: none !important; + animation-timing-function: ease-in-out; + color: #fff !important; +} +#onBoarding-page h1 { + font-weight: bold; } .control-width { max-width: 50%; margin-left: 20px; } +body, html { + background: linear-gradient(rgb(17, 67, 87), rgb(242, 148, 146)) !important; +} + @keyframes fade-in { from { opacity: 0; @@ -18,4 +27,15 @@ opacity: 1; transform: scale(1); } +} + +/* For Firefox */ +input[type='number'] { + -moz-appearance:textfield; +} +/* Webkit browsers like Safari and Chrome */ +input[type=number]::-webkit-inner-spin-button, +input[type=number]::-webkit-outer-spin-button { + -webkit-appearance: none; + margin: 0; } \ No newline at end of file diff --git a/src/components/OnBoarding/OnBoarding.jsx b/src/components/OnBoarding/OnBoarding.jsx index e7fd16f..1b507d1 100644 --- a/src/components/OnBoarding/OnBoarding.jsx +++ b/src/components/OnBoarding/OnBoarding.jsx @@ -46,12 +46,12 @@ class OnBoarding extends React.Component {

Welcome aboard

-

- Techspardha18 Prime -

-
+

+ Techspardha'18 Prime +

+

To continue we need a few more details about you... - +


diff --git a/src/components/User/User.css b/src/components/User/User.css index 12140c2..8cf100f 100644 --- a/src/components/User/User.css +++ b/src/components/User/User.css @@ -36,6 +36,7 @@ body, html { } #myProfile-heading { margin-bottom: 30px; + font-weight: bold !important; } #user-name, #user-college, #user-year { text-transform: capitalize;