diff --git a/customize.dist/CryptPad_logo_color.svg b/customize.dist/CryptPad_logo_color.svg new file mode 100644 index 000000000..cba8af90f --- /dev/null +++ b/customize.dist/CryptPad_logo_color.svg @@ -0,0 +1 @@ +CryptPad_logo_color \ No newline at end of file diff --git a/customize.dist/bg14.jpg b/customize.dist/bg14.jpg index 6bf5956a1..7f5211229 100644 Binary files a/customize.dist/bg14.jpg and b/customize.dist/bg14.jpg differ diff --git a/customize.dist/images/Catalin.jpg b/customize.dist/images/Catalin.jpg new file mode 100644 index 000000000..3a7cb2f13 Binary files /dev/null and b/customize.dist/images/Catalin.jpg differ diff --git a/customize.dist/images/Pierre-new.jpg b/customize.dist/images/Pierre-new.jpg new file mode 100644 index 000000000..b4fef2583 Binary files /dev/null and b/customize.dist/images/Pierre-new.jpg differ diff --git a/customize.dist/pages.js b/customize.dist/pages.js index d3b512f65..a44ec94ba 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -16,7 +16,7 @@ define([ var footerCol = function (title, L, literal) { return h('div.col', [ h('ul.list-unstyled', [ - h('li.title', { + h('li.cp-title', { 'data-localization': title, }, title? Msg[title]: literal ) ].concat(L.map(function (l) { @@ -122,14 +122,14 @@ define([ h('h2', 'Key Contributors'), h('div.row', [ h('div.col-md-4', [ - h('img.bio-avatar', {'src': '/customize/images/pierre.jpg'}), + h('img.bio-avatar', {'src': '/customize/images/Pierre-new.jpg'}), h('h3', "Pierre Bondoerffer"), setHTML(h('div#bio'), '

Resident CSS wizard and emoji extraordinaire, Pierre is passionate about anything related to technology. He loves to hack around computers and put parts together.

He is currently studying at 42, where he learns about algorithms, networking, kernel programming and graphics.

As a part of an internship, he joined XWiki SAS and worked on CryptPad to improve user experience. He also maintains the Spanish translation.

') ]), h('div.col-md-4', [ - h('img.bio-avatar', {'src': '/customize/images/avatar.png'}), + h('img.bio-avatar', {'src': '/customize/images/Catalin.jpg'}), h('h3', "Catalin Scripcariu"), - setHTML(h('div#bio'), '') + setHTML(h('div#bio'), '

Catalin is a Maths majour and has worked in B2B sales for 12 years. Design was always his passion and 3 years ago he started to dedicate himself to web design and front-end.

At the beginning of 2017 he joined the Xwiki family, where he worked both on the business and the community side of XWiki, including the research team and CryptPad.

') ]), h('div.col-md-4', [ h('img.bio-avatar', {'src': '/customize/images/ludovic.jpg'}), @@ -287,7 +287,7 @@ define([ ]) ]) ]), - ]) + ]), ]; }; diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less index 268a26922..0dfdef1d4 100644 --- a/customize.dist/src/less2/include/colortheme.less +++ b/customize.dist/src/less2/include/colortheme.less @@ -43,3 +43,6 @@ @colortheme_profile-bg: #0087ff; @colortheme_profile-color: #fff; + +@cryptpad_color_blue: #4591C4; +@cryptpad_color_grey: #999999; \ No newline at end of file diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less index dfc4108ba..62e00724f 100644 --- a/customize.dist/src/less2/include/infopages.less +++ b/customize.dist/src/less2/include/infopages.less @@ -8,8 +8,8 @@ background-color: @colortheme_info-background; a { - color: @colortheme_link-color; - &:visited { color: @colortheme_link-color-visited; } + color: @cryptpad_color_blue; + &:visited { color: darken(@cryptpad_color_blue, 10%); } //opacity: 0.8; //transition: opacity 0.2s; } @@ -77,25 +77,26 @@ } footer { - background-color: white; - + background-color: @cryptpad_color_grey; .container { .col { margin-top: 1em; } - - width: 100%; - text-align: center; - margin-bottom: 1em; - - ul.list-unstyled { + a { + color: #fff; + &:visited { + color: darken(#fff, 20%); + }; + } + margin-bottom: 1em; + ul.list-unstyled { margin: 0; } } .cp-version-footer { - background-color: @colortheme_info-background; - color: black; + background-color: #6C6C6C; + color: #fff; text-align: center; padding: 0.5em; } @@ -159,3 +160,64 @@ } } } + +// navigation top bar +.navbar { + background: #fff; + .navbar-brand { + background: url(/customize/CryptPad_logo_color.svg) no-repeat; + width: 250px; + height: 50px; + } + a { + border: 2px solid transparent; + } + .nav-link { + padding: 0.5em 0.7em; + &:hover { + transform: scale(1.05); + }; + } + .cp-register-btn { + border: 2px solid #4591C4; + } + button:focus { + outline: none; + } + .navbar-toggler { + margin-top: 10px; + color: #4591C4; + } +} +@media (max-width: 991px) { + #menuCollapse { + text-align: right; + } + .navbar-nav a { + text-align: right !important; + } + .cp-register-btn { + margin-right: 13px; + margin-left: 83vw; + text-align: center; + } +} +@media (max-width: 687px) { + .cp-register-btn { + margin-left: 75vw; + } +} +@media (max-width: 467px) { + .cp-register-btn { + margin-left: 63vw; + } +} + + +//footer general styles + +.cp-title { + font-weight: bold; + font-size: 1.2em; + color: #1E1F1F; +} \ No newline at end of file diff --git a/customize.dist/src/less2/pages/page-about.less b/customize.dist/src/less2/pages/page-about.less index 7e9cb81a4..66c72eec9 100644 --- a/customize.dist/src/less2/pages/page-about.less +++ b/customize.dist/src/less2/pages/page-about.less @@ -9,4 +9,4 @@ margin: 1em 0; max-width: 300px; max-height: 300px; -} +} \ No newline at end of file diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 1a62f0060..3dde747e4 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -63,6 +63,7 @@ } } .navbar { + background: transparent; width: 100%; margin-top: -1em; @media only screen and (max-device-width: 991px) { @@ -75,13 +76,11 @@ } a { color: #fff; - border: 2px solid transparent; &:visited { color: rgba(255,255,255,.8); }; } .nav-link { - padding: 0.5em 0.7em; &:hover { transform: scale(1.05); }; @@ -89,9 +88,6 @@ .cp-register-btn { border: 2px solid #fff; } - button:focus { - outline: none; - } .navbar-toggler { margin-top: 10px; color: #fff; @@ -197,27 +193,4 @@ h4 { left: 5px; } } -@media (max-width: 991px) { - #menuCollapse { - text-align: right; - } - .navbar-nav a { - text-align: right !important; - } - .cp-register-btn { - margin-right: 13px; - margin-left: 83vw; - text-align: center; - } -} -@media (max-width: 687px) { - .cp-register-btn { - margin-left: 75vw; - } -} -@media (max-width: 467px) { - .cp-register-btn { - margin-left: 63vw; - } -}