Commit 7b823d25 authored by Vitor Lopes's avatar Vitor Lopes

Merge branch '51-hardware-redesign' of...

Merge branch '51-hardware-redesign' of https://gitlab.manjaro.org/webpage/manjaro-homepage into hardware
parents bdf4d444 dc5f0fe6
......@@ -255,8 +255,119 @@ p, .call-to-action {
}
}
.page-header {
height: 110vh !important;
.hardware {
h1 {
font-size: 2.5rem;
text-align: center;
}
h3 {
text-align: left;
font-size: .8rem;
font-weight: 900 !important;
margin-bottom: .5rem;
}
h1:before {
display: none;
}
.jumbotron {
background-color: transparent;
padding-left: 0;
padding-right: 0;
margin-bottom: 0;
color:#efebeb;
p {
color: #dad4d4;
}
}
.page-header {
height: 110vh !important;
}
.page-header .page-header-image {
will-change: transform;
-webkit-filter: grayscale(0%); /* Safari 6.0 - 9.0 */
filter: grayscale(0%);
-moz-filter: grayscale(0%);
transition: filter 3.5s ease;
}
h1.title::first-letter {
color: $green;
}
hr {
display: block;
height: 1px;
border: 0;
border-top: 1px solid #ECEFF1;
padding: 0;
}
.subtitle{
font-weight: 1000 !important;
color: #424242;
}
.card {
min-height: 450px;
background: white;
.card-body {
padding-top: 0;
button {
margin-right: 20px;
}
}
img {
object-fit: contain;
padding:20px;
padding-bottom: 0;
}
}
.btn.btn-white, .btn.btn-white:focus, .btn.btn-white:hover {
background-color: #fff;
color: $green;
}
.main {
z-index: 3;
background: transparent;
padding-left: 0;
padding-right: 0;
.card-subtitle{
font-weight: 900 !important;
margin-bottom: .7rem;
}
.card-desc{
font-weight: 400 !important;
font-size: .7rem;
}
.card-title{
font-weight: 800 !important;
font-size: 1.1rem;
margin-top:10px; }
.table{
margin-top: .85rem;
margin-bottom: 0;
}
.collapse p {
margin-bottom: 1rem !important;
}
}
.section {
background: #212529;
}
}
h1:before {
......@@ -264,9 +375,6 @@ h1:before {
content: "#";
}
.hardware .title-container h1 {
font-size: 2em;
}
::selection {
background: $green;
......
......@@ -57,3 +57,12 @@ other="Note"
[download]
other="Download"
[buy]
other="Buy"
[features]
other="Features"
[about_hardware]
other="About Our Hardware"
<!doctype html>
<html lang="en">
{{ partial "head" . }}
<body class="{{ .Params.class | default "test" }} sidebar-collapse">
<div class="logo-overlay-loader">
<div class="logo-container">
<img src="/img/logo.svg" alt=""><br>
<span class="">manjaro</span><br>
<div class="progress">
<div class="progress-bar progress-bar-striped bg-success" role="progressbar" style="width: 0%" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100"></div>
</div>
</div>
</div>
{{ partial "nav-image-header" . }}
{{partial "head" . }}
<body class="{{ .Params.class | default "download-page" }} sidebar-collapse">
{{ partial "loading-screen" . }}
{{ partial "navbar" . }}
<div class="{{ .Params.wrapper | default "wrapper" }}">
<div class="page-header {{ .Params.headerstyle | default "page-header-small"}}" filter-color="{{ .Param "tint" | default "orange" }}">
<div class="page-header-image" data-parallax="true" style="background-image: url('{{ (.Param "background") | default "img/header.jpg" | absURL }}');">
</div>
{{ block "title" . }}
{{ end }}
</div>
<div class="{{ .Params.section | default "section"}}">
<div class="container">
<div class="{{ .Params.section | default "section"}} d-flex justify-content-center">
<div class="container main">
{{ block "body" . }}
{{ end }}
......@@ -33,7 +15,6 @@
</div>
</div>
{{ partial "footer" . }}
</div>
</body>
{{partial "javascript" . }}
</html>
\ No newline at end of file
{{ define "title" }}
<div class="container">
<div class="content-center title-container">
<h1 class="title">{{ .Title }}</h1>
</div>
</div>
{{ end }}
{{ define "body" }}
<div class="jumbotron">
<h1 class="display-4">Specially tunned Manjaro combined with manufacturer designed hardware.</h1>
<hr class="my-4">
<p class="lead">This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
</div>
{{ partial "hardware.html" . }}
<div class="row">
......
{{ if eq .Type "hardware" }}
<div class="row justify-content-center">
<div class="col-md-6 ml-auto mr-auto">
<div id="productCarousel" class="carousel slide" data-ride="carousel" data-interval="18000">
<ol class="carousel-indicators">
{{ range $index, $element := .Params.images}}
{{if eq $index 0}}
<li data-target="#productCarousel" data-slide-to="{{ $index }}" class="active"></li>
{{else}}
<li data-target="#productCarousel" data-slide-to="{{ $index }}"></li>
{{end}}
{{ end }}
</ol>
<div class="carousel-inner" role="listbox">
{{ range $index, $element := .Params.images}}
{{if eq $index 0}}
<div class="carousel-item active">
<img class="d-block img-raised" src="/img/hardware/{{ $element }}.jpg" alt="{{ $index }} slide">
</div>
{{else}}
<div class="carousel-item">
<img class="d-block img-raised" src="/img/hardware/{{ $element }}.jpg" alt="{{ $index }} slide">
</div>
{{ end }}
{{ end }}
</div>
<a class="carousel-control-prev" href="#productCarousel" role="button" data-slide="prev">
<button type="button" class="btn btn-primary btn-icon btn-round btn-sm" name="button">
<i class="now-ui-icons arrows-1_minimal-left"></i>
</button>
</a>
<a class="carousel-control-next" href="#productCarousel" role="button" data-slide="next">
<button type="button" class="btn btn-primary btn-icon btn-round btn-sm" name="button">
<i class="now-ui-icons arrows-1_minimal-right"></i>
</button>
</a>
</div>
<p class="blockquote blockquote-primary">
"{{.Params.blockquote}}"<br><br>
<small>{{.Params.blockquotewriter}}</small>
</p>
</div>
<div class="col-md-6 ml-auto mr-auto">
<h2 class="title">{{.Params.subtitle}}</h2>
<h5 class="category">{{.Params.subdescription}}</h5>
<table style="width:100%" cellspacing="0">
<tr>
<td>{{.Params.pricebefore}} <h2 class="main-price">{{.Params.price}}</h2></td>
</tr>
<tr>
<td colspan="2">{{.Params.pricetax}}</td>
</tr>
</table>
<div id="accordion" role="tablist" aria-multiselectable="true" class="card-collapse">
<div class="card card-plain">
<div class="card-header" role="tab" id="headingOne">
<a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="false" aria-controls="collapseOne">
{{.Params.datasheet}}
<i class="now-ui-icons arrows-1_minimal-down"></i>
</a>
</div>
<div id="collapseOne" class="collapse" role="tabpanel" aria-labelledby="headingOne">
<div class="card-body">
<dl class="data-sheet">
{{ range $index, $element := .Params.datasheetcontent}}
{{if (modBool $index 2)}}
<dt class="name">{{$element}}</dt>
{{else}}
<dd class="value">{{$element}}</dd>
{{ end }}
{{ end }}
</dl>
<div class="container">
<div class="row justify-content-center">
{{ range $main_index, $main_element := (where .Site.Pages ".Type" "hardware") }}
{{ if and (isset .Params "datasheetcontent") (eq .Params.enable "true") }}
<div class="col-sm-6 col-lg-4">
<div class="card">
{{ range $index, $element := .Params.images}}
<img class="d-block" src="/img/hardware/{{ $element }}.png"
alt="{{ $index }} slide">
{{ end }}
<div class="card-body text-center">
<h2 class="card-subtitle text-dark">{{.Params.subtitle}}</h2>
<span class="card-desc text-dark">{{.Params.subdescription}}</span>
<table class="table text-dark" cellspacing="0">
<tr>
<td>{{.Params.pricebefore}}<div class="card-title text-danger">
{{.Params.price}}</div>
</td>
</tr>
<tr>
<td colspan="2">{{.Params.pricetax}}</td>
</tr>
</table>
<!-- dont forget i18-->
<button class="btn bg-info btn-round" type="button" data-toggle="collapse"
data-target="#collapseExample{{$main_index}}" aria-expanded="false"
aria-controls="collapseExample">
{{ i18n "features" }}
</button>
<div class="collapse" id="collapseExample{{$main_index}}">
{{ range $index, $element := .Params.datasheetcontent}}
{{if (modBool $index 2)}}
<hr>
<h3><b>{{$element}}</b></h3>
{{else}}
<p>{{$element}}</p>
{{ end }}
{{ end }}
</div>
<a href="{{.Params.buylink}}" target="_blank" class="btn bg-info btn-round">
More Info
</a>
</div>
</div>
</div>
{{ end }}
{{ end }}
</div>
<p><iframe width="640" height="360" src="{{.Params.videolink}}" allowfullscreen frameborder="0"></iframe></p>
</div>
{{ end }}
\ No newline at end of file
......@@ -204,28 +204,20 @@ unsafe= true
parent = "shop"
[[menu.main]]
name = "Hardware - InfinityBook"
url = "https://www.tuxedocomputers.com/en/Linux-Hardware/Linux-Notebooks/15-16-inch/Manjaro-InfinityBook-Pro-15.tuxedo"
name = "Manjaro Hardware"
url = "/hardware"
pre = "<i class='fas fa-laptop'></i>"
weight = 3
weight = 4
parent = "shop"
[[menu.main]]
name = "Hardware - Notebooks & PCs"
name = "UbuntoShop Hardware"
url = "https://www.ubuntushop.be/index.php/en/opensource-notebooks/manjaro-notebooks.html"
pre = "<i class='fas fa-desktop'></i>"
weight = 5
parent = "shop"
# [[menu.main]]
# name = "Hardware - Bladebook"
# url = "/hardware-bladebook"
# pre = ""
# weight = 4
# parent = "shop"
#
# --- End SubMenu Shop ---
#
......
+++
class= "hardware"
title = "bladebook"
description = "Bladebook with pre-installed Manjaro from Denmark by our partner shop to most countries within the EU."
subtitle = "Bladebook (Spring 2019 Edition)"
subdescription = "Netbook with Manjaro pre-installed"
pricebefore = "Starting from"
price = "€359,00"
pricetax = "Prices incl. all taxes and duties within the EU"
datasheet = "Data sheet"
datasheetcontent = [
"CPU",
"Quad core Intel® J3455 (1.5GHz, 2.3GHz Turboboost)",
"GPU",
"Intel® HD Graphics 500",
"RAM",
"6 GB - DDR3L",
"Storage",
"SSD 256GB M.2 2242",
"Display",
"FHD 1920 x 1080 (16:9)",
"Keyboard",
"US QWERTY",
"Battery",
"7.4V 5000mAh*2. Up to 8h battery life",
"Wireless",
"Bluetooth 4.0 - WIFI 802.11 b/g/n",
"Webcam",
"2 MP",
"Extensions",
"Mini HDMI, 2x USB3, Headphone/Mic, TF Cardreader",
"Dimension",
"31.5cm x 20.8cm x 1.35cm",
"Weight",
"1.2 kg"]
type = "hardware"
background = "/img/bg9.jpg"
images = ["bladebook-1", "bladebook-2", "bladebook-3"]
blockquote = "The Manjaro guys have optimized the KDE Edition to fly on the Bladebook!"
blockquotewriter = "-Lisa McCoy"
videolink = "https://www.youtube-nocookie.com/embed/rHL-wXSb7SA"
+++
Our **Bladebook** is a 13.3" Intel Quad Core 1.3 kg light-weight Laptop optimized for Manjaro Linux, featuring the Intel® Celeron® Processor J3455 (Apollo Lake) with a burst frequency up to 2.30 GHz. It comes with 6 GB DDR3L and a built-in 256 GB SSD. This results in a 20% to 30% stronger CPU performance than with the original spec we had back in Fall 2018. We changed the screen to an IPS panel with 1920x1080 resolution and upped the WIFI to a dual frequency 2.4G + 5G band.
For simplicity we have a full size keyboard in US QWERTY layout, with 15mm large keycap, 1.8mm keypitch and 30% touchpad area, which results in a seamless island type keyboard. On the connection front we have a headphone/mic 2-in-1, 2x USB 3.0 slots, SDHC cardslot and mini HDMI connector.
We will ship the **Bladebook** with pre-installed Manjaro from Denmark by our partner shop to most countries within the EU. To get more information about the bladebook please [mail us](mailto:info-bladebook@manjaro.org) or visit the [FCS shop](https://linux-aarhus.dk/en/vare/manjaro-bladebook/).
\ No newline at end of file
+++
class= "hardware"
title = "spitfire"
description = "Our first release of the Manjaro Special Edition Spitfire is a beauty!"
subtitle = "Spitfire (Spring 2018 Edition)"
subdescription = "Notebook with Manjaro XFCE pre-installed"
pricebefore = "Starting from"
price = "£999"
pricetax = "Prices incl. all taxes and duties within the EU"
datasheet = "Data sheet (Stock Config)"
datasheetcontent = [
"CPU",
"Intel i3-8130U",
"GPU",
"Intel® HD Graphics 620",
"RAM",
"8 GB - DDR4",
"Storage",
"120 GB M.2 SSD",
"Display",
"FHD 1920 x 1080 (16:9)",
"Keyboard",
"UK Layout",
"Battery",
"32WH 11.4V 2790mAh",
"Wireless",
"Bluetooth 4.0 - WIFI 802.11 b/g/n",
"Webcam",
"1.0MP",
"Brand",
"Clevo",
"Dimension",
"329.8mm x 225mm x 17.8mm"]
type = "hardware"
background = "/img/bg8.jpg"
images = ["spitfire-1", "spitfire-2", "spitfire-3"]
blockquote = "The Manjaro guys have optimized the KDE Edition to fly on the Bladebook!"
blockquotewriter = "-Lisa McCoy"
videolink = "https://www.youtube-nocookie.com/embed/ha43-bh_h3U"
+++
Our third release of the Manjaro Special Edition Spitfire is a beauty - now with a 8th Generation Quad-Core Intel i5 or i7 Processors, 8GB RAM, and dual storage options with a lightening fast 120GB M.2 SSD as standard - as well as options for upgrades and use of a second HDD slot. The Manjaro Special Edition Spitfire is not just a mere pre-load of Manjaro software, put simply it is the ultimate marriage of hardware and software.
From intricate kernel tweaks, to streamlined settings, and even custom changes to battery, cpu, and sound settings - our Manjaro Special Edition Spitfire has now become the ULTIMATE Manjaro Machine.
We will ship the **Spitfire** with pre-installed Manjaro from England by our partner shop to most countries within the EU. To get more information about the Spitfire, please visit the [StationX Shop](https://stationx.rocks/collections/laptops/products/manjaro-special-edition-spitfire).
\ No newline at end of file
+++
type = "hardware"
class= "hardware"
title = "Hardware"
+++
+++
class= "hardware"
subtitle = "Tuxedo InfinityBook Pro 15"
subdescription = "Manjaro XFCE pre-installed"
pricebefore = "Starting from"
price = "1.099,00 EUR"
enable = "true"
pricetax = "Prices incl. all taxes and duties within the EU"
datasheet = "Data sheet"
buylink = "https://www.tuxedocomputers.com/en/Linux-Hardware/Linux-Notebooks/15-16-inch/Manjaro-InfinityBook-Pro-15.tuxedo#"
datasheetcontent = [
"CPU",
"Intel® i5 to i7",
"GPU",
"from 17.4.2020: Intel Core i5-10210U (4x 1.6-4.2GHz Quad-Core, 8 Threads, 6MB Cache, 15W TDP) or i7",
"RAM",
"from 8 GB 1x 8GB 2666Mhz to 64GB",
"Storage",
"250GB Samsung 860 EVO M.2 SATAIII to 2000GB",
"Display",
"13.3\"",
"Keyboard",
"backlit with Manjaro super-key",
"Ports",
"2x USB 3.1 Typ-A Gen1 up to 5Gbit/s, 1x USB Typ-C 3.1 Gen2 with Thunderbolt 3 incl. DisplayPort (max. 3840x2160@60Hz) and Charging-Function (USB Power-Delivery /USB-PD / DC-IN; Needs 19-20V charger) Additionally, external dedicated graphics cards (eGPU) are supported by the Thunderbolt 3 port! 1x MiniDisplayPort 1.3 (max.3840x2160@60Hz) 1x HDMI 1.4b with HDCP (max. 2560x1600@60Hz; 3840x2160@30Hz) 1x Headphones 1x Microphone 1x Gigabit-LAN-Port 1x Charging port 1x Card-Reader 1x Kensington",
"Dimension",
"45cm x 27cm x 7cm",
"Weight",
"2 kg",
"Battery",
"Large 54 Wh lithium-ion battery, 12H"]
type = "hardware"
images = ["Manjaro-InfinityBook-Pro-15"]
+++
+++
class= "hardware"
subtitle = "Tuxedo InfinityBook Pro 15"
subdescription = "Manjaro XFCE pre-installed"
pricebefore = "Starting from"
price = "1.099,00 EUR"
enable = "true"
pricetax = "Prices incl. all taxes and duties within the EU"
datasheet = "Data sheet"
buylink = "https://www.tuxedocomputers.com/en/Linux-Hardware/Linux-Notebooks/15-16-inch/Manjaro-InfinityBook-Pro-15.tuxedo#"
datasheetcontent = [
"CPU",
"Intel® i5 to i7",
"GPU",
"from 17.4.2020: Intel Core i5-10210U (4x 1.6-4.2GHz Quad-Core, 8 Threads, 6MB Cache, 15W TDP) or i7",
"RAM",
"from 8 GB 1x 8GB 2666Mhz to 64GB",
"Storage",
"250GB Samsung 860 EVO M.2 SATAIII to 2000GB",
"Display",
"13.3\"",
"Keyboard",
"backlit with Manjaro super-key",
"Ports",
"2x USB 3.1 Typ-A Gen1 up to 5Gbit/s, 1x USB Typ-C 3.1 Gen2 with Thunderbolt 3 incl. DisplayPort (max. 3840x2160@60Hz) and Charging-Function (USB Power-Delivery /USB-PD / DC-IN; Needs 19-20V charger) Additionally, external dedicated graphics cards (eGPU) are supported by the Thunderbolt 3 port! 1x MiniDisplayPort 1.3 (max.3840x2160@60Hz) 1x HDMI 1.4b with HDCP (max. 2560x1600@60Hz; 3840x2160@30Hz) 1x Headphones 1x Microphone 1x Gigabit-LAN-Port 1x Charging port 1x Card-Reader 1x Kensington",
"Dimension",
"45cm x 27cm x 7cm",
"Weight",
"2 kg",
"Battery",
"Large 54 Wh lithium-ion battery, 12H"]
type = "hardware"
images = ["Manjaro-InfinityBook-Pro-15"]
+++
+++
class= "hardware"
subtitle = "Tuxedo InfinityBook Pro 15"
subdescription = "Manjaro XFCE pre-installed"
pricebefore = "Starting from"
price = "1.099,00 EUR"
enable = "true"
pricetax = "Prices incl. all taxes and duties within the EU"
datasheet = "Data sheet"
buylink = "https://www.tuxedocomputers.com/en/Linux-Hardware/Linux-Notebooks/15-16-inch/Manjaro-InfinityBook-Pro-15.tuxedo#"
datasheetcontent = [
"CPU",
"Intel® i5 to i7",
"GPU",
"from 17.4.2020: Intel Core i5-10210U (4x 1.6-4.2GHz Quad-Core, 8 Threads, 6MB Cache, 15W TDP) or i7",
"RAM",
"from 8 GB 1x 8GB 2666Mhz to 64GB",
"Storage",
"250GB Samsung 860 EVO M.2 SATAIII to 2000GB",
"Display",
"13.3\"",
"Keyboard",
"backlit with Manjaro super-key",
"Ports",
"2x USB 3.1 Typ-A Gen1 up to 5Gbit/s, 1x USB Typ-C 3.1 Gen2 with Thunderbolt 3 incl. DisplayPort (max. 3840x2160@60Hz) and Charging-Function (USB Power-Delivery /USB-PD / DC-IN; Needs 19-20V charger) Additionally, external dedicated graphics cards (eGPU) are supported by the Thunderbolt 3 port! 1x MiniDisplayPort 1.3 (max.3840x2160@60Hz) 1x HDMI 1.4b with HDCP (max. 2560x1600@60Hz; 3840x2160@30Hz) 1x Headphones 1x Microphone 1x Gigabit-LAN-Port 1x Charging port 1x Card-Reader 1x Kensington",
"Dimension",
"45cm x 27cm x 7cm",
"Weight",
"2 kg",
"Battery",
"Large 54 Wh lithium-ion battery, 12H"]
type = "hardware"
images = ["Manjaro-InfinityBook-Pro-15"]
+++
+++
class= "hardware"
subtitle = "Tuxedo InfinityBook Pro 15"
subdescription = "Manjaro XFCE pre-installed"
pricebefore = "Starting from"
price = "1.099,00 EUR"
enable = "true"
pricetax = "Prices incl. all taxes and duties within the EU"
datasheet = "Data sheet"
buylink = "https://www.tuxedocomputers.com/en/Linux-Hardware/Linux-Notebooks/15-16-inch/Manjaro-InfinityBook-Pro-15.tuxedo#"
datasheetcontent = [
"CPU",
"Intel® i5 to i7",
"GPU",
"from 17.4.2020: Intel Core i5-10210U (4x 1.6-4.2GHz Quad-Core, 8 Threads, 6MB Cache, 15W TDP) or i7",
"RAM",
"from 8 GB 1x 8GB 2666Mhz to 64GB",
"Storage",
"250GB Samsung 860 EVO M.2 SATAIII to 2000GB",
"Display",
"13.3\"",
"Keyboard",
"backlit with Manjaro super-key",
"Ports",
"2x USB 3.1 Typ-A Gen1 up to 5Gbit/s, 1x USB Typ-C 3.1 Gen2 with Thunderbolt 3 incl. DisplayPort (max. 3840x2160@60Hz) and Charging-Function (USB Power-Delivery /USB-PD / DC-IN; Needs 19-20V charger) Additionally, external dedicated graphics cards (eGPU) are supported by the Thunderbolt 3 port! 1x MiniDisplayPort 1.3 (max.3840x2160@60Hz) 1x HDMI 1.4b with HDCP (max. 2560x1600@60Hz; 3840x2160@30Hz) 1x Headphones 1x Microphone 1x Gigabit-LAN-Port 1x Charging port 1x Card-Reader 1x Kensington",
"Dimension",
"45cm x 27cm x 7cm",
"Weight",
"2 kg",
"Battery",
"Large 54 Wh lithium-ion battery, 12H"]
type = "hardware"
images = ["Manjaro-InfinityBook-Pro-15"]
+++
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment