Shane Kilkelly
158afbb157
Merge branch 'master' into pr-email-tokens
...
Conflicts:
app/coffee/Features/Notifications/NotificationsBuilder.coffee
public/coffee/ide/share/controllers/ShareController.coffee
2016-08-15 10:29:21 +01:00
Paulo Jorge Reis
60f8e577a8
Merge pull request #293 from sharelatex/pr-wrap-long-words-chat
...
Wrap long words chat
2016-08-03 16:32:36 +01:00
Paulo Reis
cf5c8e27e1
UI fix - do not allow multiple clicks to restore a deleted file.
2016-08-03 16:05:19 +01:00
Shane Kilkelly
e7251aab53
Small wording changes
2016-08-03 14:06:08 +01:00
Paulo Reis
01637386bd
Use string split instead of regex.
2016-08-02 11:59:43 +01:00
Paulo Reis
ff62e50530
Integrate word wrapping filter in the chat component.
2016-08-01 16:42:54 +01:00
Shane Kilkelly
7b18f88145
Merge branch 'master' into pr-email-tokens
2016-07-28 14:53:36 +01:00
Shane Kilkelly
827629a74a
Invalid-invite page, and re-jigg the share modal
2016-07-27 10:10:44 +01:00
Shane Kilkelly
2dede5f793
WIP: Working "accept invite" page
2016-07-26 11:46:41 +01:00
Shane Kilkelly
b3add65de1
Start integrating invites into share frontend
2016-07-25 14:27:02 +01:00
Paulo Reis
37eb6252d2
Rewording + animation when shown the feedback panel.
2016-07-22 16:33:19 +01:00
Paulo Reis
b6cd6c2d7d
UI logic to show or hide the negative feedback panel.
2016-07-22 14:14:58 +01:00
Paulo Reis
54eadf3256
Add textarea for 'other' feedback + styles.
2016-07-22 12:20:26 +01:00
Paulo Reis
95db6ba934
Basic mark-up for the extra log hint feedback.
2016-07-22 11:56:45 +01:00
Paulo Reis
79d95cbf9f
Merge branch 'master' into pr-highlight-biblio-search
2016-07-21 14:51:34 +01:00
Paulo Reis
2c857c0afa
Minor adjustments to make both variants coexist without affecting each other.
2016-07-21 14:24:52 +01:00
Paulo Reis
5c6d6f0e74
Pull back existing styles and namespace them as the control variant.
2016-07-21 14:12:14 +01:00
Paulo Reis
c076d76c7d
Namespace new variant.
2016-07-21 14:11:17 +01:00
Paulo Reis
b0c3a89a83
Style button and content.
2016-07-20 17:10:03 +01:00
Paulo Reis
2d3aa02eed
Make info cell a button container.
2016-07-20 17:04:02 +01:00
Paulo Reis
49f603922b
Highlight info cell.
2016-07-20 15:32:10 +01:00
Henry Oswald
a3e40adbaf
Merge pull request #283 from sharelatex/ho-cdn
...
Ho cdn
2016-07-20 14:19:37 +01:00
Henry Oswald
6c78ab4ace
got requirejs working nicely with cdn
2016-07-20 12:58:32 +01:00
Shane Kilkelly
57079fc986
fix styling of the import modal
2016-07-18 16:07:00 +01:00
Paulo Reis
02ba277473
Small styling fixes.
2016-07-11 16:21:35 +01:00
Paulo Reis
9ef78b4bc2
Merge branch 'master' into pr-contact-form-suggestions
2016-07-11 13:54:06 +01:00
Henry Oswald
6b2a11a4d4
use https for google fonts
2016-07-11 12:13:01 +01:00
Henry Oswald
94d760e32d
import bootstrap font awseome via less not html
2016-07-10 11:10:43 +01:00
Paulo Reis
444120f8b1
Merge branch 'master' into pr-contact-form-suggestions
2016-07-08 13:55:08 +01:00
Paulo Reis
54ec75d36a
Avoid line-breaks when showing the log icon.
2016-07-06 15:55:36 +01:00
Paulo Reis
b867c37d49
Merge branch 'master' into pr-log-dropdown
2016-07-06 15:35:28 +01:00
Paulo Reis
fac3698c40
Better namespacing of sprite CSS classes.
2016-07-05 11:08:58 +01:00
Paulo Reis
64a73b0356
Disable default 4px margin on grunt-sprity, also add the built files.
2016-07-01 16:02:40 +01:00
Paulo Reis
4f49a25639
Use a figure element instead of an img, as there is no src attribute.
2016-07-01 16:02:01 +01:00
Henry Oswald
6f4a7f4779
mvp for using sprites for flags, needs border removing
2016-07-01 15:04:39 +01:00
Paulo Reis
72d498c6c8
Merge branch 'master' into pr-contact-form-suggestions
2016-06-29 11:58:07 +01:00
Paulo Reis
d037cb93a9
Wiki styles clean-up.
2016-06-29 10:42:51 +01:00
Paulo Reis
a6d184358f
Avoid inline-styles.
2016-06-28 15:51:50 +01:00
Paulo Reis
4263d3f8c6
Merge branch 'master' into pr-overflowing-images-wiki
2016-06-28 11:58:58 +01:00
Paulo Reis
da960a721f
Vertical layout for LaTeX examples.
2016-06-28 10:09:12 +01:00
Paulo Reis
3580d8377f
Merge branch 'master' into pr-contact-form-suggestions
2016-06-27 15:39:00 +01:00
Paulo Reis
dfc375adf8
Add more feedback on :hover.
2016-06-24 15:55:19 +01:00
Paulo Reis
d7a1c7f693
Inline links in the hint now match the theme.
2016-06-24 14:01:22 +01:00
Paulo Reis
5f7ffb5a8c
Make hint card area non-clickable.
2016-06-24 12:12:45 +01:00
Paulo Reis
e4a1443d1d
Better handling of whitespace.
2016-06-24 12:07:02 +01:00
Paulo Reis
e51bdaaaaf
Fine tuning of styles.
2016-06-23 15:01:07 +01:00
Paulo Reis
f62a45444d
Prototype mark-up and styles.
2016-06-23 12:08:13 +01:00
James Allen
b693ced843
Merge pull request #263 from sharelatex/pr-human-readable-logs
...
Human readable logs
2016-06-21 14:28:06 +01:00
Paulo Reis
ed659fd973
Minor UI improvements.
2016-06-21 14:20:23 +01:00
Paulo Reis
1aa7d9c6b3
Explicitly set link color according to log entry type.
2016-06-21 10:49:24 +01:00
Paulo Reis
d8e0026bc6
Add class to enable per-hint feedback tracking.
2016-06-20 17:32:57 +01:00
Paulo Reis
baea017adb
Better mark-up for analytics tracking.
2016-06-20 14:59:30 +01:00
Paulo Reis
a8976fd4dc
Use plain links instead of buttons.
2016-06-20 14:42:36 +01:00
Paulo Reis
1893ae68a9
Add feedback widget for log hints.
2016-06-20 11:53:10 +01:00
Paulo Reis
605bb07ba3
Hint card styling.
2016-06-20 09:45:14 +01:00
Paulo Reis
7316a429c0
Increase maximum brand image height.
2016-06-17 14:55:04 +01:00
Paulo Reis
732a0fdca0
Fit brand image into container.
2016-06-17 14:37:39 +01:00
Paulo Reis
2bfe0d0ba9
Basic mark-up for hint card.
2016-06-17 14:16:38 +01:00
Paulo Reis
e891a47a9e
Better support for larger text in keyboard tooltips.
2016-06-15 15:27:30 +01:00
Paulo Reis
d7e4009504
Small styling enhancements.
2016-06-15 10:48:40 +01:00
Shane Kilkelly
0dfd80d307
Use css to add the beta symbol to the beta-label
2016-06-07 14:04:02 +01:00
Shane Kilkelly
8c9d15a3e4
Tweak style of the beta-feature-badge class.
2016-06-07 13:42:27 +01:00
Shane Kilkelly
d8f1e8ec93
Add basic BetaProgram
feature.
2016-06-07 11:15:56 +01:00
Henry Oswald
c284465ba5
added clsiformat checker, wired in
2016-06-02 13:09:32 +01:00
Shane Kilkelly
2441930fe9
Add a spinner when waiting for image preview to load.
2016-05-20 14:28:51 +01:00
Shane Kilkelly
199844db2d
Fix styling of the bib-loading div.
2016-05-19 10:02:46 +01:00
Shane Kilkelly
4509642914
use highlight colour for any font-awesome icons in file-tree.
2016-05-18 16:34:50 +01:00
James Allen
d813f45d28
Cherry-pick 0e70320 (Select icon based on file extension) from datajoy
2016-05-18 15:58:01 +01:00
Shane Kilkelly
eae82a2b20
Preview bib files.
2016-05-17 17:00:14 +01:00
James Allen
63c183402c
Style active and focus states of search results too
2016-03-24 11:42:48 +00:00
James Allen
9b84e1b164
Improve styling of wiki search
2016-03-24 11:38:56 +00:00
Henry Oswald
90092a0c61
improved styling, not perefect still
2016-03-23 16:05:38 +00:00
Henry Oswald
c777f498ad
Merge branch 'groove2'
2016-03-22 11:58:04 +00:00
Henry Oswald
4e78e34cdf
finished contact us with groove
...
for settings file:
<a ng-controller="ContactModal", ng-click="contactUsModal()", href>Contact</a>
2016-03-21 11:41:05 +00:00
Shane Kilkelly
020e1b9b34
Add styles for the references search hint.
2016-03-03 11:44:11 +00:00
Shane Kilkelly
d76e5fdbf4
Styles for references search journal
2016-03-01 16:29:19 +00:00
James Allen
d3e3deb679
Fix padding around active toolbar links
2016-02-24 16:37:03 +00:00
Shane Kilkelly
34bfdcc246
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-02-24 10:27:44 +00:00
Shane Kilkelly
4f3a4880d9
remove margin above search results.
2016-02-24 10:27:29 +00:00
James Allen
fde7efbb9f
Fix rename button styling in editor
2016-02-23 15:21:54 +00:00
Shane Kilkelly
b505f0d455
Merge branch 'sk-references-search'
...
Conflicts:
app/coffee/Features/References/ReferencesController.coffee
2016-02-19 11:30:55 +00:00
James Allen
bf36413491
Improve styling of upgrade messages
2016-02-18 14:53:49 +00:00
Shane Kilkelly
8384433231
Clean up and add comments to references-search styles.
2016-02-18 10:47:28 +00:00
Shane Kilkelly
d94e3181c3
update references search preview gif.
2016-02-17 16:44:41 +00:00
Shane Kilkelly
f23a11eacb
Refine call-to-action styling in references upgrade dialog.
2016-02-17 15:45:04 +00:00
Shane Kilkelly
9c9a9c5c76
preview gif for references search.
2016-02-17 14:49:37 +00:00
Henry Oswald
4017eab888
don't show outline on new doc/folder/upload buttons on select
2016-02-16 12:38:27 +00:00
Shane Kilkelly
e7e6b1008b
styles for spinner.
2016-02-15 16:11:59 +00:00
Shane Kilkelly
2901d12eaa
update styles for search modal.
2016-02-12 16:24:35 +00:00
James Allen
e4960e782f
Merge branch 'ja-multi-select'
2016-02-12 11:56:10 +00:00
Shane Kilkelly
8542a08927
Refine styles.
2016-02-11 15:03:19 +00:00
Henry Oswald
0538ca2de5
added box shadow to notifications alert and made it info
2016-02-11 12:34:38 +00:00
Henry Oswald
5c5888b5dc
Merge branch 'pr/221'
2016-02-11 11:44:45 +00:00
Shane Kilkelly
a5386dcdc7
minor adjustments to search result style
2016-02-10 16:54:43 +00:00
Shane Kilkelly
1dc62bdeca
styling for search results in references search modal
2016-02-10 16:37:11 +00:00
James Allen
8359029503
Improve drop zones and feel of dragging in file tree
2016-02-10 15:54:25 +00:00
Shane Kilkelly
aa20661372
css for hit class.
2016-02-10 13:24:07 +00:00
Shane Kilkelly
63c9b91a7b
basic css for references search form
2016-02-10 10:39:04 +00:00
James Allen
506d2224aa
Allow Cmd+Clicking to multi select entries in the file tree
2016-02-09 15:13:58 +00:00
James Allen
a6793be3cf
Improve presentation of hotkeys and add bold+italics
2016-02-04 15:52:38 +00:00
Henry Oswald
f136486f4b
cleanup layout of notifications
2016-02-04 14:28:31 +00:00
James Allen
d88cbc342a
Adjust btn-group for correct borders on PDF buttons
2016-02-04 14:26:59 +00:00
James Allen
425a9b9db2
Add in option to compile in draft mode
2016-02-02 14:50:48 +00:00
James Allen
14cfb2dec7
Namespace toolbar CSS properly to only affect top level anchor tags so that dropdown links are not styled
2016-02-02 14:48:22 +00:00
James Allen
1a86e69d1f
Allow tags to be deleted
2016-02-01 10:18:56 +00:00
Henry Oswald
7e31851949
fix margin for modal alerts on upload
2015-12-08 08:50:11 +00:00
James Allen
16b7bf222a
Merge branch 'contacts'
2015-11-05 10:14:25 +00:00
James Allen
7359fc16ee
Add in show-on-hover CSS classes
2015-11-02 13:59:34 +00:00
James Allen
fb42489803
Improve formatting of users, groups and tags
2015-10-15 16:43:53 +01:00
Henry Oswald
a1f57f220b
inline ng-clock as it does not work for firefox in base.less quickly enough
2015-10-14 16:22:32 +01:00
James Allen
8cc7869b03
Pull in contacts from contacts api and send to tag-input for autocomplete
2015-10-07 17:32:35 +01:00
Shane Kilkelly
54de12d908
Fix alignment of inputs in Search-Replace panel.
2015-09-28 14:16:10 +01:00
Henry Oswald
5ffd76c670
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-09-14 15:36:08 +01:00
Henry Oswald
9a72667e91
added word count UI feature.
2015-09-14 15:28:19 +01:00
Shane Kilkelly
7bc9218b3c
Fix up a bunch of issues with the track-changes list view.
...
- not crash when a user is null
- fix alignment of user color square
- if first and last name are absent, display email instead
- truncate overly long display name with '...'
2015-09-14 12:08:05 +01:00
James Allen
7446572ed9
Group online users into dropdown menu when more than 3
2015-09-02 14:33:51 +01:00
Shane Kilkelly
18f75bba79
Generalize this style to all .btn elements under the .template-details-section
2015-08-19 09:59:01 +01:00
Shane Kilkelly
865372d13f
Add some whitespace around buttons in template-details.
2015-08-18 14:45:44 +01:00
Henry Oswald
53dc0b63c8
v1 of enago
2015-08-04 10:45:19 +01:00
Henry Oswald
78b4bccba1
remove qq upload loading gif, just 404's atm and is not missed
2015-02-19 11:42:57 +00:00
James Allen
2875958363
Merge pull request #140 from metbosch/fix/124_scroll_large_images
...
Allowed scroll on binary-file container
2015-02-09 13:32:57 +00:00
James Allen
f75376124e
Update open source branding
2015-02-05 16:56:35 +00:00
James Allen
3aad31069c
Always show chat name or email
2015-02-05 13:05:57 +00:00
James Allen
2a78a7843a
Allow subscriptions with no free plans, and adjust styles
2015-01-29 14:11:25 +00:00
metbosch
43d723bcfb
Allowed scroll on binary-file container
...
Set overflow in auto mode to allow large images.
2015-01-19 23:34:49 +01:00
Henry Oswald
f6e9c544e6
slightly improved the breakdown form. Still not very pretty.
2015-01-07 14:59:56 +00:00
Henry Oswald
735dd0811c
changed credit card/paypal logs from offical ones to font very good ones
...
upgraded fontamerican to 4.2
2014-12-28 22:14:39 +00:00
Henry Oswald
1a4825a47b
pulled total price down a little
2014-12-28 19:08:36 +00:00
Henry Oswald
2d03e0532f
adjusted style of payment options
2014-12-28 19:04:47 +00:00
James Allen
48d4e96221
Remove development styles
2014-12-08 17:39:33 +00:00
Brian Gough
206e7db144
add spinners and classes for feedback on pdfng loading and rendering
2014-12-08 14:46:59 +00:00
Brian Gough
d6e47c2701
display empty div.pdf-canvas element as a blank page while it is being rendered
2014-12-02 11:00:33 +00:00
Henry Oswald
6c0f03e9c7
added ab test to show collar plan to people in editor
2014-11-24 16:21:03 +00:00
James Allen
281c4eb4e3
Style tweaks for uni site
2014-10-21 13:39:47 +01:00
James Allen
64fe2a2404
Improve CSS and layout of feature list on new subscription page
2014-10-15 10:22:03 +01:00
James Allen
b32375530c
Refactor card css for use in new subscription page
2014-10-14 15:46:44 +01:00
Henry Oswald
3382c5bb17
added blurb to payment page
2014-10-13 17:51:59 +01:00
James Allen
a8afe3a0d7
Improve file uploader CSS
2014-10-10 13:40:00 +01:00
James Allen
7258fadd17
Improve styling of plan name and price on subscription form
2014-10-08 16:52:37 +01:00
James Allen
696e8d24e1
Fix z index of more updates buttons
2014-10-08 16:32:42 +01:00
Henry Oswald
f1372fc449
moved button, not that pretty
2014-09-05 16:11:19 +01:00
Henry Oswald
13a667f47a
v1 of multi currency
2014-09-04 19:03:04 +01:00
Henry Oswald
66e0785e59
fixed word wrapping on plans button page
2014-08-29 15:34:46 +01:00
Henry Oswald
15e14d5bda
changed padding of perk to ork well in czech
2014-08-24 17:26:20 +01:00
James Allen
c4b91de8e8
Layout templates in rows of four
2014-08-20 14:58:01 +01:00
James Allen
02ec2bc264
Align flags on left of menu to match flag in footer
2014-08-14 16:41:48 +01:00
James Allen
ac4b3663cb
CSS tweaks to i18n stuff
2014-08-14 16:33:01 +01:00
Henry Oswald
aa4f748608
Merge branch 'master' into i18n
2014-08-14 15:42:54 +01:00
Henry Oswald
7c2beb5d2d
added correct flags
2014-08-14 13:00:04 +01:00
Henry Oswald
02cdfb4d09
lng dropdown at bottom in footer works nicely, needs few style tweeks
2014-08-13 23:06:15 +01:00
Henry Oswald
2222b32321
added message at top of page offering redirect to local lng
2014-08-13 12:31:14 +01:00
James Allen
6bfefea5cb
Show PDF button in toolbar if file tree is closed in PDF flat view
2014-08-12 13:18:22 +01:00
James Allen
93f2969be5
Change style on file rename input to avoid weird Chrome behaviour
2014-08-12 12:46:05 +01:00
James Allen
3348249dcd
Download template PDF and zip file with good file names
2014-08-12 12:02:09 +01:00
James Allen
55ad2ce78d
Include contents page down side of wiki
2014-07-31 16:26:02 +01:00
James Allen
49258fe3dd
Proxy to wiki
2014-07-30 15:44:03 +01:00
James Allen
87aa860c87
Update about page css
2014-07-29 12:29:00 +01:00
James Allen
627f9e47c6
Bring back Prof. Lion
2014-07-29 11:25:34 +01:00
James Allen
fc7753d49d
Add in download PDF button
2014-07-28 17:24:43 +01:00
Henry Oswald
c5b72f5f8b
added font weight 300 into the open sans for home page
2014-07-28 17:03:54 +01:00
Henry Oswald
0db45733c5
added -moz-osx-font-smoothing to the stylesheet which improves font rendering in firefox
2014-07-28 16:10:30 +01:00
James Allen
db920f7aaf
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-07-28 15:06:39 +01:00
James Allen
4ff9fe33b6
Use a dark editor surround if the theme is dark
2014-07-28 15:06:26 +01:00
Henry Oswald
2c7623d3a7
added the other font sizes we use into the font import, not magic fix
2014-07-28 14:57:06 +01:00
Henry Oswald
0fb1152010
added templates less file in, got lost somewhere
2014-07-28 12:54:55 +01:00
James Allen
7ad9849db0
Use cards for long form features
2014-07-25 14:33:46 +01:00
James Allen
89fa55c361
Don't use background on long form stuff
2014-07-25 14:27:17 +01:00
James Allen
e8c5679954
Update styles for homepage
2014-07-25 14:14:27 +01:00
James Allen
b4162511f7
Simplify feature cards
2014-07-25 12:49:23 +01:00
James Allen
e5df7597c5
Remove unnecessary padding
2014-07-24 17:40:08 +01:00
James Allen
74297297c2
Experiment with animated homepage
2014-07-24 17:38:18 +01:00
James Allen
8146a09b42
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
2014-07-24 15:02:31 +01:00
James Allen
27784ed848
Add retina screenshot
2014-07-24 15:02:23 +01:00
Henry Oswald
7255231abc
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
...
updated upstream into a topic branch.
2014-07-24 13:57:49 +01:00
Henry Oswald
9ec2c32605
added text-rendering: optimizelegibility; to css
2014-07-24 13:48:10 +01:00
James Allen
1128b45b17
Add in system messages
2014-07-24 13:24:08 +01:00
Henry Oswald
67cba0dfd2
killed info controller and setup features.less for dropbox and feature pages
...
also moved dropbox to external pages
2014-07-24 12:15:54 +01:00
James Allen
fbd36d8b07
Sort of style of admin panel and trim functionality
2014-07-24 11:22:22 +01:00
James Allen
22576945c3
Fix dropshadow on image
2014-07-24 10:47:09 +01:00
James Allen
dd27384587
Remove uneeded 700 weight
2014-07-23 17:33:14 +01:00
James Allen
824881d26e
Update fonts to explicitly use web fonts for consistency
2014-07-23 17:30:40 +01:00
Henry Oswald
e46bc51c67
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
2014-07-23 12:17:14 +01:00
Henry Oswald
83b94f987c
cleaned up few small things with templates
2014-07-23 12:16:31 +01:00
James Allen
50748069f8
Don't just use webkit retina detection:
2014-07-23 12:09:11 +01:00
James Allen
077f87f1d3
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
2014-07-23 12:05:31 +01:00
James Allen
134ea6f3df
Add retina logo
2014-07-23 12:03:13 +01:00
Henry Oswald
35342849b8
make h1 in search results red link
2014-07-23 11:36:36 +01:00
Henry Oswald
395b1ebf47
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
2014-07-23 11:29:43 +01:00
Henry Oswald
a9d8be8dec
brought up the sections of templates to be closer to the search box
2014-07-23 11:26:17 +01:00
James Allen
bbaf024f14
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
2014-07-23 11:22:12 +01:00
James Allen
532ec5e756
Make project list look better on a smaller screen
2014-07-23 11:08:55 +01:00
Henry Oswald
43256d2085
lined up the templates header with the search bar.
...
Need to kill big space bellow it next
2014-07-22 17:52:47 +01:00
Henry Oswald
c6ab4c4f7b
roughly styled template search results
...
clear button in template search also clears results
2014-07-22 17:43:17 +01:00
Henry Oswald
25ea01115a
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
2014-07-22 17:24:51 +01:00
Henry Oswald
a4b02558dc
'carded' the templates page, top search area still needs doing
2014-07-22 17:24:32 +01:00
James Allen
20a5d3742a
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
2014-07-22 17:09:52 +01:00
James Allen
dfb82015f7
Style blog and lighten text
2014-07-22 17:09:44 +01:00
Henry Oswald
a20b46c786
template page looks ok, not quite like adam did.
...
Need to battle left padding still
2014-07-22 15:56:36 +01:00
Henry Oswald
234bc5e0e9
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
2014-07-22 14:56:41 +01:00
Henry Oswald
806ebc977c
templates index page looks roughly correct
2014-07-22 14:56:33 +01:00