Commit graph

70 commits

Author SHA1 Message Date
Pedro Pinto Silva
c5eab84ab8 Freemium: Fix sizes for Classic and Mobile
When on mobile do not rely on background position and instead add
img element so we can properly resize it and adjust it:
- Less in your face
- To not disturb or overshadow the actual active elements

When on Classic mode:
- Hamburger items: Use smaller lockers so to do not get in the way
of reading the actual item label

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I46218254a975b3a70d1e4c03eb1795d87f3861c9
2021-08-06 17:21:04 +02:00
Pranam Lashkari
fc9705f0d0 final freemium patch to cover all the UI elements,
specifically more focus on the top toolbar in classic mode

Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I33eebe79addebe3acfcea4d20912cc31b759ffce
2021-08-06 17:21:04 +02:00
Pedro Pinto Silva
22b4595e46 Toolbar-up: avoid adding extra padding on the left
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I7a36f0a50b2e8867e18744270bb6d84d6c5a917b
2021-08-06 09:48:00 +02:00
Gökay ŞATIR
034b594bdd Impress: Adjust mobile edit button position.
* Remove 3px margin of read only view.

Signed-off-by: Gökay ŞATIR <gokaysatir@gmail.com>
Change-Id: I8f72ea952e2bc734048fe4e02e6ba1784acb1369
2021-07-20 13:43:22 +03:00
Pedro Pinto Silva
48ba9257ea Freemium: Dialog and triggers: Fix style and layout on mobile and sidebar
Mobile:
- Checks if we are in presence of mobile mode and adjust layout
accordingly based on class
- Makes sure that the illustration resizes
depending on device's size
- Adds subtle animation to get the user excited or at least curious to
tap it (avoids making the disable status to dimmed/not legible)
- Fixes layout and buttons

Desktop:
- Adds hover state not only to button but to the locker
- Makes locker a discreet overlay above the respective button, suggesting
"this button is locked" but make it react so user is willing to click to
discover what is it
- Added CSS rules for top toolbar

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Idbe66746c5ad07647cd62eb94d3b22a840bf70d7
2021-07-20 14:41:18 +05:30
Pedro Pinto Silva
7062fe28e9 Freemium: Use vex attributes plus styling
Do not use external html file and instead use input attribute from vex
so we can send html while being able to use variables (those variables
should then be overwritten by integrator)

Also Fix styling and DOM elements creation:
- Avoid to many elements and messy notebookbar with multiple (states)
  - Replace disabled feature icon with lock icon
	- Also style it properly and make it similar in other properties as
	the existent disable status

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I9c2a07ef1fe5f089d5e63cb53d2d6b7f0b5083a8
2021-07-20 14:41:18 +05:30
Pranam Lashkari
e02e1df76d Introduce Freemium options
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: Ib6b68ff74839cf84f2d8c8cfb7d380be9209f923
2021-07-20 14:41:18 +05:30
Gökay Şatır
fbb180c2c3 Style: zIndex adjustments for comment list.
Signed-off-by: Gökay Şatır <gokay.satir@collabora.com>
Change-Id: I4eafe53d0879e278c48e9168163cad91227aea0c
2021-07-09 21:05:40 +03:00
Pedro Pinto Silva
83e7f44715 Document-name-input: Fix top position
- replace old random top value with half if its height
- fix height (to be the same as the neighboring parents)

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I738ca92b78daa4db773fe4dce6f1dd3d29001403
2021-05-18 17:08:51 +02:00
Pedro Pinto Silva
c9b593741c Notebookbar: Improve shortcuts and fix top bar layout on tablet
- Desktop:
  - Shortcuts is now centered
  - Avoid setting hard min width for document title
- Tablet: Better presentation when on read only mode
  - Document name is now fully visible using all available space
  - Fix layout when on using tablet in portrait
  - When editing:
    - All top elements are now vertically centered
    - Document name uses better the available space
- Tablet: document-name-input: Fix shadow on iOS
  - Safari was overriding it with its own styles
- Generic:
  - Document name: do not use ellipsis if the text fits

