femmefaytale/cotech-website
0
0
Fork 0
forked from autonomic-cooperative/cotech-website
Code Issues Pull Requests Projects Releases Wiki Activity

Moved About, Join and Manifesto to the header. Added a close button to the default page layout

Browse Source
This commit is contained in:
harry 2019-04-25 14:17:00 +01:00
parent 6f209445fc
commit ddb3df7127
4 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Gemfile.lock
View File

@ -1,21 +1,21 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
addressable (2.5.2) addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0) public_suffix (>= 2.0.2, < 4.0)
colorator (1.1.0) colorator (1.1.0)
concurrent-ruby (1.1.1) concurrent-ruby (1.1.5)
em-websocket (0.5.1) em-websocket (0.5.1)
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0) http_parser.rb (~> 0.6.0)
eventmachine (1.2.7) eventmachine (1.2.7)
ffi (1.9.25) ffi (1.10.0)
forwardable-extended (2.6.0) forwardable-extended (2.6.0)
geocoder (1.5.0) geocoder (1.5.1)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (0.9.5) i18n (0.9.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jekyll (3.7.4) jekyll (3.8.5)
addressable (~> 2.4) addressable (~> 2.4)
colorator (~> 1.0) colorator (~> 1.0)
em-websocket (~> 0.5) em-websocket (~> 0.5)
@ -30,10 +30,10 @@ GEM
safe_yaml (~> 1.0) safe_yaml (~> 1.0)
jekyll-sass-converter (1.5.2) jekyll-sass-converter (1.5.2)
sass (~> 3.4) sass (~> 3.4)
jekyll-watch (2.1.2) jekyll-watch (2.2.1)
listen (~> 3.0) listen (~> 3.0)
kramdown (1.17.0) kramdown (1.17.0)
liquid (4.0.0) liquid (4.0.3)
listen (3.1.5) listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
@ -41,14 +41,14 @@ GEM
mercenary (0.3.6) mercenary (0.3.6)
pathutil (0.16.2) pathutil (0.16.2)
forwardable-extended (~> 2.6) forwardable-extended (~> 2.6)
public_suffix (2.0.5) public_suffix (3.0.3)
rb-fsevent (0.10.3) rb-fsevent (0.10.3)
rb-inotify (0.9.10) rb-inotify (0.10.0)
ffi (>= 0.5.0, < 2) ffi (~> 1.0)
rouge (2.2.1) rouge (3.3.0)
ruby_dep (1.5.0) ruby_dep (1.5.0)
safe_yaml (1.0.4) safe_yaml (1.0.5)
sass (3.7.2) sass (3.7.4)
sass-listen (~> 4.0.0) sass-listen (~> 4.0.0)
sass-listen (4.0.0) sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
@ -62,4 +62,4 @@ DEPENDENCIES
jekyll jekyll
BUNDLED WITH BUNDLED WITH
1.17.1 1.17.3

1
_includes/header.html
View File

@ -8,6 +8,7 @@
</a> </a>
</strong> </strong>
<a class="back" href="/">&#8592; Go Back</a> <a class="back" href="/">&#8592; Go Back</a>
<a class="close" href="/">&#10006;</a>
</div> </div>
</div> </div>
</div> </div>

13
_layouts/home.html
View File

@ -22,11 +22,14 @@
<div id="responsive-menu"> <div id="responsive-menu">
<div class="top-bar-right"> <div class="top-bar-right">
<ul class="dropdown menu vertical medium-horizontal" data-magellan> <ul class="dropdown menu vertical medium-horizontal" data-magellan>
<li><a href="#members">Members</a></li> <li><a href="/#members">Members</a></li>
<li><a href="#clients">Clients</a></li> <li><a href="/#clients">Clients</a></li>
<li><a href="#services">Services</a></li> <li><a href="/#services">Services</a></li>
<li><a href="#technologies">Technologies</a></li> <li><a href="/#technologies">Technologies</a></li>
<li><a href="#contact" class="button">Get In Touch</a></li> <li><a href="/about">About</a></li>
<li><a href="/join">Join</a></li>
<li><a href="/manifesto">Manifesto</a></li>
<li><a href="/#contact" class="button">Get In Touch</a></li>
</ul> </ul>
</div> </div>
</div> </div>

7
app/themes/coop-tech-oowp-theme/public/css/app.css
View File

@ -6346,7 +6346,9 @@ table.hover tbody tr:nth-of-type(even):hover {
.top-bar-title { .top-bar-title {
float: left; float: left;
margin-right: 1rem; } margin-right: 1rem;
width: 100%;
}
.top-bar-left { .top-bar-left {
float: left; } float: left; }
@ -6828,6 +6830,9 @@ h5#join-us {
padding-left: 2rem; padding-left: 2rem;
color: #9196a2; } color: #9196a2; }
.close{
float: right;
}
#page-banner { #page-banner {
margin-bottom: 4rem; margin-bottom: 4rem;
text-align: center; } text-align: center; }