625 Commits

Author SHA1 Message Date
CatalinScr
0ceb4cbbcb Updated the contact page with the new design 2017-08-31 16:26:20 +03:00
CatalinScr
83be769bb3 Merge branch 'master' into staging
updated with new version
2017-08-31 11:36:39 +03:00
CatalinScr
1bf77cb77e changed the icons 2017-08-31 11:27:02 +03:00
CatalinScr
f95f3f4f24 Updated the contact page 2017-08-31 10:04:40 +03:00
yflory
0893bcc0e5 Merge branch 'staging' into code2 2017-08-30 14:57:19 +02:00
yflory
7498057c89 Fix Safari iframe size 2017-08-30 11:11:43 +02:00
yflory
a2ed266048 Move the code app in a secure iframe 2017-08-30 11:10:57 +02:00
yflory
6c65e5ff72 Fix the ghost icon in the drive and add missing text 2017-08-28 12:22:31 +02:00
Caleb James DeLisle
35e7341f4d Merge branch 'ui-integration' into staging2 2017-08-24 13:54:55 +02:00
Caleb James DeLisle
2ad9fcee17 Manual merge of notify.js 2017-08-23 10:45:55 +02:00
yflory
1752124071 Fix Iframe height in Edge 2017-08-22 11:50:52 +02:00
Caleb James DeLisle
b081603455 Update requirejs 2017-08-21 18:08:37 +02:00
yflory
0a813b4fab Fix limit bar overflowing when over the limit 2017-08-17 10:24:10 +02:00
CatalinScr
744fb407ae Updated the what is page 2017-08-16 15:53:10 +03:00
ansuz
8ee5e14a60 merge ui-integration 2017-08-16 10:20:05 +02:00
CatalinScr
fd3fd945c8 Updated the Log in Page 2017-08-16 07:56:18 +03:00
CatalinScr
1f4d0a0a56 Repaired a bug 2017-08-16 06:56:08 +03:00
CatalinScr
dd48cf7c90 updated the register page 2017-08-15 23:47:36 +03:00
CatalinScr
3196d4558f repaired the responsive error at about page 2017-08-15 06:50:13 +03:00
CatalinScr
3960cd25f8 Updated the about page with the new design 2017-08-14 16:40:09 +03:00
Caleb James DeLisle
196ce3b3f7 Fix alertify style which made the registration popup look bad 2017-08-11 17:49:19 +02:00
Pierre Bondoerffer
f580d9a30a
*actually* fix alertify on mobile 2017-08-11 15:16:51 +02:00
Pierre Bondoerffer
144f9f4c83
alertify fix on mobile 2017-08-11 14:46:08 +02:00
Pierre Bondoerffer
b00d37d9e7
proper namespace for font 2017-08-11 14:14:58 +02:00
Pierre Bondoerffer
0f74dffc48
fix register button being cut off 2017-08-11 14:11:50 +02:00
Pierre Bondoerffer
92d3b1a9fc
actually pull in open-sans, move fonts to own include 2017-08-11 14:10:54 +02:00
Pierre Bondoerffer
04b84538e1
add Open Sans font (with bower) 2017-08-10 15:05:57 +02:00
CatalinScr
41c2f9bd83 Changed the footer, a modified the about page 2017-08-09 18:35:36 +03:00
Pierre Bondoerffer
280c10c57d
alertify: use the right box-shadow 2017-08-09 11:48:04 +02:00
Pierre Bondoerffer
ec011b15d5
remove duplicate css property 2017-08-09 10:55:36 +02:00
Pierre Bondoerffer
34ba673cd3
improve file upload UI 2017-08-09 10:54:20 +02:00
Pierre Bondoerffer
90075cd48e
media-tag to less file 2017-08-08 12:01:39 +02:00
Pierre Bondoerffer
88be5444f0
change alertify warn color 2017-08-08 10:37:37 +02:00
Pierre Bondoerffer
c53e738054
improve file picker ui 2017-08-07 16:27:29 +02:00
Pierre Bondoerffer
008fa12755
alertify: add textarea + checkbox 2017-08-07 11:26:40 +02:00
Pierre Bondoerffer
e486e47aa1
alertify: fix input color + better log styles 2017-08-07 11:19:20 +02:00
Pierre Bondoerffer
e333e7903d
fix styles overlapping 2017-08-04 17:44:02 +02:00
Pierre Bondoerffer
1db41dd17b
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 17:15:55 +02:00
Pierre Bondoerffer
dac14de18c
unify fonts 2017-08-04 17:15:45 +02:00
CatalinScr
5afadf10aa Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 17:58:48 +03:00
CatalinScr
3f6b234e97 Styled the general menu, footer, updated about 2017-08-04 17:58:29 +03:00
Pierre Bondoerffer
d3fb6313b6
color logo on topbar 2017-08-04 16:22:43 +02:00
Pierre Bondoerffer
865ba0731c
better colors? not sure yet... 2017-08-04 16:13:27 +02:00
Pierre Bondoerffer
1bd42f0b3e
make alertify darker 2017-08-04 16:02:35 +02:00
Pierre Bondoerffer
ecc766eb7b
remove useless margin 2017-08-04 15:24:58 +02:00
Pierre Bondoerffer
addd91cc72
fix styles (again) copyright cjd 2017 2017-08-04 15:16:48 +02:00
Pierre Bondoerffer
5c21a9048e
fix styles 2017-08-04 15:13:03 +02:00
Pierre Bondoerffer
10e50fc5c7
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 14:50:44 +02:00
Pierre Bondoerffer
6614f3f0e6
put the page class on html element 2017-08-04 14:50:35 +02:00
CatalinScr
043ae4280b repaired the menu 2017-08-04 15:15:47 +03:00