Skip to content

GitLab

Verified Commit 2ffec5c6 authored by Levente Polyak's avatar Levente Polyak 🚀
Browse files

style: use central archlinux-common-style submodule

parent 2e6c2356
Hide whitespace changes
Inline Side-by-side
archlinux-common-style @ fe414724
Subproject commit fe41472481348017b99e31f205235cdcaa0d556f
.gitlab-ci.yml
View file @ 2ffec5c6
......@@ -2,7 +2,7 @@ image: "archlinux:latest"
dist:
script:
- pacman -Syu --needed --noconfirm yarn ruby-sass make
- pacman -Syu --needed --noconfirm yarn ruby-sass make git
- make
include:
......
.gitmodules 0 → 100644
View file @ 2ffec5c6
[submodule ".external/archlinux-common-style"]
path = .external/archlinux-common-style
url = ../archlinux-common-style
Makefile
View file @ 2ffec5c6
......@@ -33,7 +33,7 @@ dist: vendor
@mkdir -p "dist/${PACKAGE_NAME}-${VERSION}"
cp -avf public/index.html "dist/${PACKAGE_NAME}-${VERSION}/index.html"
# TODO: cache-invalidation with version string replaced in html file
cp -avf public/favicon.ico "dist/${PACKAGE_NAME}-${VERSION}/favicon.ico"
cp -Lvf public/favicon.ico public/*.svg -t "dist/${PACKAGE_NAME}-${VERSION}/"
$(SASS) -t compressed src/style.scss "dist/${PACKAGE_NAME}-${VERSION}/bundle.css"
$(YARN) run -s browserify -t babelify src/index.js | $(YARN) run -s terser --compress --mangle > "dist/${PACKAGE_NAME}-${VERSION}/bundle.js"
cd dist && tar --owner=0 --group=0 -czvf ${PACKAGE_NAME}-${VERSION}.tar.gz "${PACKAGE_NAME}-${VERSION}"
......@@ -42,12 +42,16 @@ dist: vendor
# Yarn
.PHONY: vendor
vendor: .yarninstall
vendor: submodule .yarninstall
.yarninstall: package.json
@$(YARN) install --silent
@touch $@
.PHONY:
submodule:
git submodule update --init --recursive
make -C .external/archlinux-common-style
.PHONY:
clean:
......
package.json
View file @ 2ffec5c6
......@@ -18,6 +18,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-collapsible": "^2.8.1",
"prop-types": "^15.5.8",
"terser": "^5.0.0"
},
"browserslist": "> 0.25%, not dead"
......
public/archlogo.8a05bc7f6cd1.svg deleted 100644 → 0
View file @ 2e6c2356
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
width="600"
height="126"
id="svg2424"
sodipodi:docname="archlogo.svg"
inkscape:version="0.92.1 r">
<metadata
id="metadata114">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1362"
inkscape:window-height="726"
id="namedview112"
showgrid="false"
inkscape:zoom="2.015"
inkscape:cx="335.62219"
inkscape:cy="55.090984"
inkscape:window-x="0"
inkscape:window-y="16"
inkscape:window-maximized="0"
inkscape:current-layer="g2424" />
<defs
id="defs2426">
<linearGradient
x1="112.49854"
y1="6.1372099"
x2="112.49853"
y2="129.3468"
id="path1082_2_"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(287,-83)">
<stop
id="stop193"
style="stop-color:#ffffff;stop-opacity:0"
offset="0" />
<stop
id="stop195"
style="stop-color:#ffffff;stop-opacity:0.27450982"
offset="1" />
<midPointStop
offset="0"
style="stop-color:#FFFFFF"
id="midPointStop197" />
<midPointStop
offset="0.5"
style="stop-color:#FFFFFF"
id="midPointStop199" />
<midPointStop
offset="1"
style="stop-color:#000000"
id="midPointStop201" />
</linearGradient>
<linearGradient
x1="541.33502"
y1="104.50665"
x2="606.91248"
y2="303.14029"
id="linearGradient2544"
xlink:href="#path1082_2_"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-0.3937741,0,0,0.393752,357.51969,122.00151)" />
<linearGradient
id="linearGradient3388">
<stop
id="stop3390"
style="stop-color:#000000;stop-opacity:0"
offset="0" />
<stop
id="stop3392"
style="stop-color:#000000;stop-opacity:0.37113401"
offset="1" />
</linearGradient>
<linearGradient
x1="490.72305"
y1="237.72447"
x2="490.72305"
y2="183.9644"
id="linearGradient4416"
xlink:href="#linearGradient3388"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.749107,0,0,0.749107,-35.459862,91.44108)" />
</defs>
<g
transform="matrix(0.7,0,0,0.7,-37.866513,-100.53407)"
id="layer1">
<g
transform="matrix(0.8746356,0,0,0.8746356,14.730518,23.408954)"
id="g2424">
<g
transform="matrix(1.0033516,0,0,1.0033516,-35.47395,-116.45699)"
id="g2809"
style="fill:#ffffff;fill-opacity:1">
<path
d="m 339.96875,309.09375 c -14.47141,-0.0239 -26.4812,2.94367 -31.125,4.5625 l -4.78125,25.8125 c -0.0116,0.0951 23.79543,-6.34855 34.28125,-5.96875 17.36158,0.62381 18.95948,6.63541 18.65625,14.75 0.29595,0.47462 -4.47933,-7.33192 -19.5,-7.59375 -18.94961,-0.32687 -45.69284,6.70947 -45.65625,35.3125 -0.51086,32.17412 24.03361,41.63882 40.75,41.8125 15.02821,-0.27364 22.0777,-5.69136 25.9375,-8.59375 5.07124,-5.30236 10.87308,-10.63447 16.40625,-17.03125 -5.23567,9.51278 -9.77472,16.0898 -14.5,21.125 v 4.25 l 22.84375,-3.84375 0.15625,-62.09375 c -0.23141,-8.78839 5.04123,-42.41827 -43.46875,-42.5 z m -3.28125,54.0625 c 9.46889,0.12995 20.32788,4.79708 20.34375,16.03125 0.049,10.21821 -12.80005,15.71183 -21.15625,15.625 -8.35976,-0.0868 -19.45093,-6.56982 -19.5,-16.53125 0.16016,-8.90444 10.45953,-15.35418 20.3125,-15.125 z"
id="path2284"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
d="m 398.50106,314.83145 -0.15505,102.82693 26.61213,-5.12724 0.0449,-58.30157 c 0.006,-8.68089 12.40554,-18.82451 27.9627,-18.66287 3.30202,-5.97408 9.5087,-21.24219 11.02088,-24.71514 -34.75649,-0.0833 -35.19897,9.98993 -41.24398,14.94517 -0.0631,-9.45285 -0.0213,-15.12741 -0.0213,-15.12741 l -24.2202,4.16213 z"
id="path2286"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
d="m 548.2688,328.33058 c -0.25696,-0.12068 -13.87938,-15.93419 -41.26638,-16.0589 -25.65249,-0.42638 -54.42578,9.51895 -54.88631,52.5328 0.22457,37.81852 27.6402,52.59809 55.0314,52.88627 29.31292,0.30451 40.97654,-18.32947 41.67615,-18.79124 -3.49762,-3.0321 -16.59792,-16.0131 -16.59792,-16.0131 0,0 -8.18236,11.65102 -24.05802,11.79913 -15.87942,0.1512 -29.68245,-12.27325 -29.87805,-29.60905 -0.20349,-17.33595 12.68881,-26.72821 29.99725,-27.48687 14.98466,-0.003 23.6297,9.67334 23.6297,9.67334 z"
id="path2288"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
d="m 581.8125,278.84375 -25.125,5.90625 0.1875,133.9375 24.75,-4.46875 0.28125,-63.03125 c 0.0529,-6.60927 9.56127,-16.75916 25.4375,-16.4375 15.17973,0.15775 18.57236,10.11767 18.53125,11.375 l 0.4375,72.96875 24.40625,-4.3125 0.0937,-77.375 c 0.1607,-7.44539 -16.30833,-23.16954 -42.78125,-23.28125 -12.58087,0.0202 -19.54815,2.86825 -23.09375,4.96875 -6.06656,4.68565 -12.9998,9.17543 -19.8125,14.90625 6.29809,-8.09099 11.58551,-13.68516 16.75,-17.84375 l -0.0625,-37.3125 z"
id="path2290"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
</g>
<g
transform="matrix(1.4854426,0,0.02102071,1.4854426,24.809906,-769.96118)"
id="g5326"
style="fill:#1793d1;fill-opacity:1;stroke:none">
<path
d="m 400.67581,629.79609 7.68167,-1.91575 -0.92851,91.20792 -7.79574,1.32426 z"
id="path2292"
style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
d="m 421.10266,657.01757 6.75064,-2.9867 -0.86808,65.39931 -6.49779,1.33915 z m -1.26059,-23.58316 5.47167,-4.41533 4.42261,4.99952 -5.47558,4.53221 z"
id="path2294"
style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
d="m 440.44273,655.82614 7.67755,-1.56201 -0.1573,13.6722 c -0.007,0.58717 4.4194,-15.27364 24.68502,-14.92094 19.67986,0.10952 22.68401,15.34634 22.5291,18.76237 l -0.43759,48.0783 -6.73044,1.45631 0.63316,-47.489 c 0.0974,-1.38684 -2.88144,-13.11441 -16.78906,-13.15754 -13.90509,-0.0404 -23.68364,10.10048 -23.75821,16.57937 l -0.48127,41.83477 -7.80388,2.0313 z"
id="path2296"
style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
d="m 561.53301,720.20203 -7.6776,1.56186 0.15737,-13.67198 c 0.007,-0.58742 -4.42201,15.27361 -24.68504,14.92086 -19.67983,-0.10944 -22.68399,-15.34626 -22.52908,-18.76229 l 0.43757,-48.07861 8.15674,-1.64226 -0.54644,47.48988 c -0.0149,1.29682 1.36845,13.29979 15.27604,13.3426 13.90511,0.0405 23.76622,-8.37359 24.01453,-21.04416 l 0.43105,-37.46902 7.5978,-1.93195 z"
id="path2298"
style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
d="m 577.45461,655.28678 -5.42715,4.20017 20.19894,26.93328 -22.39092,31.11622 5.63499,4.226 21.04365,-28.8967 20.8779,29.58159 5.32727,-4.20103 -22.37578,-31.62866 18.56963,-25.5775 -5.53193,-4.73429 -16.92109,23.66778 z"
id="path2300"
style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
</g>
<path
d="m 146.07667,140.34607 c -8.79537,21.56391 -14.10032,35.66923 -23.89281,56.59215 6.00403,6.36425 13.37368,13.77576 25.34198,22.14636 -12.8671,-5.29474 -21.64403,-10.61053 -28.20317,-16.12673 -12.53252,26.15105 -32.167383,63.40203 -72.012843,134.99623 31.317194,-18.07996 55.593723,-29.22646 78.218283,-33.47965 -0.97151,-4.17845 -1.52386,-8.69825 -1.48634,-13.41417 l 0.0372,-1.00328 c 0.49693,-20.06409 10.93425,-35.49338 23.29826,-34.44576 12.36403,1.04761 21.97445,18.17182 21.47753,38.23591 -0.0935,3.77544 -0.51932,7.40735 -1.26338,10.77593 22.37891,4.37771 46.39587,15.49567 77.28933,33.33102 -6.0916,-11.21503 -11.52886,-21.32458 -16.72125,-30.9529 -8.17886,-6.33916 -16.70983,-14.58961 -34.11135,-23.52122 11.9608,3.10792 20.52459,6.69363 27.1999,10.7016 -52.79254,-98.29043 -57.0676,-111.3512 -75.17132,-153.83549 z"
id="path2518"
style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.18906665"
inkscape:connector-curvature="0" />
<g
id="text2634"
style="font-style:normal;font-weight:normal;font-size:8.44138241px;font-family:'DejaVu Sans Mono';fill:#808080;fill-opacity:1;stroke:none"
transform="matrix(3.8808,0,0,3.8808,-1673.0935,-734.12067)">
<path
d="m 685.46692,263.83624 v -5.32944 h -1.99082 v -0.71307 h 4.7895 v 0.71307 h -1.99906 v 5.32944 h -0.79962"
id="path3660"
style="fill:#808080;fill-opacity:1"
inkscape:connector-curvature="0" />
<path
d="m 689.0982,263.83624 v -6.04251 h 1.20355 l 1.43026,4.2784 c 0.13189,0.39843 0.22806,0.69658 0.28852,0.89442 0.0687,-0.21983 0.17586,-0.5427 0.3215,-0.96862 l 1.44674,-4.2042 h 1.07578 v 6.04251 h -0.77077 v -5.05741 l -1.75587,5.05741 h -0.72131 l -1.74763,-5.14396 v 5.14396 h -0.77077"
id="path3662"
style="fill:#808080;fill-opacity:1"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</svg>
public/archlogo.8a05bc7f6cd1.svg 0 → 120000
View file @ 2ffec5c6
../.external/archlinux-common-style/img/archlogo.8a05bc7f6cd1.svg
\ No newline at end of file
public/favicon.ico 0 → 120000
View file @ 2ffec5c6
../.external/archlinux-common-style/img/favicon.ico
\ No newline at end of file
src/Header.js
View file @ 2ffec5c6
'use strict';
const React = require('react');
import ArchLinuxNavbar from './navbar';
class Header extends React.Component {
......@@ -41,21 +42,7 @@ class Header extends React.Component {
return (
<section className="hero is-primary">
<div id="archnavbar">
<div id="logo"><a href="https://archlinux.org" title="Return to the main page">Arch Linux</a></div>
<div id="archnavbarmenu">
<ul id="archnavbarlist">
<li id="anb-home"><a href="https://archlinux.org" title="Arch news, packages, projects and more">Home</a></li>
<li id="anb-packages"><a href="https://archlinux.org/packages/" title="Arch Package Database">Packages</a></li>
<li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
<li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
<li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and track bugs">Bugs</a></li>
<li id="anb-security"><a href="https://security.archlinux.org/" title="Arch Linux Security Tracker">Security</a></li>
<li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>
<li id="anb-download"><a href="https://archlinux.org/download/" title="Get Arch Linux">Download</a></li>
</ul>
</div>
</div>
<ArchLinuxNavbar />
<div className="hero-body">
<div id="status">
<h1 className="title">Reproducible status</h1>
......@@ -64,10 +51,10 @@ class Header extends React.Component {
<br/>
<ul className="repo-summary">
{!fetchFailed && suites.length > 0 &&
<li key="overall">Arch Linux is <span className="bold">{ overallStats.percentage }%</span> reproducible with <span className="bad bold">{ overallStats.bad } bad</span> <span className="unknown bold">{ overallStats.unknown } unknown</span> and <span className="good bold">{ overallStats.good } good</span> packages.</li>
<li key="overall">Arch Linux is <span className="has-text-weight-bold">{ overallStats.percentage }%</span> reproducible with <span className="bad has-text-weight-bold">{ overallStats.bad } bad</span> <span className="unknown has-text-weight-bold">{ overallStats.unknown } unknown</span> and <span className="good has-text-weight-bold">{ overallStats.good } good</span> packages.</li>
}
{!fetchFailed && suitesStats.map(function(repo, index) {
return <li key={ index }><a href={"#" + repo.name }>[{ repo.name }]</a> repository is <span className="bold">{ repo.percentage }%</span> reproducible with <span className="bad bold">{ repo.bad } bad</span> <span className="unknown bold">{ repo.unknown } unknown</span> and <span className="good bold">{ repo.good } good</span> packages.</li>;
return <li key={ index }><a href={"#" + repo.name }>[{ repo.name }]</a> repository is <span className="has-text-weight-bold">{ repo.percentage }%</span> reproducible with <span className="bad has-text-weight-bold">{ repo.bad } bad</span> <span className="unknown has-text-weight-bold">{ repo.unknown } unknown</span> and <span className="good has-text-weight-bold">{ repo.good } good</span> packages.</li>;
})}
</ul>
</div>
......
src/navbar.js 0 → 120000
View file @ 2ffec5c6
../.external/archlinux-common-style/jsx/navbar.js
\ No newline at end of file
src/style.scss
View file @ 2ffec5c6
@charset "utf-8";
$primary: #f6f9fc;
$link: #07b;
$hero-body-padding: 1.5rem 2rem;
$box-padding: 5px 10px 10px 10px;
$good: rgb(0, 128, 0);
$bad: rgb(207, 0, 0);
$unknown: rgb(255, 164, 5);
@import "../.external/archlinux-common-style/sass/archlinux.scss";
@import "../node_modules/bulma/sass/utilities/_all.sass";
@import "../node_modules/bulma/sass/helpers/_all.sass";
......@@ -18,100 +16,31 @@ $unknown: rgb(255, 164, 5);
@import "../node_modules/bulma/sass/layout/section.sass";
@import "../node_modules/bulma/sass/grid/tiles.sass";
#archnavbar {
background: #333 none repeat scroll 0 0 !important;
border-bottom: 5px solid #08c !important;
min-height: 40px !important;
padding: 10px 15px !important;
#logo {
background: rgba(0, 0, 0, 0) url("archlogo.8a05bc7f6cd1.svg") no-repeat scroll 0 0 !important;
background-size: 100% !important;
height: 40px !important;
margin: 0 !important;
padding: 0 !important;
width: 190px !important;
float: left !important;
& a {
display: block !important;
height: 40px !important;
width: 190px !important;
text-indent: -9999px !important;
}
}
& #archnavbarlist li a {
color: #999;
font-weight: bold;
text-decoration: none;
}
& ul {
display: block;
list-style: none;
margin: 0;
padding: 0;
text-align: right;
font-size: 0;
letter-spacing: 0;
& li {
display: inline-block;
font-size: 14px;
font-family: sans-serif !important;
line-height: 1.4;
letter-spacing: 0;
padding-top: 14px;
padding-right: 15px;
padding-left: 15px;
margin: 0;
& a:hover {
color: white !important;
text-decoration: underline !important;
}
}
}
}
html, body, .footer {
background-color: $primary;
}
a:hover {
text-decoration: underline;
}
.has-background-info {
background-color: #e4eeff !important;
}
.bold {
font-weight: bold;
}
.good {
color: $good;
color: $archlinux-color-green;
& .subtitle:before, & .Collapsible__trigger {
color: $good;
color: $archlinux-color-green;
}
}
.bad {
color: $bad;
color: $archlinux-color-red;
& .subtitle:before, & .Collapsible__trigger {
color: $bad;
color: $archlinux-color-red;
}
}
.unknown {
color: $unknown;
color: $archlinux-color-orange;
& .subtitle:before, & .Collapsible__trigger {
color: $unknown;
color: $archlinux-color-orange;
}
}
......@@ -134,10 +63,6 @@ a:hover {
}
}
.box {
padding: 5px 10px 10px 10px;
}
.repo-summary li:nth-child(2) {
padding-top: 0.5rem;
}
......@@ -150,8 +75,6 @@ a:hover {
.Collapsible__contentInner {
margin-left: 1rem;
border: 1px black;
color: black;
}
.Collapsible__trigger {
......@@ -187,11 +110,3 @@ a:hover {
}
}
}
.hero-body {
padding: 1.5rem 2rem;
}
.footer {
padding: 1rem 1.5rem 1rem !important;
}
yarn.lock
View file @ 2ffec5c6
......@@ -2936,7 +2936,7 @@ process@~0.11.0:
resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
prop-types@^15.6.2:
prop-types@^15.5.8, prop-types@^15.6.2:
version "15.7.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
......
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