diff --git a/.gitmodules b/.gitmodules
index 5affba76ed30a2b3e26d423d73d1ebd13e9ad45a..8b137891791fe96927ad78e64b0aad7bded08bdc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1 @@
-[submodule "forum-funding-system/proposals"]
- path = forum-funding-system/proposals
- url = https://repo.getmonero.org/monero-project/ffs-proposals.git
+
diff --git a/_includes/head.html b/_includes/head.html
index c6cd42db54b16c5f47a069fb00c515c1af491c95..2ab3ae8ba55e16f53718ad32ac5e8bf188c17f6b 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -3,7 +3,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
- <title>FFS</title>
+ <title>CCS - {{page.title}}</title>
<link rel="apple-touch-icon" sizes="180x180" href="/meta/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/meta/favicon-32x32.png">
diff --git a/_includes/header.html b/_includes/header.html
index e4948c7eef72291aca34bf9d3a05a6712f847e7f..2b3e6edf378e9ea9af60a71fca7902bb3bf06f6f 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -7,19 +7,19 @@
<div class="row">
<div class="col-xs-12">
<div class="text-center nav-item mob">
- <a href="/forum-funding-system/ideas/" class="top-link">Ideas</a>
+ <a href="/ideas/" class="top-link">Ideas</a>
</div>
<div class="text-center nav-item mob">
- <a href="/forum-funding-system/funding-required/">Funding Required</a>
+ <a href="/funding-required/">Funding Required</a>
</div>
<div class="text-center nav-item mob">
- <a href="/forum-funding-system/work-in-progress/">Work in Progress</a>
+ <a href="/work-in-progress/">Work in Progress</a>
</div>
<div class="text-center nav-item mob">
- <a href="/forum-funding-system/completed-proposals/">Completed Tasks</a>
+ <a href="/completed-proposals/">Completed Tasks</a>
</div>
<div class="text-center nav-item mob">
- <a href="/forum-funding-system/completed-proposals/">Back to Getmonero.org</a>
+ <a href="/completed-proposals/">Back to Getmonero.org</a>
</div>
</div>
</div>
@@ -32,16 +32,16 @@
<nav class="container">
<div class="row middle-xs">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
- <a href="/forum-funding-system/"><img src="/img/monero-logo.png" alt="Monero Logo" class="monero-logo"></a>
+ <p class="site-name"><a href="/">Community Crowdfunding System</a></p>
</div>
<div class="col-lg-8 col-md-8 col-sm-8 items end-xs">
<div class="row end-xs middle-xs">
<div class="col-md-12">
- <a href="/forum-funding-system/ideas/" class="top-link">Ideas</a>
- <a href="/forum-funding-system/funding-required/">Funding Required</a>
- <a href="/forum-funding-system/work-in-progress/">Work in Progress</a>
- <a href="/forum-funding-system/completed-proposals/">Completed Tasks</a>
- <a href="/forum-funding-system/completed-proposals/">Getmonero.org</a>
+ <a href="/ideas/" class="top-link">Ideas</a>
+ <a href="/funding-required/">Funding Required</a>
+ <a href="/work-in-progress/">Work in Progress</a>
+ <a href="/completed-proposals/">Completed Tasks</a>
+ <a href="https://getmonero.org">Getmonero.org</a>
</div>
</div>
</div>
@@ -50,8 +50,8 @@
</div>
<div class="mob bot-nav white-nav">
<div class="row middle-xs">
- <div class="col-xs-6">
- <a href="{% if site.lang == 'en' %}
+ <div class="col-xs-12">
+ <p class="site-name"><a href="{% if site.lang == 'en' %}
{{ site.baseurl_root }}/
@@ -59,7 +59,7 @@
{{ site.baseurl_root }}/{{site.lang}}
- {% endif %}"><img src="/img/monero-logo.png" alt="Monero Logo" class="monero-logo"></a>
+ {% endif %}">Community Crowdfunding System</a></p>
</div>
</div>
</div>
diff --git a/_layouts/ffs-cp.html b/_layouts/ffs-cp.html
index 09bd9c23d6ef17feacf4c84cf55892399c3ccd81..f9bc85e1a9643668d60db7035dcf5af64dfad2ed 100644
--- a/_layouts/ffs-cp.html
+++ b/_layouts/ffs-cp.html
@@ -6,8 +6,8 @@ layout: base
<div class="container ffs-breadcrumbs">
<div class="row">
<div class="col-xs-12">
- <p><a href="/forum-funding-system/">Forum Funding System</a></p>
- <p><a href="/forum-funding-system/completed-proposals/">Completed Tasks</a></p>
+ <p><a href="/">Community Crowdfunding System</a></p>
+ <p><a href="/completed-proposals/">Completed Tasks</a></p>
<p class="bread-active">{{page.title}}</p>
</div>
</div>
diff --git a/_layouts/ffs-fr.html b/_layouts/ffs-fr.html
index 563b85c3f96d2d1cd4f73ea35d80be9dd7cf9339..87f4530546e6ad2cf4ee303fe5d88b026b757e43 100644
--- a/_layouts/ffs-fr.html
+++ b/_layouts/ffs-fr.html
@@ -7,8 +7,8 @@ layout: base
<div class="container ffs-breadcrumbs">
<div class="row">
<div class="col-xs-12">
- <p><a href="/forum-funding-system/">Forum Funding System</a></p>
- <p><a href="/forum-funding-system/funding-required/">Funding Required</a></p>
+ <p><a href="/">Community Crowdfunding System</a></p>
+ <p><a href="/funding-required/">Funding Required</a></p>
<p class="bread-active">{{page.title}}</p>
</div>
</div>
diff --git a/_layouts/ffs-wip.html b/_layouts/ffs-wip.html
index 33d6cd65169fdd356a5521aabbaab860a41daa0b..7b6419d9ff91c336b2d8a2726f8c9efa1e72b7da 100644
--- a/_layouts/ffs-wip.html
+++ b/_layouts/ffs-wip.html
@@ -6,8 +6,8 @@ layout: base
<div class="container ffs-breadcrumbs">
<div class="row">
<div class="col-xs-12">
- <p><a href="/forum-funding-system/">Forum Funding System</a></p>
- <p><a href="/forum-funding-system/work-in-progress/">Work in Progress</a></p>
+ <p><a href="/">Community Crowdfunding System</a></p>
+ <p><a href="/work-in-progress/">Work in Progress</a></p>
<p class="bread-active">{{page.title}}</p>
</div>
</div>
diff --git a/_layouts/ffs.html b/_layouts/ffs.html
index 4b7b36e10626a5752149fb0f0e9c17e990bb26de..6debabfb61ecf7717941c75ed07b0eb555c306d7 100644
--- a/_layouts/ffs.html
+++ b/_layouts/ffs.html
@@ -5,7 +5,7 @@ layout: default
<!-- FULL WIDTH BLOCK -->
<section class="container full">
<div class="info-block text-adapt">
- <a href="/forum-funding-system/ideas/">Back to Ideas</a>
+ <a href="/ideas/">Back to Ideas</a>
<div>
{{content}}
</div>
diff --git a/forum-funding-system/completed-proposals/index.html b/completed-proposals/index.html
similarity index 94%
rename from forum-funding-system/completed-proposals/index.html
rename to completed-proposals/index.html
index de5691e6b2a3ff892b3cd641403b6645f550785e..dea8c2a138022fc037d68f6c3936b36ce3566136 100644
--- a/forum-funding-system/completed-proposals/index.html
+++ b/completed-proposals/index.html
@@ -6,7 +6,7 @@ title: Completed Tasks
<div class="container ffs-breadcrumbs">
<div class="row">
<div class="col-xs-12">
- <p><a href="/forum-funding-system/">Forum Funding System</a></p>
+ <p><a href="/">Community Crowdfunding System</a></p>
<p class="bread-active">{{page.title}}</p>
</div>
</div>
diff --git a/css/custom.css b/css/custom.css
index c0198f543981300a4c514467f039d1f651d208ec..da132ae9fcb5d11650c3e67fbb587a12d31971f0 100644
--- a/css/custom.css
+++ b/css/custom.css
@@ -1748,6 +1748,19 @@ img.monero-logo {
vertical-align: middle;
}
+p.site-name {
+ padding: 0;
+}
+
+p.site-name a {
+ font-family: 'Hind', sans-serif;
+ color: #000;
+ display: inline-block;
+ text-decoration: none;
+ padding: 1.4rem 0 1.1rem 0;
+ font-size: 1.2rem;
+}
+
.desktop-nav .items a {
color: #4c4c4c;
text-decoration: none;
@@ -1821,6 +1834,14 @@ img.monero-logo {
width: 10rem;
padding: 0.39rem 0 0.39rem 1rem;
}
+
+p.site-name {
+ padding-left: 1rem;
+}
+
+p.site-name a {
+ padding: 0.8rem 0 0.6rem 0;
+}
.white-nav {
line-height: 0.5;
@@ -1943,20 +1964,16 @@ img.monero-logo {
.slide-in-nav {
position: absolute;
- top: 0; right: 0; bottom: 0; left: 0;
- display: flex;
- right: -100%;
- left: 200%;
+ top: -100%;
+ left: 0;
display: -ms-flexbox;
display: -webkit-box;
display: flex;
- top: 0;
- bottom: 0;
- width: 50vw;
+ width: 100vw;
background-color: #fff;
- -moz-transition: left 0.5s, right 0.5s;
- -webkit-transition: left 0.5s, right 0.5s;
- transition: left 0.5s, right 0.5s;
+ -moz-transition: top 0.5s, right 0.5s;
+ -webkit-transition: top 0.5s, right 0.5s;
+ transition: top 0.5s, right 0.5s;
overflow: scroll;
z-index: 90;
}
@@ -1987,8 +2004,8 @@ label[for="mobile-burger"] {
-moz-box-shadow: 0 0 900px 900px rgba(0,0,0,0.5);
-webkit-box-shadow: 0 0 900px 900px rgba(0,0,0,0.5);
box-shadow: 0 0 900px 900px rgba(0,0,0,0.5);
- right: 0;
- left: 50%;
+ top: 0;
+ height: 100%;
}
#mobile-burger:checked ~ body {
@@ -2190,6 +2207,26 @@ img.monero-logo {
}
+@media only screen and (max-width: 27rem) {
+
+p.site-name a {
+ font-size: 1rem;
+ padding-top: 1rem;
+ padding-bottom: 0.7rem;
+}
+
+}
+
+@media only screen and (max-width: 21.25rem) {
+
+p.site-name a {
+ font-size: 0.9rem;
+ padding-top: 1.1rem;
+ padding-bottom: 0.8rem;
+}
+
+}
+
/****************************FOOTER***************************/
diff --git a/forum-funding-system/donate/index.html b/donate/index.html
similarity index 81%
rename from forum-funding-system/donate/index.html
rename to donate/index.html
index 1e603ce22508059b1e8e0963032669ebe13c9709..3d27ddecec18643f4cc3b9fdf62ac4aa95490ed9 100644
--- a/forum-funding-system/donate/index.html
+++ b/donate/index.html
@@ -34,19 +34,19 @@
<div class="row">
<div class="col-xs-12">
<div class="text-center nav-item mob">
- <a href="/forum-funding-system/ideas/" class="top-link">Ideas</a>
+ <a href="/ideas/" class="top-link">Ideas</a>
</div>
<div class="text-center nav-item mob">
- <a href="/forum-funding-system/funding-required/">Funding Required</a>
+ <a href="/funding-required/">Funding Required</a>
</div>
<div class="text-center nav-item mob">
- <a href="/forum-funding-system/work-in-progress/">Work in Progress</a>
+ <a href="/work-in-progress/">Work in Progress</a>
</div>
<div class="text-center nav-item mob">
- <a href="/forum-funding-system/completed-proposals/">Completed Tasks</a>
+ <a href="/completed-proposals/">Completed Tasks</a>
</div>
<div class="text-center nav-item mob">
- <a href="/forum-funding-system/completed-proposals/">Back to Getmonero.org</a>
+ <a href="/completed-proposals/">Back to Getmonero.org</a>
</div>
</div>
</div>
@@ -59,16 +59,16 @@
<nav class="container">
<div class="row middle-xs">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
- <a href="/forum-funding-system/"><img src="/img/monero-logo.png" alt="Monero Logo" class="monero-logo"></a>
+ <a href="/"><img src="/img/monero-logo.png" alt="Monero Logo" class="monero-logo"></a>
</div>
<div class="col-lg-8 col-md-8 col-sm-8 items end-xs">
<div class="row end-xs middle-xs">
<div class="col-md-12">
- <a href="/forum-funding-system/ideas/" class="top-link">Ideas</a>
- <a href="/forum-funding-system/funding-required/">Funding Required</a>
- <a href="/forum-funding-system/work-in-progress/">Work in Progress</a>
- <a href="/forum-funding-system/completed-proposals/">Completed Tasks</a>
- <a href="/forum-funding-system/completed-proposals/">Getmonero.org</a>
+ <a href="/ideas/" class="top-link">Ideas</a>
+ <a href="/funding-required/">Funding Required</a>
+ <a href="/work-in-progress/">Work in Progress</a>
+ <a href="/completed-proposals/">Completed Tasks</a>
+ <a href="/completed-proposals/">Getmonero.org</a>
</div>
</div>
</div>
@@ -92,9 +92,9 @@
<div class="container ffs-breadcrumbs">
<div class="row">
<div class="col-xs-12">
- <p><a href="/forum-funding-system/">Forum Funding System</a></p>
- <p><a href="/forum-funding-system/funding-required/">Funding Required</a></p>
- <p><a href="/forum-funding-system/funding-required/">[TITLE HERE]</a></p>
+ <p><a href="/">Community Crowdfunding System</a></p>
+ <p><a href="/funding-required/">Funding Required</a></p>
+ <p><a href="/funding-required/">[TITLE HERE]</a></p>
<p class="bread-active">Contribute</p>
</div>
</div>
diff --git a/forum-funding-system/proposals b/forum-funding-system/proposals
deleted file mode 160000
index 4459b497ee672bcc7e0848f2da7eed93152e4e06..0000000000000000000000000000000000000000
--- a/forum-funding-system/proposals
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4459b497ee672bcc7e0848f2da7eed93152e4e06
diff --git a/forum-funding-system/funding-required/index.html b/funding-required/index.html
similarity index 96%
rename from forum-funding-system/funding-required/index.html
rename to funding-required/index.html
index 09079a35e40452f3ceb3d10e94fb0e5bae5a27e2..8f7cd236bedcee47ea90cd2a12f91e1762e1bffc 100644
--- a/forum-funding-system/funding-required/index.html
+++ b/funding-required/index.html
@@ -6,7 +6,7 @@ title: Funding Required
<div class="container ffs-breadcrumbs">
<div class="row">
<div class="col-xs-12">
- <p><a href="/forum-funding-system/">Forum Funding System</a></p>
+ <p><a href="/">Community Crowdfunding System</a></p>
<p class="bread-active">{{page.title}}</p>
</div>
</div>
diff --git a/forum-funding-system/ideas/index.html b/ideas/index.html
similarity index 95%
rename from forum-funding-system/ideas/index.html
rename to ideas/index.html
index 36180ecf457043e10573c892a51e292f06622194..18e11a8c7cb52690aca224fa289408d5879ce751 100644
--- a/forum-funding-system/ideas/index.html
+++ b/ideas/index.html
@@ -6,7 +6,7 @@ title: Ideas
<div class="container ffs-breadcrumbs">
<div class="row">
<div class="col-xs-12">
- <p><a href="/forum-funding-system/">Forum Funding System</a></p>
+ <p><a href="/">Community Crowdfunding System</a></p>
<p class="bread-active">{{page.title}}</p>
<p class="submit-idea">
<a href="#" target="_blank">Submit Idea</a>
diff --git a/forum-funding-system/index.md b/index.md
similarity index 77%
rename from forum-funding-system/index.md
rename to index.md
index ccbeef0dc31b427458fe5b3c2909d4cfe0b234e4..f162e2800a98dfd68716df399eea0b3fb1c91864 100644
--- a/forum-funding-system/index.md
+++ b/index.md
@@ -1,18 +1,18 @@
---
layout: customnt
-title: Forum Funding System
+title: Community Crowdfunding System (CCS)
---
<div class="ffs-main">
<div class="container description" >
<h1>{{page.title}}</h1>
</div>
<div class="container description" >
- <p>Monero is a decentralized community-driven project, and the Forum Funding System is a way for members to get involved and proposals to be funded. To see how it works, <a href="">click here</a>. To see how to submit your own proposal or idea, <a href="">click here</a>.</p>
+ <p>Monero is a decentralized community-driven project, and the CCS is a way for members to get involved and proposals to be funded. To see how it works, <a href="">click here</a>. To see how to submit your own proposal or idea, <a href="">click here</a>.</p>
</div>
<section class="container">
<div class="row">
<div class="half col-sm-6 col-xs-12">
- <a href="{{site.baseurl}}/forum-funding-system/ideas/" class="ffs-cat row">
+ <a href="{{site.baseurl}}/ideas/" class="ffs-cat row">
<div class="col-sm-4 col-xs-4">
<img src="/img/idea-bulb.png"/>
</div>
@@ -23,18 +23,18 @@ title: Forum Funding System
</a>
</div>
<div class="half col-sm-6 col-xs-12">
- <a href="{{site.baseurl}}/forum-funding-system/funding-required/" class="row ffs-cat">
+ <a href="{{site.baseurl}}/funding-required/" class="row ffs-cat">
<div class="col-sm-4 col-xs-4">
<img src="/img/funding-required.png"/>
</div>
<div class="col-sm-8 col-xs-8">
<h2>Funding Required</h2>
- <p>Once a pitched and approved idea has been picked up by a developer or team it goes here for community fund-raising.</p>
+ <p>Once a pitched and approved idea has been picked up by a developer or team it goes here for community fundraising.</p>
</div>
</a>
</div>
<div class="half col-sm-6 col-xs-12">
- <a href="{{site.baseurl}}/forum-funding-system/work-in-progress/" class="row ffs-cat">
+ <a href="{{site.baseurl}}/work-in-progress/" class="row ffs-cat">
<div class="col-sm-4 col-xs-4">
<img src="/img/inprogress.png"/>
</div>
@@ -45,7 +45,7 @@ title: Forum Funding System
</a>
</div>
<div class="half col-sm-6 col-xs-12">
- <a href="{{site.baseurl}}/forum-funding-system/completed-proposals/" class="ffs-cat row">
+ <a href="{{site.baseurl}}/completed-proposals/" class="ffs-cat row">
<div class="col-sm-4 col-xs-4">
<img src="/img/checklist.png"/>
</div>
diff --git a/forum-funding-system/work-in-progress/index.html b/work-in-progress/index.html
similarity index 96%
rename from forum-funding-system/work-in-progress/index.html
rename to work-in-progress/index.html
index 12ee6149ce2753b5319dddb4cf8c0a55d075fc53..a231680f4608ac0bd01c2bcfe41bedb7b21f2a75 100644
--- a/forum-funding-system/work-in-progress/index.html
+++ b/work-in-progress/index.html
@@ -6,7 +6,7 @@ title: Work in Progress
<div class="container ffs-breadcrumbs">
<div class="row">
<div class="col-xs-12">
- <p><a href="/forum-funding-system/">Forum Funding System</a></p>
+ <p><a href="/">Community Crowdfunding System</a></p>
<p class="bread-active">{{page.title}}</p>
</div>
</div>