diff --git a/js/src/userprofile.js b/js/src/userprofile.js index 64e44b1257708e4a55418a92664b706b0da6344b..ac82fe41cebb52e0edb1e3c6bfebb19d4fc40489 100644 --- a/js/src/userprofile.js +++ b/js/src/userprofile.js @@ -9,7 +9,7 @@ const UserProfile = (function ($) { $('.eclipsefdn-userprofile').each(function(index, user_block){ - const username = $(this).attr("data-username"); + const username = $(this).attr('data-username'); $.ajax({ type: 'GET', @@ -24,27 +24,27 @@ const UserProfile = (function ($) { user_block.append(img); } - let fullName = ""; + let fullName = ''; if (typeof user_profile.full_name !== 'undefined' && user_profile.full_name !== null) { fullName = document.createTextNode(user_profile.full_name); } else { fullName = document.createTextNode(user_profile.name); } - if (fullName !== "") { + if (fullName !== '') { let h3 = document.createElement('h3'); h3.appendChild(fullName); user_block.append(h3); } - let job_org = ""; - if (typeof user_profile.job_title !== 'undefined' && user_profile.job_title !== null && user_profile.job_title !== "") { - job_org = user_profile.job_title + ", "; + let job_org = ''; + if (typeof user_profile.job_title !== 'undefined' && user_profile.job_title !== null && user_profile.job_title !== '') { + job_org = user_profile.job_title + ', '; } if (typeof user_profile.org !== 'undefined' && user_profile.org !== null) { job_org += user_profile.org; } - if (job_org !== "") { + if (job_org !== '') { const org = document.createTextNode(job_org); let h4 = document.createElement('h4'); h4.appendChild(org); @@ -65,10 +65,10 @@ const UserProfile = (function ($) { user_block.append(p); } - let a_text = document.createTextNode("Read More"); + let a_text = document.createTextNode('Read More'); let a = document.createElement('a'); a.appendChild(a_text); - a.setAttribute('href', "https://accounts.eclipse.org/users/" + user_profile.name); + a.setAttribute('href', 'https://accounts.eclipse.org/users/' + user_profile.name); let p_read_more = document.createElement('p'); p_read_more.appendChild(a); user_block.append(p_read_more); diff --git a/layouts/partials/footer_custom.html b/layouts/partials/footer_custom.html index e3b21bb1b7eba27742f7a6ff306668cb7778b4d6..dcaa1d47fcc2976c1e625eec2bda09faab51f304 100644 --- a/layouts/partials/footer_custom.html +++ b/layouts/partials/footer_custom.html @@ -7,7 +7,7 @@ <p><img class="Cloud ToolTime" width="120" src="/images/ecdtools/home/cloud-tool-time-logo.svg"></p> <p class="webinar-series-2-description">Join us for this fun, educational and interactive webinar series, featuring a variety of cloud development topics from community members!</p> <ul class="list-inline webinar-series-2-buttons"> - <li><a class="btn btn-primary" href="https://www.crowdcast.io/e/cloud-tool-time-sept7/register">Register Now</a></li> + <li><a class="btn btn-primary" href="https://www.crowdcast.io/e/cloud-tool-time-nov23">Register Now</a></li> <li><a class="btn btn-primary" href="https://docs.google.com/forms/d/e/1FAIpQLScudzvlUVfXehmz-Jkivv_BkJdljSjtZLENkT16jSxTzwzwkQ/viewform">Propose a Talk</a></li> </ul> </div> diff --git a/layouts/shortcodes/home/projects.html b/layouts/shortcodes/home/projects.html index 9e9aec3ae609142c3ed8ef184bd0604186664b39..1d2c47c1bc9b94b3257272c420b63d34f84628ef 100644 --- a/layouts/shortcodes/home/projects.html +++ b/layouts/shortcodes/home/projects.html @@ -60,7 +60,7 @@ {{ $scratch.Set "user_picture" "static/images/ecdtools/projects/" }} {{ $scratch.Add "user_picture" .username }} {{ $scratch.Add "user_picture" ".png" }} - {{ $user_picture := $scratch.Get "user_picture" }} + {{ $user_picture := $scratch.Get "user_picture" }} {{ if (fileExists $user_picture) }} <img class="img-responsive featured-section-projects-picture" src="images/ecdtools/projects/{{ .username }}.png" alt="{{ .full_name }}"> {{ else }} diff --git a/layouts/shortcodes/page/about.html b/layouts/shortcodes/page/about.html index 99666e38cfaba13367fa038ec3f28cf498ff186f..f03868e792c8285e1ab4c8339d218663ac0f75e9 100644 --- a/layouts/shortcodes/page/about.html +++ b/layouts/shortcodes/page/about.html @@ -2,7 +2,7 @@ <div class="container"> <div class="row"> <div class="col-md-14 col-md-offset-5 col-sm-18 col-sm-offset-3"> - <p class="small">OUR MISSION</p> + <p class="small">Our mission</p> <p class="powered-by-description">To define and build an ecosystem of best-in-class open-source web and cloud-based development tools, and to promote and drive the broad adoption of these tools.</p> <p><a class="btn btn-primary" href="https://accounts.eclipse.org/mailing-list/ecd-tools-wg">Get Involved</a></p> @@ -16,8 +16,8 @@ <div class="row margin-bottom-30"> <div id="working_group" class="col-sm-18 col-sm-offset-3"> <p class="margin-bottom-30 text-center"><img class="featured-content-about-img img-responsive" src="/images/ecdtools/about/about-icon.png" - alt="ABOUT THE ECLIPSE CLOUD DEVTOOLS WORKING GROUP"></p> - <h2 class="heading-underline text-center">ABOUT THE ECLIPSE CLOUD DEVTOOLS WORKING GROUP</h2> + alt="About the eclipse cloud devtools working group"></p> + <h2 class="heading-underline text-center">About the eclipse cloud devtools working group</h2> <p class="text-center">The Eclipse Cloud DevTools Working Group accelerates innovation and adoption of Cloud Integrated Development Environment (IDE) and container-based workspace management technologies. This work is accomplished through:</p> @@ -55,7 +55,7 @@ <div class="row"> <div class="col-sm-16 col-sm-offset-4"> <div class="offwhite-bg-shadow"> - <h2 class="heading-underline text-center">FREQUENTLY ASKED QUESTIONS</h2> + <h2 class="heading-underline text-center uppercase">Frequently asked questions</h2> <p class="brand-primary">Why did the Eclipse Foundation create the Cloud DevTools Working Group?</p> <p>Cloud native applications are of critical importance for today’s enterprises. According to a recent Eclipse Foundation survey, more than 80% of developers have plans to create cloud native diff --git a/layouts/shortcodes/page/resources/community.html b/layouts/shortcodes/page/resources/community.html index 57c0bc7267d8fea73005efd807ea9d1e44122a25..607f52ca40ef2093980887e14b244b844d1d517c 100644 --- a/layouts/shortcodes/page/resources/community.html +++ b/layouts/shortcodes/page/resources/community.html @@ -179,8 +179,6 @@ </li> </ul> - <p> </p> - </div> </div> diff --git a/less/_components/_commons.less b/less/_components/_commons.less index 960566a00d405cc4bce2b86d903fc8970cffd651..cc0ca464eb2fec41a8a2e114b0e59a5bdeb8ccfb 100644 --- a/less/_components/_commons.less +++ b/less/_components/_commons.less @@ -51,11 +51,11 @@ } .offwhite-bg-shadow { - background-color:#f9f9f9; + background-color:@offwhite; } .white-bg-shadow { - background-color:#fff; + background-color:@white; } .featured-section-webinar-series-2 { @@ -73,18 +73,17 @@ margin-bottom:25px; margin-top:20px; } - .webinar-series-2-buttons { - li a { - width:225px; - @media (max-width: @screen-xs-max) { - margin-bottom:30px; - } + .webinar-series-2-buttons li a { + width:225px; + margin-bottom:30px; + @media (min-width: @screen-xs-min) { + margin-bottom:0px; } } } .featured-section-webinar-series-2-home { - background-color:#f9f9f9; + background-color:@offwhite; } .featured-section-testimonials{ diff --git a/less/_components/homepage.less b/less/_components/homepage.less index 4e17dece24f07c1ac863a3ca3551ad90c6fa6f23..f7759479b5e9ca0f7a67948a8a71384aaa110690 100644 --- a/less/_components/homepage.less +++ b/less/_components/homepage.less @@ -24,7 +24,6 @@ .featured-jumbotron{ padding-top:200px; padding-bottom:150px; - //background-image: url('../images/jumbotron-image.jpg'); background-size:cover; } &.featured-jumbotron-home { @@ -71,10 +70,8 @@ padding:0!important; } - - .featured-section-webinar-series-1 { - background-image:url(../images/webinar-series-1-bg.png); + background-image:url(../images/webinar-series-1-bg.jpg); background-size: cover; color:@white; .btn { @@ -83,11 +80,11 @@ margin-top: 10px; } h2{ - font-size:34px; + font-size:28px; text-transform: inherit; margin-bottom:10px; - @media (max-width: @screen-xs-max) { - font-size:28px; + @media (min-width: @screen-xs-min) { + font-size:34px; } } h3 { @@ -96,8 +93,9 @@ h2, h3 { color:@white; font-weight:400; - @media (max-width: @screen-xs-max) { - text-align: center; + text-align: center; + @media (min-width: @screen-xs-min) { + text-align: left; } } .featured-section-webinar-series-1-img { @@ -110,14 +108,15 @@ } p { font-size:18px; - @media (max-width: @screen-xs-max) { - text-align: center; + text-align: center; + @media (min-width: @screen-xs-min) { + text-align: left; } } } -.owl-carousel .owl-item img.featured-section-webinar-series-1-img { - @media (max-width: @screen-xs-max) { +@media (max-width: @screen-xs-max) { + .owl-carousel .owl-item img.featured-section-webinar-series-1-img { width:150px; } } @@ -148,8 +147,7 @@ .featured-section-projects-picture { max-width:116px; - max-height:116px; - min-height:116px; + height:116px; } .image-container { diff --git a/less/_components/open-vsx.less b/less/_components/open-vsx.less index 639a2d7d016eb1f77089ad44eca799d6a0323132..8f044a14b341108ed6632f5185ca4003bac5d3f6 100644 --- a/less/_components/open-vsx.less +++ b/less/_components/open-vsx.less @@ -12,11 +12,14 @@ */ .header-open-vsx-bg-img { - background-image:@featured-jumbotron-open-vsx-bg-img; - text-align:left; - background-color:@white; + background-image: @featured-jumbotron-open-vsx-bg-img; + text-align: center; + background-color: @white; + @media (min-width: @screen-sm-min) { + text-align: left; + } h1, h2 { - color:@text-color; + color: @text-color; } h2 { font-size: 16px; @@ -24,9 +27,6 @@ line-height: 1.6; font-weight: 400; } - @media (max-width: @screen-sm-max) { - text-align:center; - } } #header-wrapper .featured-jumbotron.featured-jumbotron-sub-pages.header-open-vsx-bg-img { @@ -60,13 +60,13 @@ .featured-section-team-leads-container { background-color:@white; + overflow: hidden; @media (min-width: @screen-sm-min) { background-image:url('../images/team-lead-bg.jpg'); background-repeat: no-repeat; background-position: top right; background-size:60%; } - overflow: hidden; } .featured-section-team-leads { @@ -133,20 +133,16 @@ @media (min-width: @screen-lg-min) { padding-top:60px; } - .item { - img { - width:60px; - @media (max-width: @screen-sm-max) { - margin: 0 auto; - } + .item img { + width:60px; + @media (max-width: @screen-sm-max) { + margin: 0 auto; } } } -.heading-underline-width-30 { - &:after { - width: 30px; - } +.heading-underline-width-30:after { + width: 30px; } .featured-section-contribution-activity { diff --git a/less/_components/resources.less b/less/_components/resources.less index 468095fcc3e2a2c777793fbc91c2f9413ef4b865..08d526f4ab5e4dd36783d40cc5737692eeff80f7 100644 --- a/less/_components/resources.less +++ b/less/_components/resources.less @@ -34,8 +34,6 @@ } } -.featured-section-community-collaboration { - p { - color:#000; - } +.featured-section-community-collaboration p { + color:#000; } diff --git a/less/_variables.less b/less/_variables.less index 23e9a9a7444d8a234cde14dfbe6e71816f66bdad..68b5e1a0a048069d118426b32b21b0dafc24431a 100644 --- a/less/_variables.less +++ b/less/_variables.less @@ -18,9 +18,9 @@ @heading-underline-width:50px; //== Colors -@brand-primary: #1f7da9; // Light orange -@brand-secondary: #2addf7; // Dark Orange -@brand-tertiary: #022247; // Dark Purple +@brand-primary: #1f7da9; +@brand-secondary: #2addf7; +@brand-tertiary: #022247; @brand-quaternary: #6e6e6e; // Light Gray @brand-quinary: @brand-quaternary; // Light Gray (Breadcrumbs) @brand-info: @brand-tertiary; @@ -35,8 +35,6 @@ @link-hover-color: darken(@link-color, 10%); //** Link hover decoration. @link-hover-decoration: underline; -//** Link visited color -//@link-visited-color: #9e55d2; //== Featured Story @featured-story-h2-color: #4c4d4e; diff --git a/less/images/banners/2.png b/less/images/banners/2.png deleted file mode 100644 index 81903a24847fcb5f076d9c502bca18142840b6c8..0000000000000000000000000000000000000000 Binary files a/less/images/banners/2.png and /dev/null differ diff --git a/less/images/banners/about-faq-bg.jpg b/less/images/banners/about-faq-bg.jpg index d3afdb84dfa00d6c12ace8c9e4ce5071b920f3db..effb8a1aa9dbaf96b431c7b8c9e4fa34eca84a55 100644 Binary files a/less/images/banners/about-faq-bg.jpg and b/less/images/banners/about-faq-bg.jpg differ diff --git a/less/images/banners/jumbotron-adopters-bg.jpg b/less/images/banners/jumbotron-adopters-bg.jpg index baa3adf2ebdb02e11e126066e2369c219adcd7ab..2e2c172b0aa15907043af1cec5173855072290bf 100644 Binary files a/less/images/banners/jumbotron-adopters-bg.jpg and b/less/images/banners/jumbotron-adopters-bg.jpg differ diff --git a/less/images/banners/jumbotron-adopters-bg.png b/less/images/banners/jumbotron-adopters-bg.png deleted file mode 100644 index 7e7bc7364cacc767218a29834bae85a5ee518c47..0000000000000000000000000000000000000000 Binary files a/less/images/banners/jumbotron-adopters-bg.png and /dev/null differ diff --git a/less/images/banners/membership-bg.jpg b/less/images/banners/membership-bg.jpg index da81d71761680fef5d8bc83f38c9d1b8fe11fa9f..5636812da1a4d074873ec00b2f04a2c70b4b8481 100644 Binary files a/less/images/banners/membership-bg.jpg and b/less/images/banners/membership-bg.jpg differ diff --git a/less/images/jumbotron-home-bg.jpg b/less/images/jumbotron-home-bg.jpg index 7793b649aed01f37c2551061c2b629e40a986060..b337ab3b1e2ccbaae3e180aec3c12ebcf5ff4bd5 100644 Binary files a/less/images/jumbotron-home-bg.jpg and b/less/images/jumbotron-home-bg.jpg differ diff --git a/less/images/mission-statement-image.jpg b/less/images/mission-statement-image.jpg index f55010e7148d64ed925f689785345b2af71063b6..27d311641f0d0ed74db7631f1483683f58b108a1 100644 Binary files a/less/images/mission-statement-image.jpg and b/less/images/mission-statement-image.jpg differ diff --git a/less/images/webinar-series-1-bg.jpg b/less/images/webinar-series-1-bg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b2ad2a06d654ee9a16e05903859e58400e813a61 Binary files /dev/null and b/less/images/webinar-series-1-bg.jpg differ diff --git a/less/images/webinar-series-1-bg.png b/less/images/webinar-series-1-bg.png deleted file mode 100644 index dde20bf0a7aa9fc041dfe26e851c498ff438ea49..0000000000000000000000000000000000000000 Binary files a/less/images/webinar-series-1-bg.png and /dev/null differ diff --git a/less/styles.less b/less/styles.less index f3a9ccc6e5937ff73292a9fca63fcfcfda02e39c..8e3987c1312e861bb0b41f57006dffcb0bee43e8 100644 --- a/less/styles.less +++ b/less/styles.less @@ -92,56 +92,17 @@ } } - -@media (max-width: @screen-xs-max) { - .featured-section-faq, - .featured-section-statement{ - text-align:center; - } - .mission-circle{ - margin-top: 50px; - } -} .featured-jumbotron h1 sup { font-size: 0.66em; position: relative; top: -0.34em; } -.initiative-summary { - & { - margin-top: 30px; - margin-bottom: 50px; - } - & h4 { - margin-top: 20px; - } - & ul.list-inline li { - padding: 0 15px; - } -} - .events-container a.btn-secondary:nth-child(2) { margin-left: 10px; } //== END: For event page -.d-inline-block { - display: inline-block; -} - -.adopters-page { - p { - font-size: 16px; - } -} - -.stay-connected { - .fa-stack{ - color: @white; - } -} - // events display, aligns presenters (should be moved to solstice-assets) .eclipsefdn-agenda-schedule ul { padding-left: 0px; } .eclipsefdn-agenda-schedule li { list-style: none; padding-bottom: 10px; } \ No newline at end of file diff --git a/static/images/about-faq-bg.jpg b/static/images/about-faq-bg.jpg index d3afdb84dfa00d6c12ace8c9e4ce5071b920f3db..effb8a1aa9dbaf96b431c7b8c9e4fa34eca84a55 100644 Binary files a/static/images/about-faq-bg.jpg and b/static/images/about-faq-bg.jpg differ diff --git a/static/images/ecdtools/projects/mnuri.png b/static/images/ecdtools/projects/mnuri.png new file mode 100644 index 0000000000000000000000000000000000000000..062da590e539cbc9023792ad160fc3e4b3e319c4 Binary files /dev/null and b/static/images/ecdtools/projects/mnuri.png differ diff --git a/static/images/jumbotron-adopters-bg.jpg b/static/images/jumbotron-adopters-bg.jpg index baa3adf2ebdb02e11e126066e2369c219adcd7ab..2e2c172b0aa15907043af1cec5173855072290bf 100644 Binary files a/static/images/jumbotron-adopters-bg.jpg and b/static/images/jumbotron-adopters-bg.jpg differ diff --git a/static/images/jumbotron-home-bg.jpg b/static/images/jumbotron-home-bg.jpg index 7793b649aed01f37c2551061c2b629e40a986060..b337ab3b1e2ccbaae3e180aec3c12ebcf5ff4bd5 100644 Binary files a/static/images/jumbotron-home-bg.jpg and b/static/images/jumbotron-home-bg.jpg differ diff --git a/static/images/membership-bg.jpg b/static/images/membership-bg.jpg index da81d71761680fef5d8bc83f38c9d1b8fe11fa9f..5636812da1a4d074873ec00b2f04a2c70b4b8481 100644 Binary files a/static/images/membership-bg.jpg and b/static/images/membership-bg.jpg differ diff --git a/static/images/webinar-series-1-bg.jpg b/static/images/webinar-series-1-bg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b2ad2a06d654ee9a16e05903859e58400e813a61 Binary files /dev/null and b/static/images/webinar-series-1-bg.jpg differ