Skip to content

GitLab

manjaro.org
manjaro.org
Commit 7cce8a8f authored by Vitor Lopes's avatar Vitor Lopes
Browse files
Options

add intro, fixes and ajustments

parent c171a6da
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 126 deletions
assets/sass/style.scss
View file @ 7cce8a8f
......@@ -308,6 +308,10 @@ p,
margin-bottom: 0px;
}
.main {
overflow: hidden;
}
h3 {
font-size: .8rem;
font-weight: 900 !important;
......@@ -315,16 +319,25 @@ p,
color: #1e88e5;
}
h4 {
margin-top: 0;
text-align: left;
}
.intro {
padding: 20px 10px;
}
h1:before {
display: none;
}
.jumbotron {
background-color: white;
margin-top: 200px;
margin-bottom: -48px;
margin-top: 100px;
margin-bottom: 120px;
padding: 1.5rem 2rem;
border-radius: 40px;
border-radius: 0;
.logo {
float: left;
......@@ -337,6 +350,10 @@ p,
color: #343a40;
font-weight: bold !important;
}
p:last-child {
margin-bottom: 0;
}
}
.page-header {
......@@ -361,10 +378,6 @@ p,
margin-bottom: 350px;
}
.col-12.text-center:last-child {
margin-bottom: -70px;
}
h1.title::first-letter {
color: $green;
}
......@@ -414,6 +427,8 @@ p,
background-position: center;
background-repeat: no-repeat;
background-size: cover;
padding-bottom: 0;
padding: 62px 0;
}
}
......
layouts/hardware/baseof.html
View file @ 7cce8a8f
......@@ -7,7 +7,7 @@
<div class="{{ .Params.section | default "section"}} d-flex justify-content-center">
<div class="main">
<div class="main container">
{{ block "body" . }}
{{ end }}
......
layouts/hardware/single.html
View file @ 7cce8a8f
......@@ -2,10 +2,11 @@
{{ end }}
{{ define "body" }}
<div class="jumbotron container">
<div class="jumbotron">
<img class="logo" src="/img/logo.svg">
<div><h1 class="display-4">Buy hardware with Manjaro.</h1>
<p class="lead">Laptops with Manjaro pre-installed that you can get right now.</p>
<h2 class="lead">Laptops with Manjaro pre-installed that you can get right now.</h2>
<p>We have partnered with manufacturers to design Manjaro dedicated hardware.</p>
</div>
</div>
......
layouts/partials/hardware.html
View file @ 7cce8a8f
{{ if eq .Type "hardware" }}
<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-12 text-center">
<div class="container">
<div class="row">
{{ range $index, $element := .Params.images}}
<div class="col-sm-12 col-lg-6"><img class="d-block" src="/img/hardware/{{ $element }}.png"
alt="{{ $index }} slide">
<div class="row">
{{ range $main_index, $main_element := (where .Site.Pages ".Type" "hardware") }}
{{ if and (isset .Params "datasheetcontent") (eq .Params.enable "true") }}
<div class="col-12 text-center">
<div class="container">
<div class="row">
<div class="col-sm-12 col-lg-6">
<div class="intro">
<h4>{{ .Params.name }}</h4>
<p>{{ .Params.intro }}</p>
<img class="d-block" src="/img/hardware/{{ .Params.image }}.png">
</div>
</div>
<div class="col-sm-12 col-lg-6">
<div class="card-body text-left">
<div class=card-header>
<h2 class="card-subtitle text-dark">{{.Params.model}}</h2>
<div class="card-title text-danger">{{.Params.pricebefore}} {{.Params.price}}</div>
</div>
{{ end }}
<div class="col-sm-12 col-lg-6">
<div class="card-body text-left">
<div class=card-header>
<h2 class="card-subtitle text-dark">{{.Params.subtitle}}</h2>
<div class="card-title text-danger">
{{.Params.price}}</div>
</div>
<div class="card-footer">
{{ range $index, $element := .Params.datasheetcontent}}
{{if (modBool $index 2)}}
<h3><b>{{$element}}</b></h3>
{{else}}
<span>{{$element}}</span><br>
{{ end }}
{{ end }}
<a href="{{.Params.buylink}}" target="_blank" class="btn bg-info">
Where to buy
</a>
</div>
<div class="card-footer">
{{ range $index, $element := .Params.datasheetcontent}}
{{if (modBool $index 2)}}
<h3><b>{{$element}}</b></h3>
{{else}}
<span>{{$element}}</span><br>
{{ end }}
{{ end }}
<a href="{{.Params.buylink}}" target="_blank" class="btn bg-info">
Where to buy
</a>
</div>
</div>
</div>
</div>
</div>
{{ end }}
{{ end }}
</div>
{{ end }}
{{ end }}
</div>
{{ end }}
\ No newline at end of file
site/content/_index.md
View file @ 7cce8a8f
......@@ -2,7 +2,7 @@
class = "landing-page"
background = "/img/bg10.jpg"
title = "FREE OPERATING SYSTEM FOR EVERYONE"
whatIsManjaro = "Manjaro is a professionally made Linux based operating system that is a suitable replacement for Windows or MacOS. Multiple Desktop Environments are available through our Official and Community editions. We also work with manufacturers to design dedicated hardware. Visit the shop for more information."
whatIsManjaro = "Manjaro is a professionally made Linux based operating system that is a suitable replacement for Windows or MacOS. Multiple Desktop Environments are available through our Official and Community editions."
description = "description of the page for search engine meta tags"
facebook = "https://www.facebook.com/ManjaroLinux"
twitter = "https://twitter.com/ManjaroLinux"
......
site/content/laptops/Manjaro-InfinityBook-Pro-15 (another copy).md deleted 100644 → 0
View file @ c171a6da
+++
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"]
+++
site/content/laptops/Manjaro-InfinityBook-Pro-15 (copy).md
View file @ 7cce8a8f
+++
class= "hardware"
subtitle = "Tuxedo InfinityBook Pro 15"
model = "InfinityBook Pro 15"
subdescription = "Manjaro XFCE pre-installed"
pricebefore = "Starting from"
pricebefore = "From "
price = "1.099,00 EUR"
enable = "true"
pricetax = "Prices incl. all taxes and duties within the EU"
datasheet = "Data sheet"
name = "Tuxedo Intro"
intro = "We've partnered with computer manufacturers to provide the best Zorin OS experience out of the box.Every purchase helps contribute to the Zorin OS project."
type = "hardware"
image = "Manjaro-InfinityBook-Pro-15"
buylink = "https://www.tuxedocomputers.com/en/Linux-Hardware/Linux-Notebooks/15-16-inch/Manjaro-InfinityBook-Pro-15.tuxedo#"
datasheetcontent = [
"CPU",
......@@ -28,8 +30,7 @@ datasheetcontent = [
"Weight",
"2 kg",
"Battery",
"Large 54 Wh lithium-ion battery, 12H"]
type = "hardware"
images = ["Manjaro-InfinityBook-Pro-15"]
"Large 54 Wh lithium-ion battery, 12H"
]
+++
site/content/laptops/Manjaro-InfinityBook-Pro-15.md
View file @ 7cce8a8f
+++
class= "hardware"
subtitle = "Tuxedo InfinityBook Pro 15"
model = "InfinityBook Pro 15"
subdescription = "Manjaro XFCE pre-installed"
pricebefore = "Starting from"
pricebefore = "From "
price = "1.099,00 EUR"
enable = "true"
pricetax = "Prices incl. all taxes and duties within the EU"
datasheet = "Data sheet"
name = "Tuxedo Intro"
intro = "We've partnered with computer manufacturers to provide the best Zorin OS experience out of the box.Every purchase helps contribute to the Zorin OS project."
type = "hardware"
image = "Manjaro-InfinityBook-Pro-15"
buylink = "https://www.tuxedocomputers.com/en/Linux-Hardware/Linux-Notebooks/15-16-inch/Manjaro-InfinityBook-Pro-15.tuxedo#"
datasheetcontent = [
"CPU",
......@@ -28,8 +30,7 @@ datasheetcontent = [
"Weight",
"2 kg",
"Battery",
"Large 54 Wh lithium-ion battery, 12H"]
type = "hardware"
images = ["Manjaro-InfinityBook-Pro-15"]
"Large 54 Wh lithium-ion battery, 12H"
]
+++
site/content/laptops/anjaro-InfinityBook-Pro-15.md deleted 100644 → 0
View file @ c171a6da
+++
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