Skip to content

Commit f4f97b0

Browse files
dlouise64dlouise64
committed
CC changes
1 parent 93886ae commit f4f97b0

10 files changed

+46
-66
lines changed

‎.haml-lint.yml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
linters:
2+
LineLength:
3+
max: 100

‎app/assets/stylesheets/application.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
// Custom bootstrap variables must be set or imported *before* bootstrap.
19-
/* @import 'bootstrap'; */
19+
// @import 'bootstrap';
2020
@import 'bootstrap-custom';
2121
@import 'variables';
2222
@import 'layout';

‎app/assets/stylesheets/badges.scss

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
@import 'variables';
22

33
.badge {
4+
background: $secondary-color;
5+
border-radius: .9375rem;
6+
color: $white;
7+
display: inline-block;
48
font-size: .6875rem;
59
font-weight: bold;
6-
color: $white;
7-
border-radius: .9375rem;
8-
padding: .2rem .5rem;
9-
background: $secondary-color;
1010
margin-bottom: .125rem;
11-
display: inline-block;
11+
padding: .2rem .5rem;
1212

1313
> a {
1414
&:hover {

‎app/assets/stylesheets/bootstrap-custom.scss

+17-37
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,17 @@
1-
@import "bootstrap/functions";
2-
@import "bootstrap/variables";
3-
@import "bootstrap/mixins";
4-
@import "bootstrap/root";
5-
@import "bootstrap/reboot";
6-
@import "bootstrap/type";
7-
@import "bootstrap/images";
8-
@import "bootstrap/code";
9-
@import "bootstrap/grid";
10-
@import "bootstrap/tables";
11-
@import "bootstrap/forms";
12-
/* @import "bootstrap/buttons"; */
13-
/* @import "bootstrap/transitions"; */
14-
/* @import "bootstrap/dropdown"; */
15-
/* @import "bootstrap/button-group"; */
16-
/* @import "bootstrap/input-group"; */
17-
/* @import "bootstrap/custom-forms"; */
18-
@import "bootstrap/nav";
19-
@import "bootstrap/navbar";
20-
@import "bootstrap/card";
21-
/* @import "bootstrap/breadcrumb"; */
22-
/* @import "bootstrap/pagination"; */
23-
/* @import "bootstrap/badge"; */
24-
/* @import "bootstrap/jumbotron"; */
25-
/* @import "bootstrap/alert"; */
26-
/* @import "bootstrap/progress"; */
27-
/* @import "bootstrap/media"; */
28-
@import "bootstrap/list-group";
29-
/* @import "bootstrap/close"; */
30-
/* @import "bootstrap/toasts"; */
31-
/* @import "bootstrap/modal"; */
32-
/* @import "bootstrap/tooltip"; */
33-
/* @import "bootstrap/popover"; */
34-
/* @import "bootstrap/carousel"; */
35-
/* @import "bootstrap/spinners"; */
36-
@import "bootstrap/utilities";
37-
@import "bootstrap/print";
1+
@import 'bootstrap/functions';
2+
@import 'bootstrap/variables';
3+
@import 'bootstrap/mixins';
4+
@import 'bootstrap/root';
5+
@import 'bootstrap/reboot';
6+
@import 'bootstrap/type';
7+
@import 'bootstrap/images';
8+
@import 'bootstrap/code';
9+
@import 'bootstrap/grid';
10+
@import 'bootstrap/tables';
11+
@import 'bootstrap/forms';
12+
@import 'bootstrap/nav';
13+
@import 'bootstrap/navbar';
14+
@import 'bootstrap/card';
15+
@import 'bootstrap/list-group';
16+
@import 'bootstrap/utilities';
17+
@import 'bootstrap/print';

‎app/assets/stylesheets/buttons.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
}
1010

1111
.btn {
12-
width: 100%;
1312
margin-bottom: .5rem;
13+
width: 100%;
1414

1515
@media (min-width: 768px) {
1616
width: auto;
@@ -46,8 +46,8 @@
4646

4747
&:hover {
4848
background: $primary-color;
49-
color: $white;
5049
border: .3125rem solid transparent;
50+
color: $white;
5151
text-decoration: none;
5252
}
5353
}

‎app/assets/stylesheets/header.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
padding: 1.5rem 1.5rem 1rem;
2020

2121
@media (min-width: 768px) {
22-
padding: 2rem 4rem;
2322
margin: 0 5rem;
2423
margin-bottom: 2rem;
24+
padding: 2rem 4rem;
2525
}
2626

2727
> h1 {
@@ -37,10 +37,10 @@
3737
}
3838

3939
.header-secondary {
40-
border-radius: $border-radius;
4140
background: $white;
42-
padding: 2rem;
41+
border-radius: $border-radius;
4342
box-shadow: 0 0 20px rgba($primary-color, .7);
43+
padding: 2rem;
4444
text-align: center;
4545

4646
@media (min-width: 768px) {

‎app/helpers/entities_helper.rb

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
# frozen_string_literal: true
22

33
module EntitiesHelper
4-
def title(str)
5-
str.to_s.split()
6-
end
74
end

‎app/views/layouts/application.html.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
%p
4040
%span
4141
Computations powered by
42-
= succeed "," do
42+
= succeed ',' do
4343
%a{href: "https://openfisca.org", rel: "noopener", target: "_blank"}
4444
%img{alt: "OpenFisca", height: "24", src: "https://openfisca.org/img/logo-openfisca.svg"}/
4545
%a{href: "https://github.com/openfisca/openfisca-core"} source code

‎app/views/layouts/pages.html.haml

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
%head
44
%title
55
Rapu Ture Connecting the Rules
6-
= '|'
6+
= |
77
= yield :title
88
= csrf_meta_tags
99
= csp_meta_tag
1010
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'
1111
= javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
1212
= javascript_pack_tag 'application'
13-
%meta{content: "width=device-width, initial-scale=1, shrink-to-fit=no", name: "viewport"}/
13+
%meta{ content: 'width=device-width, initial-scale=1, shrink-to-fit=no', name: 'viewport' }/
1414

1515

1616
%body
@@ -22,9 +22,9 @@
2222
%p
2323
%span
2424
Computations powered by
25-
= succeed "," do
26-
%a{href: "https://openfisca.org", rel: "noopener", target: "_blank"}
27-
%img{alt: "OpenFisca", height: "24", src: "https://openfisca.org/img/logo-openfisca.svg"}/
28-
%a{href: "https://github.com/openfisca/openfisca-core"} source code
25+
= succeed ',' do
26+
%a{ href: 'https://openfisca.org', rel: 'noopener', target: '_blank' }
27+
%img{ alt: 'OpenFisca', height: '24', src: 'https://openfisca.org/img/logo-openfisca.svg' }/
28+
%a{ href: 'https://github.com/openfisca/openfisca-core' } source code
2929
is used under an
30-
%a{href: "https://choosealicense.com/licenses/agpl-3.0/", rel: "noopener", target: "_blank"} AGPL license.
30+
%a{ href: 'https://choosealicense.com/licenses/agpl-3.0/', rel: 'noopener', target: '_blank' } AGPL license.

‎app/views/pages/about.html.haml

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
.row
44
.col-lg-3
55
%ul.side-nav.list-stripped
6-
%li= link_to "What is Rapu Ture?", "#q1"
7-
%li= link_to "What is Legislation of Code?"
8-
%li= link_to "How to use Rapu Ture", "#q3"
9-
%li= link_to "How to contribute"
10-
%li= link_to "Contact Us"
6+
%li= link_to 'What is Rapu Ture?', '#q1'
7+
%li= link_to 'What is Legislation of Code?'
8+
%li= link_to 'How to use Rapu Ture', '#q3'
9+
%li= link_to 'How to contribute'
10+
%li= link_to 'Contact Us'
1111
.col-lg-9
1212
%section.section
1313
%h1.heading What is Rapu Ture?
1414
%h2.heading-secondary Rapu Ture is an API library that lets you explore and call legislative rules.
1515

1616
%dl
1717
%dt#q1 What is Legislation as Code?
18-
%dd Lorem ipsum dolor sit amet consectetur adipisicing elit. Suscipit at incidunt accusamus. Explicabo consequuntur et voluptatum sint omnis vel tempore assumenda, quaerat cum reiciendis quibusdam, autem maiores ab beatae libero!
18+
%dd Lorem ipsum dolor sit amet consectetur adipisicing elit.equuntur et voluptatum sint omnis vel tempore assumenda, quaerat cum reiciendis quibusdam, autem maiores ab beatae libero!
1919

2020

2121
%dt How to use Rapu Ture
@@ -27,4 +27,4 @@
2727

2828

2929
%dt Contact Us
30-
%dd Lorem ipsum dolor sit amet consectetur adipisicing elit. Cum nulla expedita illum maxime iure praesentium voluptatem odit ad tenetur iste officiis, animi explicabo cumque impedit inventore, quisquam possimus vero qui.
30+
%dd Lorem ipsum dolor sit amet consectetur adipisicing elit.um voluptatem odit ad tenetur iste officiis, animi explicabo cumque impedit inventore, quisquam possimus vero qui.

0 commit comments

Comments
 (0)