Skip to content

Rebrand - Add full-width class to icon bullet list #51182

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

Merged
kelbyhawn merged 2 commits into from
Apr 11, 2023
Merged

Rebrand - Add full-width class to icon bullet list #51182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
597b622
add full-width class to icon bullet list
kelbyhawn Apr 6, 2023
07e7ab2
Merge branch 'staging' into rebrand-icon-list-style-update
kelbyhawn Apr 7, 2023
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
8 changes: 8 additions & 0 deletions pegasus/sites.v3/code.org/public/css/design-system-pegasus.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,14 @@ ul {
justify-content: space-between;
flex-wrap: wrap;

// Use this class if list items need to
// stretch to the width of the container
&.full-width {
li {
width: 100%
}
}

li {
padding-left: 0 !important;
text-indent: 0 !important;
Expand Down
7 changes: 0 additions & 7 deletions pegasus/sites.v3/code.org/public/css/maker-styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@ section.device-setup { // /maker/circuitplayground
.flex-container {
flex-wrap: wrap;
}

ul.icon-bullet-list {

li {
width: 100%;
}
}
}

@media screen and (max-width: $width-sm) {
Expand Down
4 changes: 2 additions & 2 deletions pegasus/sites.v3/code.org/public/maker/circuitplayground.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ theme: responsive_full_width
%h1 The Circuit Playground
%p.h5-lookalike-style The Circuit Playground is a family of small microcontroller boards with LEDs, buttons, and sensors built in.
%div.flex-container
%ul.icon-bullet-list.col-60
%ul.icon-bullet-list.full-width.col-60
%li
%div
%i{class: "#{icon_stars}"}
Expand All @@ -47,7 +47,7 @@ theme: responsive_full_width
%h2 Device setup requirements
%p The Circuit Playground is a series of circuit boards produced by Adafruit with a variety of sensors and outputs built in.
%p <strong>There are three variants of the Circuit Playground, two are compatible with App Lab and one of them is not:</strong>
%ul.icon-bullet-list{style: "margin-top: 0"}
%ul.icon-bullet-list.full-width{style: "margin-top: 0"}
%li
%div
%i{class: "#{icon_circle_check}", style: "color: #3EA33E"}
Expand Down
2 changes: 1 addition & 1 deletion pegasus/sites.v3/code.org/public/maker/index.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ theme: responsive_full_width
%h2 Why physical computing?
%p Learning about physical computing requires time on and off the computer. As a result of this different learning dynamic, there are some unique benefits of learning computer science through physical computing.
%div.flex-container
%ul.icon-bullet-list.col-45
%ul.icon-bullet-list.full-width.col-45
%li
%div
%i{class: "#{icon_microchip}"}
Expand Down
4 changes: 2 additions & 2 deletions pegasus/sites.v3/code.org/public/maker/microbit.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ theme: responsive_full_width
%div
%iframe{src: "https://www.youtube-nocookie.com/embed/u2u7UJSRuko", allowFullScreen: 'true', frameborder: '0', title: "Introduction to the BBC micro:bit"}
%div.flex-container.col-45{style: "float: right"}
%ul.icon-bullet-list
%ul.icon-bullet-list.full-width
%li
%div
%i{class: "#{icon_stars}"}
Expand All @@ -49,7 +49,7 @@ theme: responsive_full_width
.text-wrapper.col-75
%p The micro:bit is a pocket-sized computer with an LED light display, buttons, sensors and many input/output features that you can program and physically interact with.
%p <strong>There are two versions of the micro:bit and both of them work with the Maker unit:</strong>
%ul.icon-bullet-list{style: "margin-top: 0"}
%ul.icon-bullet-list.full-width{style: "margin-top: 0"}
%li
%div
%i{class: "#{icon_circle_check}", style: "color: #3EA33E"}
Expand Down