Skip to content

Styleguide generator improvements #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nicolas-brousse wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Styleguide generator improvements #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fd8152
Improve styleguide css to use vanilla css
nicolas-brousse Nov 20, 2019
dec7b10
Add link to styleguide logo header
nicolas-brousse Nov 20, 2019
e29a335
Create global css for styleguide with some css reset
nicolas-brousse Nov 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/generators/komponent/templates/styleguide/components/container/komponent_container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
margin: 40px 60px 0 300px;
}

.komponent-code {
background-color: #333;
color: #fff;
margin: 10px 0;
padding: 10px;
}
.komponent-footer .komponent-code {
Copy link
Copy Markdown
Collaborator

@Spone Spone Nov 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nicolas-brousse Why do you add .komponent-footer?

Copy link
Copy Markdown
Collaborator

@Spone Spone Nov 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
.komponent-footer .komponent-code {
.komponent-container .komponent-code {

Copy link
Copy Markdown
Member Author

@nicolas-brousse nicolas-brousse Nov 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a mistake, too mush copy and paste ...

background-color: #333;
color: #fff;
margin: 10px 0;
padding: 10px;
}

/* stylelint-enable */
22 changes: 11 additions & 11 deletions lib/generators/komponent/templates/styleguide/components/footer/komponent_footer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
position: fixed;
right: 30px;
text-align: center;
}

&,
a {
color: #999;
}
.komponent-footer,
.komponent-footer a {
color: #999;
}

a {
text-decoration: none;
.komponent-footer a {
text-decoration: none;
}

&:hover,
&:focus {
color: #0038ea;
}
}
.komponent-footer a:hover,
.komponent-footer a:focus {
color: #0038ea;
}

/* stylelint-enable */
4 changes: 3 additions & 1 deletion lib/generators/komponent/templates/styleguide/components/header/_komponent_header.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<div class="komponent-header">
<div class="logo">Styleguide</div>
<div class="logo">
<%= link_to "Styleguide", styleguide_index_path %>
</div>
</div>
5 changes: 5 additions & 0 deletions lib/generators/komponent/templates/styleguide/components/header/komponent_header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,9 @@
padding: 0 20px;
}

.komponent-header .logo a {
color: white;
text-decoration: none;
}

/* stylelint-enable */
1 change: 1 addition & 0 deletions lib/generators/komponent/templates/styleguide/components/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import "./style.css";
Copy link
Copy Markdown
Collaborator

@Spone Spone Nov 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer to name this file _defaults.css

Copy link
Copy Markdown
Member Author

@nicolas-brousse nicolas-brousse Nov 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good to me.

import "components/komponent/container/komponent_container";
import "components/komponent/footer/komponent_footer";
import "components/komponent/header/komponent_header";
Expand Down
46 changes: 23 additions & 23 deletions lib/generators/komponent/templates/styleguide/components/sidebar/komponent_sidebar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,33 @@
position: absolute;
top: 60px;
width: 240px;
}

&-title {
color: #0038ea;
font-size: 14px;
font-weight: bold;
letter-spacing: 1px;
margin: 0 0 20px;
text-transform: uppercase;
}
.komponent-sidebar-title {
color: #0038ea;
font-size: 14px;
font-weight: bold;
letter-spacing: 1px;
margin: 0 0 20px;
text-transform: uppercase;
}

&-items {
font-size: 14px;
letter-spacing: 0;
line-height: 1.25;
list-style: none;
margin: 0 0 30px;
padding: 0;
}
.komponent-sidebar-items {
font-size: 14px;
letter-spacing: 0;
line-height: 1.25;
list-style: none;
margin: 0 0 30px;
padding: 0;
}

&-item {
margin: 0 0 5px;
}
.komponent-sidebar-item {
margin: 0 0 5px;
}

a {
color: #333;
text-decoration: none;
}
.komponent-sidebar a {
color: #333;
text-decoration: none;
}

/* stylelint-enable */
3 changes: 3 additions & 0 deletions lib/generators/komponent/templates/styleguide/components/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
body {
margin: 0;
}
4 changes: 2 additions & 2 deletions lib/generators/komponent/templates/styleguide/packs/komponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import 'components';
import 'components/komponent';
import "components";
import "components/komponent";