From f3cf3b30e3115b35fb849accaefd4213b44ff903 Mon Sep 17 00:00:00 2001 From: Rainer Killinger Date: Thu, 18 Aug 2022 17:19:58 +0000 Subject: [PATCH] refactor: layout detail adjustments refactor: increase contrast of toolbar fav button refactor: remove non working localization for news refactor: equalize tab bar in top toolbar refactor: padding on map buttons and rename them refactor: repair profile card alignments for safari refactor: fix dashboard resize behavior on safari refactor: make title card button reachable again refactor: put card hover in media query refactor: realign schedule view toolbar refactor: adjust toolbar heights refactor: introduce proper header logo --- .../modules/catalog/catalog.component.html | 26 +-- .../modules/catalog/catalog.component.scss | 6 + .../dashboard/dashboard.component.html | 11 +- .../dashboard/dashboard.component.scss | 8 +- src/app/modules/data/detail/data-detail.scss | 5 + .../data/elements/title-card.component.html | 17 +- .../data/elements/title-card.component.ts | 2 +- .../types/message/message-detail-content.html | 4 +- .../place/special/mensa/place-mensa.scss | 1 + .../modules/hebis/list/hebis-search-page.html | 2 +- src/app/modules/map/page/map-page.scss | 1 + .../modules/menu/navigation/navigation.html | 2 +- .../profile/page/profile-page.component.html | 6 +- .../profile/page/profile-page.component.scss | 4 + .../schedule/page/grid/schedule-day.scss | 1 - .../modules/schedule/page/schedule-page.html | 7 +- .../modules/schedule/page/schedule-page.scss | 7 + src/assets/i18n/de.json | 5 +- src/assets/i18n/en.json | 5 +- src/assets/icon/favicon.png | Bin 10836 -> 2573 bytes src/assets/imgs/header.svg | 197 ++++++++++++++++++ src/assets/imgs/logo.png | Bin 18105 -> 12770 bytes src/assets/imgs/open stapps logo.svg | 179 ++++++++++++++++ src/theme/common/_ion-toolbar.scss | 18 +- src/theme/components/_card.scss | 12 +- src/theme/variables.scss | 2 +- 26 files changed, 462 insertions(+), 66 deletions(-) create mode 100644 src/assets/imgs/header.svg create mode 100644 src/assets/imgs/open stapps logo.svg diff --git a/src/app/modules/catalog/catalog.component.html b/src/app/modules/catalog/catalog.component.html index bbf54140..4a8458b8 100644 --- a/src/app/modules/catalog/catalog.component.html +++ b/src/app/modules/catalog/catalog.component.html @@ -6,21 +6,23 @@ {{ 'catalog.title' | translate | titlecase }} + + + + {{ semester.acronym }} + + + - - - {{ semester.acronym }} - - - - {{ - 'dashboard.header.title' | daytimeKey | translate - }} - - - - -
@@ -35,7 +26,9 @@ {{ 'dashboard.schedule.noEventLink' | translate }}
+ +
diff --git a/src/app/modules/dashboard/dashboard.component.scss b/src/app/modules/dashboard/dashboard.component.scss index e37b3f54..dc4938ff 100644 --- a/src/app/modules/dashboard/dashboard.component.scss +++ b/src/app/modules/dashboard/dashboard.component.scss @@ -44,7 +44,7 @@ ion-content { .scrollable-container { overflow: hidden auto; height: 100%; - padding-top: 160px; + padding-top: 122px; @media (max-width: 440px) { padding-top: 140px; @@ -52,7 +52,7 @@ ion-content { @include ion-md-up { padding-top: 0; - padding-bottom: 160px; + padding-bottom: 122px; } } @@ -100,10 +100,10 @@ ion-content { a:first-child { border: 2px solid var(--ion-color-primary-tint); text-align: center; - flex: 1 1 auto; + flex: 0 0 auto; aspect-ratio: 1; box-sizing: content-box; - max-height: 100px; + max-height: 60px; @include phoneLandscape { height: auto; diff --git a/src/app/modules/data/detail/data-detail.scss b/src/app/modules/data/detail/data-detail.scss index b862d204..2fb60d16 100644 --- a/src/app/modules/data/detail/data-detail.scss +++ b/src/app/modules/data/detail/data-detail.scss @@ -2,6 +2,11 @@ ion-card-header { font-weight: bold; } + stapps-favorite-button { + ion-icon { + color: var(--ion-color-light); + } + } } ::ng-deep { diff --git a/src/app/modules/data/elements/title-card.component.html b/src/app/modules/data/elements/title-card.component.html index 3b1a49c1..ec4df2c1 100644 --- a/src/app/modules/data/elements/title-card.component.html +++ b/src/app/modules/data/elements/title-card.component.html @@ -35,13 +35,14 @@ {{ 'description' | thingTranslate: item }}
+ + + - - - diff --git a/src/app/modules/data/elements/title-card.component.ts b/src/app/modules/data/elements/title-card.component.ts index ae8f00a5..865f8a1a 100644 --- a/src/app/modules/data/elements/title-card.component.ts +++ b/src/app/modules/data/elements/title-card.component.ts @@ -57,7 +57,7 @@ export class TitleCardComponent implements OnInit, OnChanges { ngOnInit(): void { if (this.item.description) { this.descriptionLinesToDisplay = this.descriptionPreviewLines; - setTimeout(() => this.checkTextElipsis(), 0); + setTimeout(() => this.checkTextElipsis(), 100); } } diff --git a/src/app/modules/data/types/message/message-detail-content.html b/src/app/modules/data/types/message/message-detail-content.html index 11c241dd..9e33e3c4 100644 --- a/src/app/modules/data/types/message/message-detail-content.html +++ b/src/app/modules/data/types/message/message-detail-content.html @@ -36,9 +36,7 @@ diff --git a/src/app/modules/data/types/place/special/mensa/place-mensa.scss b/src/app/modules/data/types/place/special/mensa/place-mensa.scss index ba9433a6..69d0c7a6 100644 --- a/src/app/modules/data/types/place/special/mensa/place-mensa.scss +++ b/src/app/modules/data/types/place/special/mensa/place-mensa.scss @@ -5,6 +5,7 @@ ion-segment-button { ion-segment { justify-content: space-between; overflow: auto; + height: 50px; &::-webkit-scrollbar { width: 0; diff --git a/src/app/modules/hebis/list/hebis-search-page.html b/src/app/modules/hebis/list/hebis-search-page.html index 501941f6..0c0eedcc 100644 --- a/src/app/modules/hebis/list/hebis-search-page.html +++ b/src/app/modules/hebis/list/hebis-search-page.html @@ -18,7 +18,7 @@ > - + - + diff --git a/src/app/modules/profile/page/profile-page.component.html b/src/app/modules/profile/page/profile-page.component.html index 215ca56b..e0e3754f 100644 --- a/src/app/modules/profile/page/profile-page.component.html +++ b/src/app/modules/profile/page/profile-page.component.html @@ -11,12 +11,12 @@
- + {{ userInfo?.role - ? (userInfo?.role | uppercase) - : ('profile.role_guest' | translate | uppercase) + ? (userInfo?.role | titlecase) + : ('profile.role_guest' | translate | titlecase) }} diff --git a/src/app/modules/profile/page/profile-page.component.scss b/src/app/modules/profile/page/profile-page.component.scss index 500ac555..e8d85576 100644 --- a/src/app/modules/profile/page/profile-page.component.scss +++ b/src/app/modules/profile/page/profile-page.component.scss @@ -44,6 +44,7 @@ ion-img { display: block; height: 36px; + object-position: left 50%; margin-right: auto; } @@ -63,6 +64,9 @@ position: absolute; opacity: 0.13; height: 100%; + width: 50%; + margin-left: calc(var(--spacing-md) * -4); + object-position: left 50%; } .main-info { diff --git a/src/app/modules/schedule/page/grid/schedule-day.scss b/src/app/modules/schedule/page/grid/schedule-day.scss index fe0e4ba8..c9c72725 100644 --- a/src/app/modules/schedule/page/grid/schedule-day.scss +++ b/src/app/modules/schedule/page/grid/schedule-day.scss @@ -32,7 +32,6 @@ font-size: var(--font-size-md); font-weight: var(--font-weight-bold); text-align: center; - text-transform: uppercase; background-color: var(--ion-color-primary-contrast); z-index: 3; diff --git a/src/app/modules/schedule/page/schedule-page.html b/src/app/modules/schedule/page/schedule-page.html index bfc04ab9..8b4f6f81 100644 --- a/src/app/modules/schedule/page/schedule-page.html +++ b/src/app/modules/schedule/page/schedule-page.html @@ -34,12 +34,7 @@ - + {{ 'schedule.calendar' | translate }} diff --git a/src/app/modules/schedule/page/schedule-page.scss b/src/app/modules/schedule/page/schedule-page.scss index dfc23470..d9c17cf7 100644 --- a/src/app/modules/schedule/page/schedule-page.scss +++ b/src/app/modules/schedule/page/schedule-page.scss @@ -71,5 +71,12 @@ div { } ion-segment-button { + max-width: 100%; text-transform: none; } + +ion-toolbar.in-toolbar { + &:last-of-type { + padding: 0 !important; + } +} diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 41c4a277..0caf5c89 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -206,7 +206,7 @@ "placeholder": "Gebäude, Points of Interest, Mensen und mehr" }, "buttons": { - "SHOW_LIST": "Liste ansehen", + "SHOW_LIST": "Als Liste ansehen", "MORE": "Mehr" }, "geolocation": { @@ -320,8 +320,7 @@ } }, "news": { - "title": "Aktuelles", - "publishedOn": "News vom" + "title": "Aktuelles" }, "canteens": { "title": "Mensa" diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index aaf12186..bfb94c1a 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -206,7 +206,7 @@ "placeholder": "Buildings, points of interests, canteens and more" }, "buttons": { - "SHOW_LIST": "Show list", + "SHOW_LIST": "Show as list", "MORE": "More" }, "geolocation": { @@ -320,8 +320,7 @@ } }, "news": { - "title": "News", - "publishedOn": "News of" + "title": "News" }, "canteens": { "title": "Canteens" diff --git a/src/assets/icon/favicon.png b/src/assets/icon/favicon.png index 38739eb721e3de501cce96c6af8f51830c714420..b77053663c9ae5f2626d38dc004635b1e698c74c 100644 GIT binary patch delta 2564 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 diff --git a/src/assets/imgs/header.svg b/src/assets/imgs/header.svg new file mode 100644 index 00000000..637036c1 --- /dev/null +++ b/src/assets/imgs/header.svg @@ -0,0 +1,197 @@ + + + +image/svg+xml + diff --git a/src/assets/imgs/logo.png b/src/assets/imgs/logo.png index 4dac7c4fe85c9e85a0d40f275d1803a9f0c519f2..c841e8decca4dacd952739686048467c58220e7d 100644 GIT binary patch literal 12770 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 literal 18105 zcmeHuWmud`wr=Ad+!Ng0El6;8hd^kcacJD#f;)}72PbH72p%N3y96ge69T!N>^*z- zoHH|L=05k_Ujt9eSM{!U)mpXIs`|dCI#NwV76X+86#xKW$jeD-KtHQ~zK{{2@B5sx zivR#7skfG%s|L`6!qFLQVQmMZaP@KoQGh(HEdT(|Mi>{R7U2#mM8-LUkG z#H-ghZ{GN9%ABGOO?-VIW6Rr00Q*k|e`qqG-2eyJ-nwkq+CkrPf zm1%v@+fBVgd0O_s)WP*}9VIacjO$E*IP3a=wrAxQu3@;*wrtsdF_Y+|D>$2z{`z7;9R=vGn zx0vTav^M(T6!hn-2ox4ZtzoB|_inwldE2rQD=t~Bf@UUjr|2JpzecjQIJvJ9-U+u^ zYmqDfS|i%vqB)ENI16<<$CS0;_??C)oo-*oaV zTJ7=BAYt`Nr}czCg=aa3`<(1c7jEO&`x?tsjedw4HVX9D|1UB>IQIMGT&mJB{Slxk-}D(soP5x|o|R~uq;f<2h&_}(0C zY#fGXRi1fMD<|f@9T;9h&p7jfV6$Vd&+aH+%q@H!vgRH<>KpKy)2(FIp|2uHyDFCP z<@D_!Vsl5T&!X{aS?xBcc}zsB^L2<>X7Rd~8MeE4KMxs539=TtBK3X_b{$C}T|b^^ zA=N}x#Efxzi@-#+low;@IP;}|ZGnK1sx%$nMkQJuxgl{=If)jNY*cdWGSopyCa7yPiHwm}m$idC(M?%K&5`%@%rEAgQ{SDzvmfLyh z5C`e|wAm>4l-#5Y(bSKn3ne8yva&{#@85Uf(6b;g(uCyK^KCiC-OiE@xu_PM3kHlDOXNyZ%BN)7BZr$6=%6oV?|1RP+e-ad zd7=T98rNw3{({eT7YE2kbETpWpTDS}%8~(3e+-!oEgWN1F0qdnrqaSKXbnYeE$+}u_<3nBkktJj<`W!s$ZTxh6d8WKC%Eu)LP5l zL+Y91E5^<|@bY*$GeUjVvz2)Odma`)0^)`s&PsV|wbG}f+-H|7!4qsBq;akBP5JPe~C25W~zC|eRk1(Y-Ly|p9hl^?36kjtNMyx)L_+t z@4G66-wT@92f~D>g|?_NTYYkC6i$z@BaZOslMKQfa?OdZ-rPPzS~23&K*}XC1NkZ+ z_?CR5T?z4|zSLd}5f2!{>NdekOKn>ZZOJyqEaMVgOpoB0G9@po^hr3Jp?3rkMJZio zln!uF*9cKwlGyN36l&%4EMMpe#MIK^r0-FsUuh=xL~1a)KH1srXmo*72zH(Nn*RC; zhT5&v+l^f+*-sa3U(-~~wjHE7q~~p=l_$5!zVg)gPSfXYn@i&s)Q8gxl58j?v3rb` z=Wt5~FeJ*0NfIe_yCm#$fiY_|WB4w+UTW8-m03+QI%8u*I0Q}{lJdmq_id^Lw=On6 z(Z>f6m6ersDAU26)~t>Y)OD^ZttU#thS8=IqZbyW|OrK{^3 zY-rZMN(`2$kS^;tgbS*XN0K$egCwsq2zXiZb|UI^U!N1JRN)eDgDE;kW{cBG+urj{qnZgFy6iVf{L6%6k*_&}0 zY0DYfxOtXf^X`P0kS4*U^Dz~J+MQ3&Sa8MGdV{~DMGWtwyUQdFpNgsbvH2_2(P)wF zRQj_#rf=ou2V_wYAiGl~WuV$8utbgXEBYaSB5O4GRKXg7Z-5TWXD`Py<|9a;!8&5# zU7Tq7;`@a~>RFQvXU-n@bWm~-yD-!zxBL#3ZQN}(LKet-Zkq5!SHbW?f+v)MQuOe; z0{v#zciT$-jRrCQ{Ysr}l${n{EyLL`+1JGC?en0I z+}W92J0pl}a?_%Dm}`+%1qqai09cqLCFPI_3hAMfP#OYzc|DzNsWhV~Pl5Y)%{$iz zBtm*zHSdPbM+~^BW@#JM zRbW4naFKp?@+7ES^cTQmwEvEeFx)^oUnYS(`H?Y0Vw5&+>* zLtAJ7`3GwqUM?Y55Q@7oT#Rn}&UAmCL^^*+|BX4ZAFl|l-C=mxON@1pG79(V^~L4e zqp!eQvo#RuH%r4Ix8z}u){zgKMHjEB(E)CP-(FpP%zKbvNC5Xyp?ojVQn79<%W)Lx z>?Ex|?@PtoGDzsa8^(QEJ2?WbRf(Q>tGngxMzB@4R^lmOH;LQ9Y9A~~Dvl9d{#DjN zG*_d$RWLg3x-9~EVB znXpvZgLPyZ;{EBs1O$wQBr>&f-=#&;Ek@moj{F2|W+sk7_QcXUohR5h27Kna>!Vwf zw-k*s_6={jajK^>xu-XF*U%L_7Gp@mkPAeF-K{EUhRWKLT`doq82xfbhTv|~I@_YQ zNy_wqh^J#d+Eg5I@MZ|=HUZDG%3ZmL!^$-YoReM^8l_DjEImU&A)=Ive_4I9*>_+b z+-em0f}d^8aoAliU^!7>^W>QnYJJuxnO2Qb?|p@coRczf?8V}Hub%zBrj`4};}XR~ z`5O{~4jFo(8CMn4H+1uDpBAKOr(hMjl$oinx(ZH6b88N;WD`Vm?mkj^S>D2a;6#}H zw4XmRG;!c_b^7?xzmx60jsK~FJBirmI&v~GlU84M7A4_Rrw<-A4Dygh&Vv3Qy`i(^ zs_AmaQJL1%VyDY3Wu25o+e`hOT}ixG2@SOF9qfh@X+PwjbM>A+v%Amc11#C-;+)2J zY#9lm(+^mjD{6$q6>>9Fx#?0a#Y(l3u!gDV;ab-W=a4)Z?>3Le_xO-3tQPydfzBZN z-L0NV3e4hDqIMT?qx+ZV>WdrQBJS^Ra#T00kZ`a@URi5VF?_O>-1(ewm5@`a{b@Lo z<|EDyU}gg0u+~SEwGpf!97&BkS7ZVtHIZR@G3=>dT)m*HGUGI(cAGryBPQsgR+F#c zG5AU;4H9>V`?d~tl(YS+$L{HeqoiuwloapYDtW=etF`e+Wa%~QGd}b1VH?H~ zm5|kfZ9hfNRa2jcV;XIGxG-JCH>b-;iu@bc;tRQH9hKnnRZ^SDjkAacVuyQEJ{Kk& zgz1kN{ty}>>a)?EJZ4N0nE*8s^{gvVP4YXhcMB!xT`4xK4-=${nW>bD-N7Mo zGtV1Y{9o$RFS*dLMV}-nfSOYIVkF{BvnV+N?6->$Y@UCzmom_5mCMZb+h5>B7DQC< z4R~UjJ9O92WR88iGy7;8+H&xtD|~^r{M?p8WUu8ZIgcu+`_UOOjtWhPgD;a6Z1q+y zhjNdTcDY1lqb=WJ<{&~%_#;gKR-!GgGO1qQ_@<*$v{aP{PmzSMFmA4=jMN&PmI2Dl z$9B!pKIO|kvdc0hBlI_qb({=7v7zsmqR}(gch9?xAC7BxpN^_7zp`?C$s=%#i!mLo z#FoxNOAVhwy`*G1^Lm&)Hl&1qnI$swnB$@>w#7sP+@8OIX`T$q1DP#qA*B>)O8--ST>MnlJE z-zhg&k(;0pkk_Udtr>VrD~jcB+I`Hx9bgl$N==DkqPk8ji-YNj>dfuN5Lt(LmNamf z-3kEUhFC*y(e;#-gv`M9Y(R6cDTvL}-Vr(|06bS zm8+|x5IehvhX`L2i=B&$6^dYW@p5nlda^pWQ2(U(jYA6LV&)9> zq&3)q;wLB26zt|ILPZ7br}&-xr=O)gp^d*Q_<8+{-o@3NT^@SD1GNVVVCUlC5Mbrt zV&xKK|Fb-_S6TTFX$P0zy$JOuyC=|*os*4&-QNChBwSpj-T$iZ?@G96L7$YcYk*w9 zZq8;PX?Ku=EA^k1I@-Cp{8^`)3+QLluW{R%Td+e1^-J@gWn|@*)&7wA=|)Ryd&gfA zKhb|inw$NBb98gI`-L$#V+YxR?4bj3fiiRc4c^fT>A;?_`c3sYVWK~7FiRv<6804ona zuNkYLfH?=N1wSt*4+n@F$Oq#76NRd?H8gF2cK_ES`8i=i;%f3DR9tKvzleXesM!Hs zEx^w9B2-G&4sM=*?a;Ee2Wh$je>#bikCR6bY8XF1CkHnd2mfC|Iv{5kXg2)h95W$J7Z)g6+W0%3yPl2-R;!{+uBpsEtq`1Apch zROv4fsI!G6ok2iXkQDR<)x*Kb!^+9U%FU_8$qB8|;Y=4j`LyLwv&=vRx9Um(PCo89*7KeZk54R96A2SD(_fL4RxwVDY|AhWoA}EA^ zPktdKu-PvoejB*?ug>2phy>7*{WmQ8KLh_aCQU1_hr_?d^H=B}EaJ|t9$;r%RcBRG z8<3gnKj-;-;6Io&ptak@)!9q_e=zF5;Dmq6A~~om*xBn(`ZYmLzg_+29y{w_rIdo= zS5XrJn*A0EX1@Z!{MQ^p{rp>}_20>yZU~mCjxOxDcLE@Iss1uQ7|Y2&8!`MmLtZ$)$U;h`Wf~AFdBcG<=@whe`FTe!5!r63i>aGIRc%5(4`HU zSt3*x&R~0rKaz;T6-)tibhNYnExg#>9n61UAO6TJs((eX3()<)DmAkLI#`0BtMTup z_@8>2^Is@@|7%|6%R?)eMvzL_~%wbSy|}Mg+ln} zRzyht=R%_C_A~fF&VO4#eq$15{|C4~$^WXy;Qvwl&#>R5CBcqf(Dm2KRn^1cpQ`^m zz~2~@tj$0UF8@^bpCP}w+>)-OgzXkqJbp1bb7wTW1tbrV$8+Z@sbF(t8Ko3N-_GbumUEYYIAdBcR}VebB-dJ9 z1b;*sKWomVs8eVvP1s$w=ZAbW95H7j_ph-oAAw?%F+>?x!cL)j4DNNSy;bJr?=|16 zOV2TE>QYjM^$#Y6C{9Q8c z6-}B_4HuChfm#^q$mftBz2^?&eY>Gqcq#xR_T~pp)KK>zi?!zNc>8uQSoqu^=IYa0 zzQ7FC>0^6VZ}=;FIKl;c<#jkVkHB7fBQ6?Q)Tt{%)Si1{Kg}mZtq9)ptLp~$0)7Cl zS?wc40RebZ=~3fbPY(}E@Q+;U>svU573Z|bQMo||z!43WGARvH*g@1S5rDhZEOr-o{FyT!ld0?2; zIT#gEQi8S5l4DtCUsTfutMjyZ7o_;yUTkG|-e#M{b+^qgr@6U}@2PyUXW;q-+T*rBI!Z$O0|d{ zMq>L;lOBMZf6!*xaM$@gH`QhFQ*^4o&;7`iU~~8W-CC>|;^xA|o1NS0?W=37#oJe& zh=I2-ci0alTrYOJT^RxI0h<0i!V*|x=W-dsjuT@qpW}FMvcI^q?)Y-otyBNb0QUY7 zZ3DLNb?;s7{@%>tis=`G5V)-{rw#FcSw&=x?xLY8BG$?!+1xv}CKUyVjy zdT8{n7-9wDVc7c(4l=z!**V?a09S3hA!FRr6B+|HXN=T%Z12ot%8>o*B#W;5EJZ;A z!e;0wN{S!d+ygdZ$i*H%Fj-vMEb6*mqF|p%N}$Q4f4uj3ill+YELbVU({&-#zTt0& zU*CoRxtP8|aO}Gy0&+-8a5d){Q?2XI5m8$M#g7 zLYXv%BG7##(>B%Wi{rR2zd13u$?-zrDG$H#c&;i+l^_DC?9fa^WPLN71gwghtUh%5N@R!ngU}L(Sa6II+IS%?3xghN6EL;di^N7`6Ze-ucqpsvJ6RKTlANgh){+B*j zL12d-qH?KSX_-EC%+u5tRJ&vJp!#pi7Un1oSK6bCoS}S07!^C7vG^1uWk4TBmSj%7 zu z#=*$kn;0&_K^i4*P;`f*R2p}w_6V6)zr|6x4C4Iav{>%O#!O%aO9&;5olhTG^#~Kj z2W_=l9K}ujJ$0BJr6*~7$z?s|V|QP$*Iwf)IS>P5TK%hUJ9OqZU&!bV3LJi|nH4@U z8Aqc%xuJ` z`t_)lJzn<*>x^zZm)6d~rO|$}1lj~lfhdj9v#Zln)v@jTbyFJ+Nv=IjXD>oyHKn7iy_*~dt570a#GKBSD86HJI>0%KkWPkp zb_Z&?wq=(!)_Q5gc^#wyg;6$>0scoj{6^pUU}I|n3rD6Ti76*$`H>Mu3yP^EIs1vO zQgla)ucpj_ooJzxAx=o(u%=IGst5@!>sK?A{Jvk75bqJpT)bISy5UYmF3?RRpL1_| zBc7S`b+10YZ)=Cp*JZ?nu#nr#d7m;)V1q>UuxO7Rw8L`Ey7){HcqHwj>ii#9UD6%T z5e2q2w@jDO=4E1R={pw54gH^dUfaK#)hHhb6)^4VYzctkAQeELFL&ITWi2;0G{vF5 z`EDLCf}@7F8IdANmMBDbl87}SSWX(RRQKt6Yxi9>9?KE=g0%!!Nr$VNYRojOgq zAJd=)c#ROfk6$ymP7|HD@}Cs;%Ee}1dx~>bksQVN7FAdxWCqbLV&xjg&h)M3ni40l zBU5#gyN55$q>c1@ry6grrZ?S3SLuT?TjcFAJ~egAeaF_0iA+ML9vvkyQ|&W-f}^GQ zJo2_T$;8ROc4CsG6|H1HZaO@*c{N>!cTZ9K=43?y1)oqngt7ifXUcjgVOPPsr?onw zg{#zI6;rsu%aA9sgbq3WEi?QbJVCU()7hQ0nYiq1?cIC}pc)IG~G zQX|$&4P<&|w55rBoJ_B`4_1q4Z1Urk3|NC-8cz}#19g-GW1Qxo89EF9>GM-vIQ8*0=TFC&| zg^RH0@zGpBWZ7wH8>9q*Yg7eZ)aBdap$w^EmznI+56X5`cC_M|%GOHx&$O_@Nm3?Z zq=#R-f7XYD$3nibxMz_pr8vbKpaf_5vc_k9Fc>U0KezaLq*A14G>Cwh8c-zHwjvHU z&DjvcOu;G67j1zeJZ^4-X?c)tZ2Kq4`rkxEW)DfLQ8RlvCFFY$_ODmLYhNOGnP(_$W=v8cNkQJyn$ac_=5WF!^4fOs z#K_gbmZ$lvTrFAI%-(rKa(kB<9(l?$PHzg`zZOHR!HicrtdO?$lbeX^l4^PtQZ z0kd^`J$>X@{I@)35Y{^E+rvIsnw9}`pV)f6NclR7jB%{CEX}$eXLjY;I`kX4JM+ZhiB#=)zA_}BJX3dN?kELH%bDpvsI`e-%>1xt>qg39T?A9-2 zRn5dx*OQS8E{-In@H@1m9SkgZZNx%|bM+-Du{XGwE~X|c)_(YXeW?OEf)5^gN?xD-%(6)r-FhK z$xGwr`vt@P$LB-`nh<|HLoBwuzVt*=Jj-n??;1iuK!QM*`YXIN#5J+nfGh-@2zkRW zEGB(esU~+wJv@QZCcuG3(u5c@#L;*zFmY3(Zk9hY+LWwOR?#3K>^YBZbKp=b2?nMr z_TsZ@+B)Xm5vl}rBLmTNj@?XI$?J1P8#v_K1Da67==L87%k%Bm9;##J+ujRfCvh|U zxkxgSu(UI7n#JBbR|or7m$7m%mS2rN`+R*ih9ZIBUy57S-vCe0y5J`W`6xjh#!xw4 zdZNRv&+PcBz})Bcpbve_X7Sy?;pDg)%TnWynhJi7*=sbWg0wtfzzL$l76x8i*Z}g0 z{m>8i%_0oVr*pH*I43Ey=EOE*J2IW+{v&MWM;)1&5ZeuNEmJLprN?FRe*2-kj8I@n zK7OzP{(Qa&hW0~p6Jn$P056|av^$G(KWykLq#h&1H>u(B)Cdc2V2etQ&EeUZ>fa;c z%kHX*T0Hyi#Op;I`YNY<$2JyOa%KPR3r6o)cE$Y4kc|+-c=Ggb&Q#(nFBm0@QJyEV-*GhF!CD976nuvb3?O2SFmq&} zLq1QD$K6_IY|n(l47vy(xx(0CwnHi8fY^zzJ?`#57r-re85l?OO24#c-TONT;1PUL z(THWiOHLp2&W=Rjd3wro^fvU43%bZBATq=)Q0v}ZKxtR{+qBPtQ6l>KXX@-5bnend z=nlH^W4+Cm>^ngvHhP=T`Vsv3fx=g9++i=2vY+fxvYqp3QgRQI{rM@Q#pl|2f?J%G z1|ZQ<%_1h8C#Qqpv!t@2_WL`iASJ{j$G53Ie)=4dZ@zo~5~5 zrcJE5eYU=v8MAbhqMB3~Q+h*?*U(eX;LcJxUf!xBpka{&*b=5vrS9bvXk8j4?NL z02__Z?4IT>>mup-|>lN&Uz>9#9O^@!o?VUWM#vW1c$u@5Ej*!3w>lI`@ z>bOEvZUiE)uBGn|fLg!DwKTe+5&tiPmzIDIgr2NGA+l!tC|uy;#=!`^Gga67;pXJF1t6_dUe-)D@Sns7LGX)!=0%HI(VNou zy*&?LPr7azMd@pQyjFO#m*@tJ{L*3CVF}X_8HDM#y{pfnXhPn3uo?~MP{(bwOB5$z z{GfqV^~lhw^7-rW&z{dx?{9Ph{jDk&I!e-+Sm$6F7~|;u8ov3;E!||JvMxtapaiAl zHI6vZ(8>Cdjj8{jfa&fO2%_C=f=4%wHB%&&*=rE4W+GI!uQkC?fnT79HRcv??+WYz zPw_uU7hRT5xt6HVNMkNUyD)Zi;F7<2pBQQd30_5|i9E0P)I{Lxr;9gT`K0R+3>Na_{{@II55xFTBepNvAL*;){{6r-^Oax+AWB( z+wFVN=JRDI=OA(Y4m}MzNlDA{K>Y8DBiEX+X~zFdAlUPcY7J3FE!Vs)8535&MTwU#?r!D#8{4` zj7qA0>~+?xn{h{D2C} zr2wn28@OH%}$ z`NjAS4S6MK@pq<{vSl(%^0oK>S)!^FxkMH7x;^tizp z^PORHr{!0dfZgesnnw3x>}4U0&lQ?8rptVoBI(BTDXm^h)zOWmt)8-0y;FAYB(;V7 zZQ(~TmSpBqOb6cE*1mm3SxoI&K%zsUAJV`Jp;uZD-_FQ%M{f_d)Otv^^dleQiBiWHJw#jQz0S#1ppysemMT6SEQ`NV$=GZ}Pk{ z=BJe-TMrC}_*hdcVWF6(3RcY{hS#cbn+@&kC|EvEEu~t?5&fCx@IMoVi z11yMa0ZdGwSO#<`zIYlrb`tu`sB$;*E!)QT%gu1%!qJ9#^f^ds^+1hVgR`{HoX*4J zFxQ*t_bI?s*}3t`Z(aG@PMsakgP^NyMm1_-BVpUQGh&|p60#)CY)aXOK`VV3(s_v^ zRaSIEQEi8~%|W?pUaRMb1SWy_S_-}I%l6r54{6Umm}jGJU9VYs$x?Ur9Mu8R-i_z0 z!N(u1Aqd8#MJ(k$w%Am(+dBNQR2)EYe%qxT1%`qu@_TS)`-M#?)z@A1bbpQZ1`0P)iZf;1rBTp2n(dsFLU6g`nohqigD2us3DzQz@XHxkF8;c$so4cRyl*{7|&rGx|7Y|?f%M$9j6jWz6^O z=<9Kze9K}>{bl2v;wE2(6Y`}`UZN1|GUH^}s>jM0+UD~m_@1TAv3jb<%96G_5}lM)W4$yR*Pu5wrT1WOh<ggUHw>XKF~3Tq-AyKSft$})=uP``q>)W2*vi8A}l1`O?b~w=b*VAC0&#@wPvJJ zDG;zhgme*=*k(T+8RZteI9nI>Duk?R*kAU*$|HE;iB=x2C9P9QPRhSuF11x0XRO4t znbpr)0rfLzoXf}A);H>e?@#N&urWC$$5a$#fL z;^1P+wamhq)_YFrp}q6Ux$G(;Hxd^~nKsXrkU^&J^|eiUkU;dH6%^z{5=gSal#r<8 zn)w^jiE5ymVqVsl_p}iS8A!1bYDdFX&>ul@eXtrMpIb;s9UsY#xNfV8ONAI2M#Ez8 z!Aqp`&Idm2h=3eOrZCzty6Y$+&oKrX92OGnXcVn6n+d*hss z0&+koRXEdWTLPzrM1o4ZCZ6gwpY0(Fh!Vk8EuKO!W*n8lf>_;`3Si&%ND@9VeN)=2u?Kobr2 zcDi!UT+nx!pFh=j&q~k8K|fzvU#ygO_=<#EZQEEMU!i)sG8Ii+xdWym%Nz2*l1V$f ztKy~T_Z5{#7M7lYjmV7Xse+y8P!QQ@6%08Su`Y&wbA!YN``N?C!hPqHRLA)88Ws@{>*3Pwpv0xG8)}92u?m+-VAto;wAXLWi8PVa zTSy>E9<|0M@5Ys^n0swrN*PU74)%4lI%lcs>CMmhiuAH;YL1K$sgmvu04{1>>gwHy zKL|9^Yl@~Q**mnG5q~DAIOUbwBO2C1Ej}}8@4PKRIoYtnglwJ1EYewjTIOP^kRR92PtwMgUQDw$e4iG?9c|6O z>UT&9>t9B1@AKh2)E9xc_KPb={knhuTACPBj7ejGkbUigQHJ#PA z=4P_YJtHC1Ba-c6yG5-t9-rm_wZQI8y-$!j8?Q?|67^<2-H8Bp7;rW! z((;4;aG>~XF`~^AIHn^5@ujLX$2(N6{QGrI?p;I&WPr20&B zKJA%=YsK$*TX!{hr;0@ee-T%<;dj_ou_ofaGk$W;YSqqvH6^3s%&s=p+vJ+2bFSt* zSj;uRcWkyJh&2<6o-to|+Tj%k>TKVBwo|s-W8~MUV|j^Qd!B4{x|`!P zY!yx^cne%xcmpJ?1%f#D4BT5!)ttL@!u%MR`7&yAQlWM4-J}ZCTwdY>EY8T!Z z&l(sss2gO|INaR!=5(IeTa=U7#{q_`B^Fn)!8jsBY1VoGgQIcQ-tSm&4ZBMscp$2> zIKTwe;_&pgM`FC<$j-{A!$Bi)F)&Iz=Z+7X9bIx?`Y_R_@%=rYg1Uv&HYr3eSy$CpG)iL!LqF$-z41} zhN8_}uSR+WV@ZYjgI!OE27_$@o%*q~!;-jy`d4j}T9l$Orel@xAI}sF_!iqm%%P_` zJb#`A$RNc9cS9eQe4rXuP*#$`*Ueh7VkZ0KX46CjZ;ar+b(+MZ>^fS`#=a`k3o%3= zLFtK&OOdG1RMJ2@mce0MNconD@ueDLlM--u#8fvnR~P@)`uS=^_$nzRg-Sxpo?RAS zA=OdJ<{MXfNsNIBg0q~N(&cayWsWnfTv4)E3+jpU%B!~~aOQUGm6>T-=T+|zxj3@X z70{=+-cLDJ6l;AR)nci|kh9rFi?Vj!AW^KFx_KYVFGijpz><-jyBW{O_{BNI3j<_P zS#)2t{UWpyTno56)9z<$TyyVfF2 zSu&`Ny|F?3xEH#}vE*agJ=O)M6`up8$Vmcv4=Z_fzcU2BdZ`~A)^cF%yUP{W4(Pz` zDSZ|5CE^^bo!^4TV~P*pPu^q1Z{)jM(KguDTp4Wr>dpvY47UkA+5nS%FXmnO3h`nR nAd0w&>G1AuSaL7z2U`ED*oFv3lql#C4S>9~id2n+N$~#x@*{lx diff --git a/src/assets/imgs/open stapps logo.svg b/src/assets/imgs/open stapps logo.svg new file mode 100644 index 00000000..128d61cc --- /dev/null +++ b/src/assets/imgs/open stapps logo.svg @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/theme/common/_ion-toolbar.scss b/src/theme/common/_ion-toolbar.scss index caeb7328..3cd2f3bd 100644 --- a/src/theme/common/_ion-toolbar.scss +++ b/src/theme/common/_ion-toolbar.scss @@ -11,8 +11,13 @@ app-root ion-toolbar.in-toolbar { --opacity: 1; padding: 0 var(--spacing-md) var(--spacing-md); + &:first-of-type{ + --padding-top: 0; + --padding-bottom: 0; + padding-bottom: 0; + } + &:last-of-type { - padding-bottom: var(--spacing-md); --padding-top: 0; --padding-bottom: 0; } @@ -23,6 +28,13 @@ app-root ion-toolbar.in-toolbar { --box-shadow: none; } + ion-segment { + &:last-of-type { + --padding-bottom: 0; + padding-bottom: 0; + } + } + ion-menu-button.filter { --padding-start: var(--spacing-lg); --padding-end: var(--spacing-lg); @@ -36,12 +48,8 @@ app-root ion-toolbar.in-toolbar { ion-title { font-weight: var(--font-weight-black); font-size: var(--font-size-lg); - text-transform: uppercase; } - ion-button { - text-transform: uppercase; - } ion-menu-button { width: auto; } diff --git a/src/theme/components/_card.scss b/src/theme/components/_card.scss index 3379e3a1..24f4e0d8 100644 --- a/src/theme/components/_card.scss +++ b/src/theme/components/_card.scss @@ -12,10 +12,12 @@ box-shadow 250ms ease-in-out; } -a.card, -.card.clickable { - &:hover { - transform: translate(-5px, -5px); - box-shadow: var(--shadow-cards-hover); +@media (hover: hover) { + a.card, + .card.clickable { + &:hover { + transform: translate(-5px, -5px); + box-shadow: var(--shadow-cards-hover); + } } } diff --git a/src/theme/variables.scss b/src/theme/variables.scss index fb81d617..44f33acc 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -136,7 +136,7 @@ --icon-stroke-width: 1.2; - --tablet-top-bar-height: 100px; + --tablet-top-bar-height: 96px; --ion-tabbar-height: 50px;