when porting this please be sure that 81a5d029e was reverted first

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I82abe930ba5e26c004b387fbf4047de8412b8a36
2021-03-29 09:34:35 +02:00
Pedro Pinto Silva
0c6bf9c28c CSS var: Add one more gray and replace instances
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I8091ebd6e720dba8b6af4c503f515899e7f5f2d1
2021-03-25 17:24:57 +01:00
Pedro Pinto Silva
89442173fc NB: Improve alignment by removing extra margin..
from nav when in edit mode (keep margins when on readonly mode)

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I83923bbb34e34c20daa81e80c5832778faab8e1b
2021-02-17 14:47:07 +01:00
Tomaž Vajngerl
bf0daa2dce Use own icon for drawings, don't share with presentations
Change-Id: I6cecc9869d36bc1e45a4ed88344c62e0c9adac1d
Signed-off-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
2021-01-21 10:22:58 +01:00
Pranam Lashkari
47e142e278 leaflet: fixed menu entries being overlapped by menubar
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I38f8b6db97ca91901657b1738a87b4e40c2083a4
2020-11-24 15:24:51 +01:00
Pedro Pinto Silva
5fc2098d29 Fixes issue #450
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Ia657661252b2611d5c8d7f7d826b4510e07fa226
2020-11-06 13:08:31 +01:00
Pedro Pinto Silva
eee430a4ef Fixes issue 237
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I2c05bfc1a8906d6b67e3736174132e5cac9d0052
2020-11-03 13:24:21 +01:00
Pedro Pinto Silva
88ed22fe37 Desktop: Top menu: Fix contrast issues
on elements with .disabled class by increasing contrast ratio
from 1.6:1 to 5.5:1 (> WCAG AA)

Change-Id: I28b0de258657ec34db0f3251cffe32dc41bfd511
2020-10-07 10:17:40 +02:00
Pedro Pinto Silva
fb6157b65f Top Menu: improve resolution of menu marks by
using svg instead of unicode content

Change-Id: I66629ef6cfade8c24701bace3f172e28fd5243ae
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103241
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pedro Silva <pedro.silva@collabora.com>
2020-09-23 14:24:06 +02:00
Pedro Pinto Silva
f11ce477fb Readonly: fix styles and multiple document headers on notebookbar and classic
- Avoid having multiple document-header elements when on notebookbar
- Add classes to the main-nav element when in presence of Readonly

Change-Id: I82cb816fcfa28d790202c96484a7e8c99f3875f6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103004
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pedro Silva <pedro.silva@collabora.com>
2020-09-18 15:16:25 +02:00
Pedro Pinto Silva
bef32043d6 CSS lint: add more rules and fix problems
- Fix duplicated properties (ignore cases where it's needed
for browser compatibility);
- Fix space inconsistencies before !
- Fix space inconsistencies after colon
- Fix space inconsistencies after and before combinator (>, +, ~)
- Invalid calc
- Many rules added to json, namely no-extra-semicolons

Change-Id: I78af6bc546aeb1d7d7090e2ef278c895f0393a07
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102289
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pedro Silva <pedro.silva@collabora.com>
2020-09-09 11:48:31 +02:00
Pedro Pinto Silva
175ac6e740 CSS lint: Code refactoring
- Detected many duplicated selectors within the same file (squashed them)
- Detected inconsistency (sometimes spaces sometimes tabs). Tabify as in JS.
- Detected quotes' inconsistency (sometimes none, sometimes '', sometimes ""). Use '' as in JS
- Avoid touching on files from 3rd party sources (jquery, w2ui), ignore files

Change-Id: Idd82945f29ac6c5c9f522e5d5df4a783a367654d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102009
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pedro Silva <pedro.silva@collabora.com>
2020-09-08 17:02:30 +02:00
Pedro Pinto Silva
1c4dcc1f58 Document Name Input: make it flexible (dynamic width) and
* convert var colors to rgb
* use the var colors for shadow + alpha (rgba)
* .document-title container: remove table display and add min width

Change-Id: Id4289af91562790edd23c83d4e70a16688e44fe3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101048
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pedro Silva <pedro.silva@collabora.com>
2020-08-25 12:55:50 +02:00
Szymon Kłos
1519c773fb notebookbar: fill hamburger menu
Change-Id: I7812e241dd47b8481159342a526813b5061b5b70
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99768
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-07-30 13:56:17 +02:00
Pedro Pinto Silva
c424141287 Notebookbar: Add Menubar icon
Change-Id: I49f3fda9d765f7934a80b8f71007adfc384fd3e2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99574
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pedro Silva <pedro.silva@collabora.com>
2020-07-28 14:58:38 +02:00
Pedro Pinto Silva
a8db0d749f Notebookbar: Fix tab shadow so it does bleed out when collapsed and
* increase distinction between disabled and enabled buttons,
* make the Selected buttons to use the same main blue color
* make the Selected buttons with text to change their text color as well
* Use --gray-bg-color across all files

