Skip to content

GitLab

Commit 9cfeede6 authored by Diego Salazar's avatar Diego Salazar
Browse files

Merge branch 'submodule' into 'master' 

Submodule and Fixes

See merge request monero-project/forum-funding-system!9
parents e7a46441 75535b2d
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 63 deletions
.gitmodules
View file @ 9cfeede6
[submodule "forum-funding-system/proposals"]
path = forum-funding-system/proposals
url = https://repo.getmonero.org/monero-project/ffs-proposals.git
_includes/head.html
View file @ 9cfeede6
......@@ -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">
......
_includes/header.html
View file @ 9cfeede6
......@@ -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>
_layouts/ffs-cp.html
View file @ 9cfeede6
......@@ -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>
......
_layouts/ffs-fr.html
View file @ 9cfeede6
......@@ -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>
......
_layouts/ffs-wip.html
View file @ 9cfeede6
......@@ -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>
......
_layouts/ffs.html
View file @ 9cfeede6
......@@ -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>
......
forum-funding-system/completed-proposals/index.html → completed-proposals/index.html
View file @ 9cfeede6
......@@ -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>
......
css/custom.css
View file @ 9cfeede6
......@@ -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***************************/
......
forum-funding-system/donate/index.html → donate/index.html
View file @ 9cfeede6
......@@ -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>
......
proposals @ 4459b497
Compare 4459b497...4459b497
Subproject commit 4459b497ee672bcc7e0848f2da7eed93152e4e06
forum-funding-system/funding-required/index.html → funding-required/index.html
View file @ 9cfeede6
......@@ -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>
......
forum-funding-system/ideas/index.html → ideas/index.html
View file @ 9cfeede6
......@@ -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>
......
forum-funding-system/index.md → index.md
View file @ 9cfeede6
---
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>
......
forum-funding-system/work-in-progress/index.html → work-in-progress/index.html
View file @ 9cfeede6
......@@ -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>
......
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