Skip to content

Commit

Permalink
Fix lint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
malparty committed Jan 5, 2024
1 parent d15961a commit 3270c1d
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .template/addons/bootstrap/application.scss.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

insert_into_file 'app/assets/stylesheets/application.scss', after: %r{// Dependencies\n} do
<<~SCSS
@import './vendor';
@import 'vendor';
SCSS
end
2 changes: 1 addition & 1 deletion .template/addons/bootstrap/stylesheets/vendor/index.scss
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@import './bootstrap';
@import 'bootstrap';
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ body {
padding: rem(8px);
}

&__nav_bar_top {
&__nav-bar-top {
grid-area: navBar;
border-bottom: solid var(--bs-border-width) var(--bs-gray-400);
}

&__side_bar {
&__side-bar {
grid-area: sideBar;
display: flex;
flex-flow: column;
Expand All @@ -49,19 +49,20 @@ body {
font-weight: 600;
color: var(--bs-emphasis-color);
background-color: transparent;
}
.btn-toggle:hover,
.btn-toggle:focus {
color: rgba(var(--bs-emphasis-color-rgb), 0.85);
background-color: var(--bs-tertiary-bg);
}

.btn-toggle::before {
width: 1.25em;
line-height: 0;
content: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='rgba%280,0,0,.5%29' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M5 14l6-6-6-6'/%3e%3c/svg%3e");
transition: transform 0.35s ease;
transform-origin: 0.5em 50%;
&:hover,
&:focus {
color: rgba(var(--bs-emphasis-color-rgb), 0.85);
background-color: var(--bs-tertiary-bg);
}

&::before {
width: 1.25em;
line-height: 0;
content: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='rgba%280,0,0,.5%29' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M5 14l6-6-6-6'/%3e%3c/svg%3e");
transition: transform 0.35s ease;
transform-origin: 0.5em 50%;
}
}

[data-bs-theme="dark"] .btn-toggle::before {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@import "./application";
@import "application";
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ html lang=I18n.locale
header
= render('layouts/application/nav_bar_top')
.app
.side_bar
.side-bar
= render('layouts/application/side_bar')
.app__container
main.app__main
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.app__nav_bar_top
.app__nav-bar-top
nav.navbar.navbar-expand-lg.navbar-light.bg-light
.container-fluid
a.navbar-brand[href="#"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.app__side_bar
.app__side-bar
a.d-flex.align-items-center.mb-3.mb-md-0.me-md-auto.link-dark.text-decoration-none[href="/"]
svg.bi.pe-none.me-2[width="40" height="32"]
use[xlink:href="#bootstrap"]
Expand Down
2 changes: 1 addition & 1 deletion .template/addons/crud/template.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
directory 'app/assets/stylesheets/layouts'
insert_into_file 'app/assets/stylesheets/application.scss', after: %r{// Layouts\n} do
<<~SCSS
@import './layouts';
@import 'layouts';
SCSS
end
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
subject { file('app/assets/stylesheets/application.scss') }

it 'imports vendor stylesheets' do
expect(subject).to contain("@import './vendor';")
expect(subject).to contain("@import 'vendor';")
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
subject { file('app/assets/stylesheets/application.scss') }

it 'imports layouts stylesheets' do
expect(subject).to contain("@import './layouts';")
expect(subject).to contain("@import 'layouts';")
end
end
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Variables
@import './variables';
@import 'variables';

// Dependencies

// Functions
@import './functions';
@import 'functions';

// Mixins

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@import './sizing';
@import 'sizing';

0 comments on commit 3270c1d

Please sign in to comment.