Change-Id: I50b8ab86216211de37ef6c4d2b2c6baddc783ae7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99349
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pedro Silva <pedro.silva@collabora.com>
2020-07-24 11:01:10 +02:00
Pedro Pinto Silva
515fee128b Notebookbar: styling
- Overall styling
- Fix tab’ alignment and paddings
- Fix tabs’ states
- Make use of text-shadow to emphasize instead of changing font-weight in order to avoid changes in size
- Add document-type class in notebookbar (similar to what I did for menubar)
- Style jquery-ui tooltips
- Style .unolabel
- Start to use css --var for font and colors (still no changes in the code per sea [like reducing the values etc] just start using it)
-- add comments
-- Use it depending on doc-type for notebookbar tab unolabel
- Add missing icons
- Fix extra border (toolbar-wrapper)
- Add document-header

Change-Id: I24552b118657d8ead47a74a6d189bd2448aac808
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98721
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pedro Silva <pedro.silva@collabora.com>
2020-07-20 09:35:25 +02:00
Pedro Pinto Silva
cc61195faa Make sure document title bar is not above dialogs
by reducing the value introduced in db32e4fc38 and instead using the same z-index as its neighbour elment (main-menu) so 1000

Change-Id: I92d893d1a092e16a1455a6d1941a98e73ec63d1a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95103
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pedro Silva <pedro.silva@collabora.com>
2020-06-01 09:29:55 +02:00
Szymon Kłos
db32e4fc38 notebookbar: don't cover the title field
Change-Id: I9e94863784150104d7588c8dac532343766f7154
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93619
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-05-07 15:33:36 +02:00
Jan Holesovsky
888649f9dc mobile: Seems that now we can remove the last remaining @media selector too.
Change-Id: Ife182ef2d9ce56a2bb7b6a6bdf8240c483880ddb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91630
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-04-06 12:06:12 +02:00
Jan Holesovsky
ebcd7816b4 mobile: More menu-related stuff moved to device-mobile.css.
Change-Id: I33df7cbfe4835caf2d9757e8f357f456b9d1e777
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91474
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-04-02 09:03:54 +02:00
Tor Lillqvist
7e992e4d4f Hopefully better fix for the missing w2ui-scroll-right in iOS app on iPad
Revert more of b62dcc0255, and also
revert 418181411f.

Now I seem to get a visualViewport with scale 1 and width 768
consistently, which is a relief.

Change-Id: Ia619a51047dd2a05ba32d6a203c3095198d3b4d5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91436
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-03-31 19:35:20 +02:00
Jan Holesovsky
6964ca9d69 Fix the menu height.
Change-Id: I258ac19e05bf7925f450a45b7ca5ebc813fc0384
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90836
Tested-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-03-23 16:15:59 +01:00
Tor Lillqvist
b62dcc0255 Hacks to improve user experience when changing orientation on phones
I now think that much of our media queries with (max-device-height:
767px) actually should use (max-device-width: 767px) if the intent is
that they detect the case of mobile phones, as opposed to tablets.

Many mobile phones have a screen.height (which is what
max-device-height in CSS refers to) that is clearly larger than 767.
But a screen.width of 768 is what at least my 9.7 iPad has.

Change-Id: I3b44e32ec583837897b4aa390fc0ab92be59d163
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90752
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-03-19 15:40:44 +01:00
Pedro Pinto Silva
8255828819 Mobile: Fix header-left alignments on mobilewizard and fix document container vertical(readonly and edit mode) position
to respect the height of toolbar-up as well as the main-nav element; Set 0 vertical paddings for the toolbar-up.

Change-Id: I4951b47a5c8b4fb34285c45b2ef9765245068b4a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90253
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Tested-by: Pedro Pinto da Silva <pedro.silva@collabora.com>
Reviewed-by: Pedro Pinto da Silva <pedro.silva@collabora.com>
2020-03-12 13:31:54 +01:00
Tor Lillqvist
dd70a89a60 Revert the changes that removed the menu bar on iPad in the iOS app
Change-Id: Ic374514bfdde4682f88b507eca82cf88df36bc9a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89329
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-02-24 12:19:27 +01:00
Tamás Zolnai
542b4b69d6 css-media: Remove 'screen' condition with invalid syntax.
It should be 'screen and ...', but since the other rules don't have
this additional screen condition, I just remove it.

Change-Id: Idabf28fbee303e19f1a5f5c75f3eb5e7387ac3fa
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89170
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-02-21 11:27:32 +01:00
Tamás Zolnai
364623c87f mobile: Fix css media rules to work with mobile emulation / cypress test.
Restore the media rules we used earlier for mobiles.
So for mobiles it's enough to have a small screen size,
for tablet we allow bigger screen size, but only with
special pointer properties.

