Commit 99c5c9ba authored by Allan Blanchard's avatar Allan Blanchard
Browse files

Merge branch 'refacto' into 'master'

Creates a CSS for tiles and removes old stuff

See merge request pub.frama-c.com!44
parents 97c212d4 d0e5c7bd
- name: Using Frama-C
link: /html/using-frama-c.html
#- name: Using Frama-C
# link: /html/using-frama-c.html
# id : using
- name: Features
link: /html/kernel-plugin.html
id : features
- name: Documentation
link: /html/documentation.html
id : documentation
- name: Blog
link: /blog/index.html
# - name: Careers
# link: /html/careers.html
id : blog
#- name: Careers
# link: /html/careers.html
# id : careers
- name: Contact
link: /html/contact.html
id : contact
......@@ -10,7 +10,7 @@ additional:
short: "ACSL by Example"
link: https://fraunhoferfokus.github.io/acsl-by-example
- name: "Introduction to C program proof with Frama-C and WP, by Allan Blanchard"
short: "Tutorial on Frama-C and WP"
short: "Tutorial on Frama-C/WP"
link: https://github.com/AllanBlanchard/tutoriel_wp
---
......
......@@ -33,7 +33,7 @@ releases:
- name: WP manual
link: /download/wp-manual-Magnesium-20151002.pdf
- name: External Plug-ins
file:
files:
- name: E-ACSL version 0.6
link: /download/e-acsl/e-acsl-0.6.tar.gz
---
\ No newline at end of file
......@@ -33,7 +33,7 @@ releases:
- name: WP 0.8 manual
link: /download/wp-manual-Neon-20140301.pdf
- name: External Plug-ins
file:
files:
- name: E-ACSL version 0.4.1
link: /download/e-acsl/e-acsl-0.4.1.tar.gz
---
\ No newline at end of file
......@@ -6,7 +6,7 @@ releases:
- number: 0
changelog: 20111001
categories:
- name: Frama-C v18.0 Argon
- name: Frama-C v7.0 Nitrogen
files:
- name: Source distribution
link: /download/frama-c-Nitrogen-20111001.tar.gz
......
......@@ -33,7 +33,7 @@ releases:
- name: WP manual
link: /download/wp-manual-Silicon-20161101.pdf
- name: External Plug-ins
file:
files:
- name: E-ACSL version 0.8
link: /download/e-acsl/e-acsl-0.8.tar.gz
---
\ No newline at end of file
......@@ -33,7 +33,7 @@ releases:
- name: WP manual
link: /download/wp-manual-Sodium-20150201.pdf
- name: External Plug-ins
file:
files:
- name: E-ACSL version 0.5
link: /download/e-acsl/e-acsl-0.5.tar.gz
---
\ No newline at end of file
......@@ -2,13 +2,13 @@
<div id="header_iv_point" class="inviewTop"></div>
<span class="brandLogo"><a href="/index.html" rel="home" title=
"Frama-C"><img src="/assets/img/framac.gif" alt=""><span>Frama-C</span></a></span><a role="button" id=
"menu_toggle" class="menuToggle"><span class="open"><i></i><i></i><i></i></span><span class="close"><i></i><i></i></span></a>
"menu_toggle" class="menuToggle"><span class="open" onclick="openMenu()"><i></i><i></i><i></i></span><span class="close" onclick="closeMenu()"><i></i><i></i></span></a>
<nav id="menu" role="navigation">
<div class="menu-primary-meny-container">
<ul id="menu-primary-meny" class="menu">
{% for item in site.data.nav %}
{% if forloop.index == include.header %}
{% if item.id == include.header %}
<li class="menu-item menu-item-type-post_type menu-item-object-page current-menu-item page_item current_page_item">
{% else %}
<li class="menu-item menu-item-type-post_type menu-item-object-page">
......@@ -22,3 +22,15 @@
"icon icon-curly-left"></i><i class="icon icon-download-arrow"></i><i class="icon icon-curly-right"></i></span></a>
</nav>
</header>
<script>
function openMenu(){
var x = document.getElementById("site_header");
x.classList.add("menuOpen");
}
function closeMenu(){
var x = document.getElementById("site_header");
x.classList.remove("menuOpen");
}
</script>
\ No newline at end of file
......@@ -7,7 +7,7 @@ css: blog
<div id="wrapper" class="hfeed">
<!-- TODO after new website is online: uncomment below and comment after
{% include headers.html header=4 title=Blog %}
{% include headers.html header="blog" title=Blog %}
-->
{% include blog-headers-standalone.html %}
......
......@@ -6,7 +6,7 @@ css: wiki
<body class="page-template page-template-page-kernel page-template-page-kernel-php page nonTouch">
<div id="wrapper" class="hfeed">
{% include headers.html header=3 %}
{% include headers.html header="documentation" %}
<div id="container" class="mainContainer">
<div class="defaultPage wikiPage pages textLeft" id="content" role="main">
......
......@@ -17,6 +17,8 @@
<link rel="stylesheet" href="/assets/css/default.css">
<link rel="stylesheet" href="/assets/css/blog.css">
<link rel="stylesheet" href="/assets/css/documentation.css">
<link rel="stylesheet" href="/assets/css/tiles.css">
<link rel="stylesheet" href="/assets/css/swiper.css">
{% if layout.css !=null %}
<link rel="stylesheet" href="/assets/css/{{ layout.css }}.css">
{% endif %}
......@@ -24,18 +26,10 @@
<link rel="stylesheet" href="/assets/css/{{ page.css }}.css">
{% endif %}
<link rel="shortcut icon" href="/assets/img/favicon.ico" type="image/x-icon">
</head>
{{ content }}
<script type='text/javascript' src='/assets/js/manifest.js'></script>
<script type='text/javascript' src='/assets/js/lib.js'></script>
<script type='text/javascript'>
var ajax = {"url":"http:\/\/localhost:8000\/wp\/wp-admin\/admin-ajax.php","ajax_var":{"template_directory_uri":"http:\/\/localhost:8000\/app\/themes\/frama"},"apikey":"AIzaSyDwKjbfd43-rY5muMW76XUdAFMb7mL9kU8","nonce":"eb10361e5c"};
</script>
<script type='text/javascript' src='/assets/js/main.js'></script>
</head>
{{ content }}
</body>
</html>
......@@ -8,7 +8,7 @@ title: Kernel & Plugins - Frama-C
<div id="wrapper" class="hfeed">
{% include headers.html header=2 %}
{% include headers.html header="features" %}
<div id="container" class="mainContainer">
<div class="tabs">
......
......@@ -6,7 +6,7 @@ css: plugin
<body class="page-template page-template-page-kernel page-template-page-kernel-php page nonTouch">
<div id="wrapper" class="hfeed">
{% include headers.html header=2 %}
{% include headers.html header="features" %}
<div id="container" class="mainContainer">
<div class="tabs">
......
......@@ -5,7 +5,7 @@ layout: default
<div id="wrapper" class="hfeed">
<!-- TODO after new website is online: uncomment below
{% include headers.html header=4 title=Blog %}
{% include headers.html header="blog" title=Blog %}
-->
<div id="container" class="mainContainer">
......
......@@ -2,49 +2,6 @@
/* Colors */
/* Global Media Queries */
/* Direction */
.documentDetail .bgTextbig,
.pageDocumentation .bgTextbig {
left: 0;
transform: translate(0, -50%);
}
@media (min-width: 768px) {
.documentDetail .bgTextbig,
.pageDocumentation .bgTextbig {
font-size: 170px;
}
}
@media (min-width: 1024px) {
.documentDetail .bgTextbig,
.pageDocumentation .bgTextbig {
font-size: 220px;
}
}
@media (min-width: 1280px) {
.documentDetail .bgTextbig,
.pageDocumentation .bgTextbig {
font-size: 280px;
}
}
@media (min-width: 1600px) {
.documentDetail .bgTextbig,
.pageDocumentation .bgTextbig {
font-size: 300px;
}
}
.documentDetail {
padding-top: 30px;
min-height: 100%;
box-sizing: border-box;
padding-bottom: 130px;
}
@media (min-width: 768px) {
.documentDetail {
padding-top: 70px;
}
}
.documentDetail .pages {
padding-bottom: 0;
}
.pageDocumentation {
padding-top: 40px;
}
......@@ -53,89 +10,13 @@
padding-top: 70px;
}
}
.pageDocumentation .pageBanner {
background-size: cover;
}
.pageDocumentation .listItem {
.pageDocumentation .tile {
cursor: default;
}
.otherDocuments {
.pageDocumentation > .wrap {
position: relative;
background-color: #f6f6f6;
padding: 30px 15px;
}
@media (min-width: 1280px) {
.otherDocuments {
padding: 60px 0;
}
}
.otherDocuments ul {
list-style-type: none;
padding: 0;
}
.otherDocuments > div {
max-width: 1260px;
margin: 0 auto;
}
.otherDocuments h4 {
margin-top: 0;
font-size: 18px;
}
@media (min-width: 768px) {
.otherDocuments h4 {
font-size: 20px;
padding: 0 17% 0 25%;
}
}
@media (min-width: 1280px) {
.otherDocuments h4 {
font-size: 24px;
}
}
.otherDocuments ul {
overflow: hidden;
}
@media (min-width: 768px) {
.otherDocuments ul {
padding: 0 17% 30px 25%;
}
}
.otherDocuments ul li {
position: relative;
padding-left: 20px;
margin-bottom: 5px;
font-size: 14px;
box-sizing: border-box;
}
@media (min-width: 768px) {
.otherDocuments ul li {
width: 50%;
padding: 0 20px;
float: left;
}
}
.otherDocuments ul li a {
display: block;
color: inherit;
}
.otherDocuments ul li i {
position: absolute;
top: 0;
left: 0;
color: #f7931c;
font-size: 12px;
line-height: 16px;
font-weight: 700;
}
.defnitionList dd p a {
display: inline-block;
padding: 0;
border: none;
box-shadow: none;
margin: 0;
}
.defnitionList dd p a:hover {
background-color: transparent !important;
color: #f7931c !important;
text-decoration: underline;
padding: 0 25px;
z-index: 2;
}
......@@ -15,7 +15,6 @@
left: 0;
right: 0;
height: 1px;
background-color: #acacac;
}
.getFramaC .wrap {
position: relative;
......@@ -117,8 +116,8 @@
}
}
.getFramaC .notebook {
width: 300px;
height: 175px;
width: 80%;
height: 20%;
margin-bottom: 20px;
margin-left: auto;
margin-right: auto;
......@@ -127,81 +126,16 @@
border: 0;
background: transparent;
}
@media only screen and (min-width: 481px) {
.getFramaC .notebook {
width: 400px;
height: 233px;
}
}
@media (min-width: 768px) {
.getFramaC .notebook {
width: 600px;
height: 349px;
}
}
@media (min-width: 1024px) {
.getFramaC .notebook {
width: 720px;
height: 422px;
}
}
@media (min-width: 1280px) {
.getFramaC .notebook {
width: 800px;
height: 466px;
}
}
.getFramaC .notebook > div {
background: transparent url('../img/laptop.png') no-repeat;
background-size: 100%;
padding: 15px 36px 20px;
background-size: 100% 100%;
padding: 4.8% 12.5% 4.6% 12.5%;
border: 0;
border-radius: 0;
}
@media only screen and (min-width: 481px) {
.getFramaC .notebook > div {
padding: 22px 48px 24px;
}
}
@media (min-width: 768px) {
.getFramaC .notebook > div {
padding: 32px 74px 36px;
}
}
@media (min-width: 1024px) {
.getFramaC .notebook > div {
padding: 44px 93px 20px;
}
}
@media (min-width: 1280px) {
.getFramaC .notebook > div {
padding: 43px 100px 47px;
}
}
.getFramaC .notebook > div .codeScreen {
min-height: 100px;
height: 140px;
}
@media only screen and (min-width: 481px) {
.getFramaC .notebook > div .codeScreen {
height: 186px;
}
}
@media (min-width: 768px) {
.getFramaC .notebook > div .codeScreen {
height: 280px;
}
}
@media (min-width: 1024px) {
.getFramaC .notebook > div .codeScreen {
height: 360px;
}
}
@media (min-width: 1280px) {
.getFramaC .notebook > div .codeScreen {
height: 374px;
}
}
@keyframes lineGrow {
0% {
width: 0;
......@@ -228,10 +162,10 @@
}
.shell-win {
color:#ffffff;
background:#000080;
background:#0078D7;
}
.shell-win-comment {
color:#c0c0c0;
color:#f0f090;
}
@media (min-width: 1024px) {
......
......@@ -152,6 +152,11 @@
.home p br {
display: none;
}
.banner-desc {
text-align: center;
}
.home .banner-title {
max-width: 280px;
margin: 0 auto 20px;
......@@ -1491,10 +1496,17 @@ a.goDown .icon {
padding-right: 20px;
}
.eventDetailsBlock .contentBlk {
display: inline-flex;
display: flex;
flex-direction: column;
text-align: left;
font-size: 13px;
}
@media (min-width: 800px) {
.eventDetailsBlock .contentBlk {
display: inline-flex;
flex-direction: row;
}
}
.eventDetailsBlock .contentBlk > div {
margin-left: 16px;
}
......@@ -1512,36 +1524,38 @@ a.goDown .icon {
}
.eventDetailsBlock time {
color: #e74643;
font-size: 32px;
line-height: 1.1;
width: 100%;
text-align: center;
margin-bottom: 30px;
}
.eventDetailsBlock time b,
.eventDetailsBlock time small {
display: block;
font-weight: 600;
font-size: 36px;
}
.eventDetailsBlock time b + b:after {
content: ',';
}
.eventDetailsBlock time b:first-child {
line-height: 40px;
}
.eventDetailsBlock time b + b {
font-size: 18px;
margin-top: -1px;
}
.eventDetailsBlock time small {
font-size: 16px;
}
@media (min-width: 800px) {
.eventDetailsBlock time {
font-size: 42px;
display: block;
text-align: right;
width: auto;
display: inline-flex;
flex-direction: column;
flex: 0 0 auto;
}
.eventDetailsBlock time b + b {
font-size: 30px;
order: -1;
margin-top: 0;
}
.eventDetailsBlock time b + b:after {
content: '';
}
.eventDetailsBlock time small {
font-size: 18px;
}
......
......@@ -459,13 +459,12 @@ div#wpadminbar:hover div#wp-toolbar {
width: 100%;
left: 0;
top: 0;
height: 70px;
height: 64px;
z-index: 51;
}
@media (min-width: 768px) {
.siteHeader {
height: 60px;
border-bottom: 1px solid #f7f7f7;
}
}
@media (min-width: 1280px) {
......@@ -576,7 +575,6 @@ div#wpadminbar:hover div#wp-toolbar {
position: static;
width: auto;
max-width: none;
display: block;
float: left;
}
.siteHeader nav ul {
......@@ -597,7 +595,13 @@ div#wpadminbar:hover div#wp-toolbar {
}
.siteHeader nav li.current-menu-item a {
color: #f26521;
border-bottom: #f26521 1px solid;
}
.siteHeader nav li a:hover {
border-bottom: #f26521 1px solid;
}
.siteHeader .btnDownload {
float: right;
display: block;
......@@ -605,7 +609,7 @@ div#wpadminbar:hover div#wp-toolbar {
background: #f7931c;
color: #fff;
font-size: 20px;
height: 60px;
height: 58px;
width: 68px;
text-align: center;
line-height: 62px;
......@@ -679,7 +683,7 @@ div#wpadminbar:hover div#wp-toolbar {
}
.siteHeader .btnDownload {
font-size: 23px;
height: 65px;
height: 64px;
width: 80px;
line-height: 67px;
}
......@@ -701,24 +705,24 @@ div#wpadminbar:hover div#wp-toolbar {
}
.brandLogo {
position: absolute;
top: 6px;
left: 6px;
top: 0px;
left: 10px;
display: block;
}
.brandLogo span {
display: none;
}
.brandLogo img {
width: 128px;
height: 64px;
}
@media (min-width: 768px) {
.brandLogo {
position: static;
padding: 6px;
padding-left: 10px;
float: left;
}
.brandLogo img {
width: 104px;
height: 60px;
}
}
@media (min-width: 1280px) {
......@@ -726,14 +730,13 @@ div#wpadminbar:hover div#wp-toolbar {
padding: 0;
}
.brandLogo img {
width: 145px;