Commit Graph

418 Commits (00d88dd421a14bed6450765141ba2d49ce00abcd)

Author SHA1 Message Date
yflory 6c65e5ff72 Fix the ghost icon in the drive and add missing text
Caleb James DeLisle 35e7341f4d Merge branch 'ui-integration' into staging2
Caleb James DeLisle 2ad9fcee17 Manual merge of notify.js
yflory 1752124071 Fix Iframe height in Edge
Caleb James DeLisle b081603455 Update requirejs
yflory 0a813b4fab Fix limit bar overflowing when over the limit
CatalinScr 744fb407ae Updated the what is page
ansuz 8ee5e14a60 merge ui-integration
CatalinScr fd3fd945c8 Updated the Log in Page
CatalinScr 1f4d0a0a56 Repaired a bug
CatalinScr dd48cf7c90 updated the register page
CatalinScr 3196d4558f repaired the responsive error at about page
CatalinScr 3960cd25f8 Updated the about page with the new design
Caleb James DeLisle 196ce3b3f7 Fix alertify style which made the registration popup look bad
Pierre Bondoerffer f580d9a30a
*actually* fix alertify on mobile
Pierre Bondoerffer 144f9f4c83
alertify fix on mobile
Pierre Bondoerffer b00d37d9e7
proper namespace for font
Pierre Bondoerffer 0f74dffc48
fix register button being cut off
Pierre Bondoerffer 92d3b1a9fc
actually pull in open-sans, move fonts to own include
Pierre Bondoerffer 04b84538e1
add Open Sans font (with bower)
CatalinScr 41c2f9bd83 Changed the footer, a modified the about page
Pierre Bondoerffer 280c10c57d
alertify: use the right box-shadow
Pierre Bondoerffer ec011b15d5
remove duplicate css property
Pierre Bondoerffer 34ba673cd3
improve file upload UI
Pierre Bondoerffer 90075cd48e
media-tag to less file
Pierre Bondoerffer 88be5444f0
change alertify warn color
Pierre Bondoerffer c53e738054
improve file picker ui
Pierre Bondoerffer 008fa12755
alertify: add textarea + checkbox
Pierre Bondoerffer e486e47aa1
alertify: fix input color + better log styles
Pierre Bondoerffer e333e7903d
fix styles overlapping
Pierre Bondoerffer 1db41dd17b
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer dac14de18c
unify fonts
CatalinScr 5afadf10aa Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
CatalinScr 3f6b234e97 Styled the general menu, footer, updated about
Pierre Bondoerffer d3fb6313b6
color logo on topbar
Pierre Bondoerffer 865ba0731c
better colors? not sure yet...
Pierre Bondoerffer 1bd42f0b3e
make alertify darker
Pierre Bondoerffer ecc766eb7b
remove useless margin
Pierre Bondoerffer addd91cc72
fix styles (again) copyright cjd 2017
Pierre Bondoerffer 5c21a9048e
fix styles
Pierre Bondoerffer 10e50fc5c7
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer 6614f3f0e6
put the page class on html element
CatalinScr 043ae4280b repaired the menu
CatalinScr 250d85bb8a Repaired the menu, clead the code
Pierre Bondoerffer 4018c7e0a6
move alertify stuff
Caleb James DeLisle 0d1f19f5d4 Big manual merge
CatalinScr e7d09c1ddb Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
changed the menu
CatalinScr d4ce7d626c Modified the menu
Pierre Bondoerffer f8c7140eec
make fonts big
Pierre Bondoerffer f6d45d05f6
use logo in toolbar
Caleb James DeLisle 5d70dd93b3 Manual merge
CatalinScr 15fa801bc8 work in progress
CatalinScr 89ab82c0e2 Changed the menu, added the logo on top bar
Pierre Bondoerffer ae176b0465
about page mockup
Pierre Bondoerffer 86bc14e6bb
new loading screen
Pierre Bondoerffer 304a29e210
Improve contact page
Pierre Bondoerffer d6679e8ef3
Add screenshots to What is CryptPad
Pierre Bondoerffer e2f8c9c5da
add logo to topbar
Pierre Bondoerffer cd0c9cc95a
create less templates for info pages
Pierre Bondoerffer f71b082aac
remove min-height globally, style footer
Pierre Bondoerffer 0fe49d6641
oops, sorry, back to 100% height
Pierre Bondoerffer dc0a037894
turn login and register into infopages
Pierre Bondoerffer 549b1b2c4f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer 775ea81504
start register page
CatalinScr 69c470330f updated the favicons, changed the menu
PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,
CatalinScr e609950977 Changed the favicon, added the boostrap js file, reconfigure the top menu
Caleb James DeLisle 27aa1886b1 Move footer to pages.js and add it to the contact page
Caleb James DeLisle 490e2b4d0a work in progress on migrating styles back into the infopages.less
Caleb James DeLisle cd2b41f51e Fix up some less for supporting the info-pages
Caleb James DeLisle 896186d059 Fix some wrong less files which were breaking the UI of the apps
ansuz 4614d6ae81 remove legacy max-width from usage bar
CatalinScr 87dec4a091 Changed the font size
CatalinScr 5921073524 Updated the new font, changed the logo, changed see more
CatalinScr 6862bda454 Changed the logo, uploaded the new font, repaired responsive
Caleb James DeLisle 428bee6306 make links clickable and make more link work
yflory 3da76e3ae8 Update style for the todo app
CatalinScr 5fa20836cf Modified Register and login button
CatalinScr cab8716519 Changed the login button, repaired the hover menu and see more. Updated the logo
CatalinScr 796bf89491 Update of the front-page
Caleb James DeLisle 49c760131e wip
Nicolas Lemoine 658b00814b TodoApp - Style and translations
Caleb James DeLisle 6a1ec54e2a wip
Pierre Bondoerffer dc9565f22f
make buttons colorful
Caleb James DeLisle 8404017af1 wip
yflory a80b00a765 Move the file picker in common
Caleb James DeLisle ffb5e555a0 Merge branch 'staging' into front-page
yflory c33d2a2db0 New tooltips
yflory baf439648e Add the contacts app in the dropdown menu
yflory aa8181ab2b Contacts app translations
ansuz f2320190b8 change friends url to /contacts/
ansuz 6306de5265 set avatar border-radius to 4px
ansuz 33dcd2ae28 drop black border from avatars in userlist
ansuz e2c17dbeb4 resolve conflicts
yflory 557f13f796 Unfriend and update username - beta
ansuz 96d2ff67e1 user-plus as icon for add-friend
Caleb James DeLisle f6abdc2b86 manual merge of staging
yflory ac684a8dc7 Use the APP toolbar in profile
yflory b3e225cb3b Replace spinner by text and fix mobile UI
yflory 42075e4b5f Make everything 16px and 32px
yflory 16d0527e92 Add a page title in drive, settings and file