nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

help page ported to bootstrap

Browse source
This commit is contained in:
Pablo Cuadrado 2014-07-01 05:56:49 -03:00
parent c9552c2cd9
commit 14fbd7b205
5 changed files with 99 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/assets/stylesheets/help.css.scss
View file

@ -1,3 +1,9 @@
h2.help_header {
border-bottom: 1px solid black;
padding-bottom: 5px;
margin-bottom: 15px;
}
ul#help_nav { ul#help_nav {
display: inline; display: inline;
padding: 0; padding: 0;
@ -23,13 +29,18 @@ ul#help_nav {
font-weight: 700; font-weight: 700;
} }
ul { ul {
list-style: none;
padding: 0; padding: 0;
margin: 0;
li { li {
font-weight: 700; font-weight: 700;
margin-bottom: 10px; margin-bottom: 10px;
a { a {
font-weight: normal; font-weight: normal;
} }
.section-selected {
font-weight: bold;
}
} }
} }
} }
@ -55,7 +66,10 @@ ul#help_nav {
background-color: rgb(242, 242, 242); background-color: rgb(242, 242, 242);
margin-bottom: 10px; margin-bottom: 10px;
@include border-radius(4px); @include border-radius(4px);
a.toggle { text-decoration: none; } a.toggle {
text-decoration: none;
color: black;
}
h4 { h4 {
text-align: left; text-align: left;
font-weight: 700; font-weight: 700;
@ -74,7 +88,7 @@ ul#help_nav {
} }
} }
.answer { .answer {
@include border-bottom-radius(4px); @include border-radius(0px, 0px, 4px, 4px);
background-color: white; background-color: white;
padding: 10px 20px; padding: 10px 20px;
} }

3
app/assets/stylesheets/new-templates.css.scss
View file

@ -42,3 +42,6 @@
/* notifications */ /* notifications */
@import 'notifications'; @import 'notifications';
/* help */
@import 'help';

5
app/assets/stylesheets/new_styles/_base.scss
View file

@ -146,6 +146,11 @@ $bring-dark-accent-forward-color: #DDD;
} }
} }
/* padder helper to push content below the header, to be removed when porting to bootstrap is complete */
.bootstrap_header_padding {
padding-top: 40px;
}
/* responsive */ /* responsive */
@media (max-width: 767px) { @media (max-width: 767px) {
body { body {

18
app/assets/templates/help_tpl.jst.hbs
View file

@ -1,8 +1,14 @@
<div id="section_header"> <div class="bootstrap_header_padding"></div>
<div class="container">
<div id="section_header">
<h2 class="help_header">Help</h2> <h2 class="help_header">Help</h2>
</div> </div>
<div class="span-5">
<div class="row-fluid">
<div class="span3">
<div id='faq_nav'> <div id='faq_nav'>
<ul> <ul>
<li> <li>
@ -63,7 +69,9 @@
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
<div class="span-19 last" id=faq> <div class="span9 last" id=faq>
</div>
</div>
</div> </div>

2
app/controllers/help_controller.rb
View file

@ -1,2 +1,4 @@
class HelpController < ApplicationController class HelpController < ApplicationController
before_filter -> { @css_framework = :bootstrap }
layout ->(c) { request.format == :mobile ? "application" : "with_header_with_footer" }
end end