From ad1f49b9fa07f9e51dabcf46595b11ba3667d614 Mon Sep 17 00:00:00 2001 From: Jos Poortvliet Date: Thu, 8 Aug 2019 16:53:05 +0200 Subject: final feedback implemented Signed-off-by: Jos Poortvliet --- assets/css/custom.css | 30 +------ assets/css/custom.scss | 24 ----- assets/css/modules/hero.scss | 1 + assets/css/modules/typography.scss | 2 +- assets/css/pages/appdev.css | 44 ++++++---- assets/css/pages/appdev.scss | 12 +++ assets/css/pages/contribute.css | 4 + assets/css/pages/contribute.scss | 7 +- assets/img/headers/atwork-small.jpg | Bin 0 -> 113204 bytes assets/img/headers/crash-small.jpg | Bin 0 -> 201343 bytes assets/img/headers/design-small.jpg | Bin 0 -> 139048 bytes assets/img/headers/ladies-that-foss.jpg | Bin 0 -> 182868 bytes page-contribute.php | 46 ++++++---- page-developer.php | 151 ++++++++++++++------------------ 14 files changed, 149 insertions(+), 172 deletions(-) create mode 100644 assets/img/headers/atwork-small.jpg create mode 100644 assets/img/headers/crash-small.jpg create mode 100644 assets/img/headers/design-small.jpg create mode 100644 assets/img/headers/ladies-that-foss.jpg diff --git a/assets/css/custom.css b/assets/css/custom.css index 8bbaba56..4e7f0aef 100644 --- a/assets/css/custom.css +++ b/assets/css/custom.css @@ -3443,7 +3443,7 @@ tbody.collapse.in { color: #6c6c6c; } .hyperlink { - color: #a2a2a2; + color: #6c6c6c; text-decoration: none; font-weight: 500; border-bottom: solid 1px; @@ -4021,7 +4021,7 @@ template, [hidden] { color: #6c6c6c; } .hyperlink { - color: #a2a2a2; + color: #6c6c6c; text-decoration: none; font-weight: 500; border-bottom: solid 1px; @@ -5444,7 +5444,8 @@ footer.page-footer { font-size: 20px; line-height: 1.6; text-shadow: 0px 0px 10px #333; - transform: translateY(50px); } + transform: translateY(50px); + font-weight: 400; } .background .topheader { /* position: absolute; */ /* top: 30%; */ @@ -9660,29 +9661,6 @@ footer.page-footer { font-size: 22px; font-weight: 300; } -.section--paragraph__tittle { - font-size: 22px; - line-height: 30px; - font-weight: 600; - color: #2a2a36; } - -.section--paragraph { - font-size: 1.125em; - font-weight: 400; - line-height: 1.5; - color: #6c6c6c; } - -.hyperlink { - color: #a2a2a2; - text-decoration: none; - font-weight: 500; - border-bottom: solid 1px; - transition: all 0.5s ease; - text-decoration: none; } - .hyperlink :hover { - text-decoration: none; - color: #2a2a36; } - .screen-reader-text { display: none; } diff --git a/assets/css/custom.scss b/assets/css/custom.scss index 2c499d8d..50a79bc2 100644 --- a/assets/css/custom.scss +++ b/assets/css/custom.scss @@ -117,31 +117,7 @@ font-size: 22px; font-weight: 300; } -.section--paragraph__tittle { - font-size: 22px; - line-height: 30px; - font-weight: 600; - color: #2a2a36; -} -.section--paragraph { - font-size: 1.125em; - font-weight: 400; - line-height: 1.5; - color: #6c6c6c; -} -.hyperlink { - color: #a2a2a2; - text-decoration: none; - font-weight: 500; - border-bottom: solid 1px; - transition: all 0.5s ease; - text-decoration: none; - :hover { - text-decoration: none; - color: #2a2a36; - } -} .screen-reader-text { display: none; diff --git a/assets/css/modules/hero.scss b/assets/css/modules/hero.scss index 291c692a..ce4398ef 100644 --- a/assets/css/modules/hero.scss +++ b/assets/css/modules/hero.scss @@ -21,6 +21,7 @@ line-height: 1.6; text-shadow: 0px 0px 10px #333; transform: translateY(50px); + font-weight: 400; } .topheader { diff --git a/assets/css/modules/typography.scss b/assets/css/modules/typography.scss index 2d2e25dd..1584474d 100644 --- a/assets/css/modules/typography.scss +++ b/assets/css/modules/typography.scss @@ -82,7 +82,7 @@ } .hyperlink { - color: #a2a2a2; + color: $medium-grey; text-decoration: none; font-weight: 500; border-bottom: solid 1px; diff --git a/assets/css/pages/appdev.css b/assets/css/pages/appdev.css index 36ebe76e..9d68ee05 100644 --- a/assets/css/pages/appdev.css +++ b/assets/css/pages/appdev.css @@ -151,25 +151,24 @@ border-top-right-radius: 0; border-top-left-radius: 0; } -.nav { - position: relative; - padding: 5px 0 30px 0; } - .nav.nav-pills.brand-pills.nav-stacked { - opacity: 1; - /* compensate for nav being set to opacity 0 by our top nav bar code */ } - .nav.nav-pills.brand-pills.nav-stacked li { - margin: 0; - border-left: 1px solid lightgray; } - .nav.nav-pills.brand-pills.nav-stacked li:hover, .nav.nav-pills.brand-pills.nav-stacked li.active { - border-left: 1px solid blue; - font-weight: 700; } - .nav.nav-pills.brand-pills.nav-stacked li a { - color: #2a2a36; - background-color: transparent; - padding-left: 20px; - border-radius: 0; - margin: 0; } - .nav.nav-pills.brand-pills.nav-stacked .tab-content { +.nav.nav-pills.brand-pills.nav-stacked { + position: relative !important; + padding: 5px 0 30px 0; + opacity: 1; + /* compensate for nav being set to opacity 0 by our top nav bar code */ } + .nav.nav-pills.brand-pills.nav-stacked li { + margin: 0; + border-left: 1px solid lightgray; } + .nav.nav-pills.brand-pills.nav-stacked li:hover, .nav.nav-pills.brand-pills.nav-stacked li.active { + border-left: 1px solid blue; + font-weight: 700; } + .nav.nav-pills.brand-pills.nav-stacked li a { + color: #2a2a36; + background-color: transparent; + padding-left: 20px; + border-radius: 0; + margin: 0; } + .nav.nav-pills.brand-pills.nav-stacked li .tab-content { margin-top: 15px; padding-top: 5px; } @@ -204,9 +203,16 @@ section { padding-bottom: 0px; } section .row { padding-top: 40px; } + section li { + list-style-image: url("../../img/enterprise/dot-tiny.svg"); } .section--documentation { padding-bottom: 170px; } + .section--documentation .icon { + height: 100px; } + +.section--feature .icon { + height: 32px; } .section--getinvolved { padding-top: 10px; diff --git a/assets/css/pages/appdev.scss b/assets/css/pages/appdev.scss index 929d48a1..474af314 100644 --- a/assets/css/pages/appdev.scss +++ b/assets/css/pages/appdev.scss @@ -38,10 +38,22 @@ section { .row { padding-top: 40px; } + li { + list-style-image: url("../../img/enterprise/dot-tiny.svg"); + } } .section--documentation { padding-bottom: 170px; + .icon { + height: 100px; + } +} + +.section--feature { + .icon { + height: 32px; + } } .section--getinvolved { diff --git a/assets/css/pages/contribute.css b/assets/css/pages/contribute.css index 75054956..6b916b1c 100644 --- a/assets/css/pages/contribute.css +++ b/assets/css/pages/contribute.css @@ -43,6 +43,8 @@ footer.page-footer { .section--contribute { padding-top: 30px; /* display: inline-block; */ } + .section--contribute .row { + padding-top: 50px; } .section--contribute .section--heading-1 { padding: 80px 0 30px 0; } .section--contribute .section--intro { @@ -52,6 +54,8 @@ footer.page-footer { @media (max-width: 768px) { .section--contribute .section--intro { text-align: left !important; } } + .section--contribute img { + padding: 15px; } .calltoaction { margin-top: 50px; diff --git a/assets/css/pages/contribute.scss b/assets/css/pages/contribute.scss index 29e1c93c..0a3f0b73 100644 --- a/assets/css/pages/contribute.scss +++ b/assets/css/pages/contribute.scss @@ -18,7 +18,9 @@ footer.page-footer { .section--contribute { padding-top: 30px; /* display: inline-block; */ - + .row { + padding-top: 50px; + } .section--heading-1 { padding: 80px 0 30px 0; } @@ -32,6 +34,9 @@ footer.page-footer { text-align: left !important; } } + img { + padding: 15px; + } } .calltoaction { diff --git a/assets/img/headers/atwork-small.jpg b/assets/img/headers/atwork-small.jpg new file mode 100644 index 00000000..e672b44e Binary files /dev/null and b/assets/img/headers/atwork-small.jpg differ diff --git a/assets/img/headers/crash-small.jpg b/assets/img/headers/crash-small.jpg new file mode 100644 index 00000000..cefb84db Binary files /dev/null and b/assets/img/headers/crash-small.jpg differ diff --git a/assets/img/headers/design-small.jpg b/assets/img/headers/design-small.jpg new file mode 100644 index 00000000..d453e774 Binary files /dev/null and b/assets/img/headers/design-small.jpg differ diff --git a/assets/img/headers/ladies-that-foss.jpg b/assets/img/headers/ladies-that-foss.jpg new file mode 100644 index 00000000..10701b69 Binary files /dev/null and b/assets/img/headers/ladies-that-foss.jpg differ diff --git a/page-contribute.php b/page-contribute.php index 622ccfb6..42c01e51 100644 --- a/page-contribute.php +++ b/page-contribute.php @@ -23,13 +23,14 @@
-

t('Become part of the Community.');?>

+

t('Become part of the Community.');?>

-
- +
+ +
-
+

t('Contribute to Nextcloud server or apps');?>

t('Learn about setting up a development environment or read our security guidelines, coding style and more!');?>

t('Improve the Nextcloud Server:');?> t('server development documentation');?>, t('general guidelines and setup');?>

@@ -38,31 +39,46 @@

t('Help translate Nextcloud.');?>

t('Talk to us on our forum! We look forward to your code and thoughts.');?>

- t('Learn more about writing Nextcloud apps');?> + t('Learn more about writing Nextcloud apps');?>
-
- +
+
-
-

t('Answer questions about Nextcloud use and development');?>

+
+

t('Answer questions about Nextcloud use and development');?>

t('Help answer questions users and developers have about Nextcloud!');?>

-

t('Join the Nextcloud forums!');?>

+

t('Join the Nextcloud forums');?>

t('Please be considerate of our code of conduct. We want to provide a positive and enjoyable environment for everybody.');?>

-
-

t('Test Nextcloud');?>

+
+ +
+
+

t('Test Nextcloud');?>

t('Testing upcoming Nextcloud Server releases is the best way of making sure the new release can do what you need it to do. And of course, only if you report a problem to us we know about it and can fix it! If you have a bug to report, find the issue submission page.');?>

-

t('Design Nextcloud');?>

+
+
+
+
+ +
+
+

t('Design Nextcloud');?>

t('Help out with Nextcloud user interaction design or graphic design! Get involved on the design page!');?>

-
-

t('Support Nextcloud development with bounties');?>

+
+
+
+ +
+
+

t('Support Nextcloud development with bounties');?>

t('Support Nextcloud development by offering some money on features you would like to have! Check our Bountysource page!');?>

t('Note that');?> t('we are hiring. We look especially for people who want to turn their passion into their job! When possible, we hire people from our active community base or from the wider open source community.');?>

diff --git a/page-developer.php b/page-developer.php index 67b0bda7..9f33fc38 100644 --- a/page-developer.php +++ b/page-developer.php @@ -26,7 +26,7 @@

this is amazing!

-
    +
    • because I rock
    • because you rock
    • because we all rock!
      • @@ -40,19 +40,19 @@
-
+ +

t('Time to be creative.');?>

t('Everything you need to get started with Nextcloud development.');?>

- + t('Download now');?>
- +-->
-
+
-
-
- -
-
-

t('Build a new application');?>

-

t('Write new applications on top of the Nextcloud platform.');?>

- -
-
-
-
-
-
- -
-
-

t('Extend Nextcloud');?>

-

t('Write a Nextcloud app to improve or change Nextcloud functionality.');?>

- -
-
-
+ +

t('Build a new application');?>

+

t('Write new applications on top of the Nextcloud platform.');?>

+ +
+
+ +

t('Extend Nextcloud');?>

+

t('Write a Nextcloud app to improve or change Nextcloud functionality.');?>

+ +
-
-
- -
-
-

t('Connect to Nextcloud');?>

-

t('Integrate an existing software into Nextcloud.');?>

- -
-
-
+ +

t('Connect to Nextcloud');?>

+

t('Integrate an existing software into Nextcloud.');?>

+ +
-
-
- -
-
-

t('Write new clients');?>

- -
-
-
-
+ +

t('Write new clients');?>

+ +
+
@@ -198,7 +174,8 @@ in action
-

t('Featured community app: Nextcloud OCR');?>

+ +

t('Featured community app:');?>
Nextcloud OCR

t('The app uses tesseract-js in the browser in order to process images (png, jpeg, tiff) and PDFs and saves the output file to the source folder in nextcloud. That for example enables you to search in it.');?>

t('See the OCR app');?>
@@ -209,7 +186,7 @@
-

t('Get help');?>

+

t('Need help?');?>

t('Stuck with your app?');?>

t('We love to help!');?>

@@ -223,19 +200,20 @@
- in action + in action
-

t('Featured community app: Cospend');?>

-

t('Nextcloud Cospend is a group/shared budget manager. It was inspired by the great IHateMoney.
You can use it when you share a house, when you go on vacation with friends, whenever you share money with others.');?>

- t('Read about Cospend');?> + +

t('Featured community app:');?>
Digital Imaging for Medicine

+

t('The DICOM Viewer allows the user to display and manipulate DICOM images with a streamlined sidebar and viewer, all without leaving Nextcloud. The sidebar parses DICOM files and displays all DICOM attributes, such as Patient ID, Patient Name, and Study Date/Time, in a convenient details panel. A critical search feature on the sidebar enables the user to quickly search for specific DICOM attributes.');?>

+ t('Read about the DICOM viewer');?>
-
+

t('Why Nextcloud apps?');?>

@@ -278,12 +256,13 @@
- in action + in action
-

t('Featured community app: Digital Imaging for Medicine');?>

-

t('The DICOM Viewer allows the user to display and manipulate DICOM images with a streamlined sidebar and viewer, all without leaving Nextcloud. The sidebar parses DICOM files and displays all DICOM attributes, such as Patient ID, Patient Name, and Study Date/Time, in a convenient details panel. A critical search feature on the sidebar enables the user to quickly search for specific DICOM attributes.');?>

- t('Read about the DICOM viewer');?> + +

t('Featured community app:');?>
Cospend

+

t('Nextcloud Cospend is a group/shared budget manager. It was inspired by the great IHateMoney.
You can use it when you share a house, when you go on vacation with friends, whenever you share money with others.');?>

+ t('Read about Cospend');?>
-- cgit v1.2.3