Change-Id: Ic45f05c516ec44cd39c58463d8bf1907ec63c25a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88922
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-02-18 14:31:00 +01:00
Tamás Zolnai
1999f12b35 Revert "Revert "Mobile: change all media queries to:""
This reverts commit 55d067bfee.

Change-Id: I2077276e70e16324031b393a58bf802c3efdcb4f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88921
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-02-18 14:30:42 +01:00
Tamás Zolnai
55d067bfee Revert "Mobile: change all media queries to:"
This reverts commit ef48e44c0e.
2020-02-18 09:19:34 +01:00
Pedro Pinto Silva
ef48e44c0e Mobile: change all media queries to:
- Include phablet size
- Ensure that the mobile css rules do not kick in when on Desktop (900px window)
-- Detect if the primary input mechanism cannot hover at all or cannot conveniently hover (hover:none)
-- Detect if at least one input mechanism includes a pointing device of limited accuracy (any-pointer:coarse)

Change-Id: Idf1494acbd52ecd40e9082c8cf6f4ce88ecf9ac6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88862
Tested-by: Pedro Pinto da Silva <pedro.silva@collabora.com>
Reviewed-by: Pedro Pinto da Silva <pedro.silva@collabora.com>
2020-02-17 15:53:33 +01:00
Pedro Pinto Silva
814f4e91f5 CSS Files Clean-up: moving rules targeting mobile to specific mobile css files
- mobilewizard rules both from toolbar.css and toolbar-mobile.css to mobilewizard.css
- Hamburger menu rules from menubar.css to menubar-mobile.css
- scrollbar rules from toolbar-mobile.css to scrollBar.css and add media query
- and remove unecessary comments

Change-Id: I5372455ba723d334472b14df556825b1a3734922
Reviewed-on: https://gerrit.libreoffice.org/82298
Reviewed-by: Pedro Pinto da Silva <pedro.silva@collabora.com>
Tested-by: Pedro Pinto da Silva <pedro.silva@collabora.com>
2019-11-08 14:50:41 +01:00
Pedro
25572e7e25 Decrease toolbar-up icon spacing, update contacts svg color, fix icon alignment, tweak hamburger
Change-Id: I9a4d24ad2335e9936df372a5168993215d68c366
Reviewed-on: https://gerrit.libreoffice.org/80430
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
2019-10-08 10:55:53 +02:00
Pedro
f442e7832b fix user's attempt to close menu via back arrow by repositioning menu
Change-Id: I99fd6bc8878ec733c0044b5c88d91d111bcb6a62
Reviewed-on: https://gerrit.libreoffice.org/80135
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
2019-10-07 10:03:58 +02:00
Pedro
a4e965d433 Add important rules to 2nd level ul entries that were not being used
Change-Id: Iccab82a2c73759107f5630ece8ad530be938346f
Reviewed-on: https://gerrit.libreoffice.org/80138
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
2019-10-07 09:57:09 +02:00
Pedro
0d20263151 Fix main-nav position, space out icons and remove document-header that appeats in the menu when in edit mode
Change-Id: I8d20cc424c30a302c36daa4952c39e12d1b74f80
Reviewed-on: https://gerrit.libreoffice.org/80132
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
2019-10-06 22:04:01 +02:00
Pedro
3ff8a33a2e Refactoring
Change-Id: Id4255803321145022cc0672c942c8763a3732136
Reviewed-on: https://gerrit.libreoffice.org/80101
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
2019-10-03 10:30:57 +02:00
Pedro
7972e9517d Remove closemobile extra paddings
Change-Id: I826ea18eb45ec47d69b9998a74c48f7b8031a247
Reviewed-on: https://gerrit.libreoffice.org/80094
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
2019-10-03 10:29:07 +02:00
Pedro
3367dbf7ff improve legibility when on mobile
Change-Id: Icc56b050e28293a3da5312daba38cffba1a069ea
Reviewed-on: https://gerrit.libreoffice.org/80080
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
2019-10-03 10:25:11 +02:00
Szymon Kłos
a533fad1f2 Don't wrap menubar
Change-Id: I5283a20d50dceb945378b47fc5678798dfa52608
Reviewed-on: https://gerrit.libreoffice.org/69159
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
2019-03-13 16:41:30 +01:00
Jan Holesovsky
5e06891569 Last modification: Show the pointer cursor only when revision history enabled.
Change-Id: I64ca1936f22fc94d887c01e7ccaca4a84154aa02
Reviewed-on: https://gerrit.libreoffice.org/69153
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2019-03-13 15:20:51 +01:00