Skip to content

Adding bullseye back and fixing the grid gutters #76

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
kylebuch8 merged 2 commits into from
Jul 24, 2018
Merged

Adding bullseye back and fixing the grid gutters #76

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
c469aff
Adding bullseye back and fixing the grid gutters
kylebuch8 Jul 23, 2018
d4290a6
Merge branch 'master' into rh-layouts-story-bullseye
kylebuch8 Jul 24, 2018
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
15 changes: 15 additions & 0 deletions elements/rh-layouts/demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,21 @@ <h4>Code</h4>
</section>

</section>

<section>
<h2>Bullseye</h2>
<p>Used for centering all children (typically a single item) both vertically and horizontally within a parent element.</p>
<section>
<h3>Basic Bullseye</h3>
<div class="rh-l-bullseye">
<div class="rh-l-bullseye__item">Bam!</div>
</div>
<h4>Code</h4>
<pre><code class="lang-markup">&lt;div class="rh-l-bullseye"&gt;
&lt;div class="rh-l-bullseye__item"&gt;Bam!&lt;/div&gt;
&lt;/div&gt;</code></pre>
</section>
</section>
</article>

</body>
Expand Down
13 changes: 9 additions & 4 deletions elements/rh-layouts/rh-layouts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
.rh-l--text-align--right {
text-align: right; }

:root {
--rh-l-grid--m-gutter--GridGap: var(--rh--global--gutter, $rh-global--gutter); }

.rh-l-grid {
display: grid;
grid-template-columns: repeat(12, [col-start] 1fr); }
Expand Down Expand Up @@ -743,4 +740,12 @@
.rh-l-grid > .rh-m-12-row-on-xl {
grid-row: span 12; } }
.rh-l-grid.rh-m-gutters {
grid-gap: var(--rh-l-grid--m-gutter--GridGap); }
grid-gap: var(--rh-l-grid--m-gutter--GridGap, 1rem); }

.rh-l-bullseye {
display: flex;
align-items: center;
justify-content: center;
height: 100%;
padding: var(--rh-l-bullseye--Padding, 1rem);
margin: 0; }
1 change: 1 addition & 0 deletions elements/rh-layouts/rh-layouts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

@import "sass/alignments";
@import "sass/grid";
@import "sass/bullseye";
65 changes: 65 additions & 0 deletions elements/rh-layouts/rh-layouts.story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import { storiesOf } from "@storybook/polymer";

storiesOf("Layouts", module).add(
"rh-layouts",
() => `
<link rel="stylesheet" type="text/css" href="/rh-layouts/rh-base.css">
<link rel="stylesheet" type="text/css" href="/rh-layouts/rh-layouts.css">
<style>
body {
padding: 32px;
}
section {
padding: 32px;
margin-bottom: 32px;
border-radius: 2px;
background: #fff;
border: 1px solid rgb(234, 234, 234);
}
section > h3 {
position: relative;
margin: -32px -32px 1em;
padding: 8px 32px;
border-bottom: 1px solid rgb(234, 234, 234);
}
.rh-l-grid > * {
background: #e0d7ee;
padding: 8px;
}
.rh-l-bullseye {
background: #e0d7ee;
height: 200px;
}
</style>
<section>
<h3>Pure Grid</h3>
<div class="rh-l-grid rh-m-gutters rh-m-all-6-col rh-m-all-4-col-on-md rh-m-all-3-col-on-lg">
<div>Item</div>
<div>Item</div>
<div>Item</div>
<div>Item</div>
<div>Item</div>
</div>
</section>
<section>
<h3>Bootstrap-style Columns</h3>
<div class="rh-l-grid rh-m-gutters">
<div class="rh-l-grid__item">Default Item</div>
<div class="rh-l-grid__item rh-m-2-col"><code>rh-m-2-col</code></div>
<div class="rh-l-grid__item rh-m-10-col"><code>rh-m-10-col</code></div>
<div class="rh-l-grid__item rh-m-4-col"><code>rh-m-4-col</code></div>
<div class="rh-l-grid__item rh-m-4-col"><code>rh-m-4-col</code></div>
<div class="rh-l-grid__item rh-m-4-col"><code>rh-m-4-col</code></div>
<div class="rh-l-grid__item rh-m-6-col rh-m-3-col-on-md"><code>rh-m-6-col rh-m-3-col-on-md</code></div>
<div class="rh-l-grid__item rh-m-6-col rh-m-3-col-on-md rh-m-startat-7-col-on-md"><code>rh-m-6-col rh-m-3-col-on-md rh-m-startat-7-col-on-md</code></div>
<div class="rh-l-grid__item rh-m-6-col rh-m-3-col-on-md"><code>rh-m-6-col rh-m-3-col-on-md</code></div>
</div>
</section>
<section>
<h3>Basic Bullseye</h3>
<div class="rh-l-bullseye">
<div class="rh-l-bullseye__item">Bam!</div>
</div>
</section>
`
);
26 changes: 26 additions & 0 deletions elements/rh-layouts/sass/_bullseye.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// ============================================================================
// Note: There should be no direct HEX or other values in this file.
// Please reference RH-SASS variables.
// ============================================================================
//
// Global vars are named:
// `$rh-global--concept--PropertyTitleCase--modifier--state`
// For example:
// * $rh-global--color--primary
// * $rh-global--FontSize
// * --rh-theme--FontSize--heading--xs

// Component/Element vars are named:
// `$rh-c-block__element--modifier--state--PropertyTitleCase`
// For example:
// * --rh-dropdown--heading--FontSize
// * --cp-accordion--heading--FontSize

.rh-l-bullseye {
display: flex;
align-items: center;
justify-content: center;
height: 100%;
padding: var(--rh-l-bullseye--Padding, $rh-global--spacer);
margin: 0;
}
10 changes: 6 additions & 4 deletions elements/rh-layouts/sass/_grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
// * --rh-dropdown--heading--FontSize
// * --cp-accordion--heading--FontSize

:root {
--rh-l-grid--m-gutter--GridGap: var(--rh--global--gutter, $rh-global--gutter);
}
// $rh-global--gutter: $rh-global--spacer;
//
// :root {
// --rh-l-grid--m-gutter--GridGap: var(--rh--global--gutter, $rh-global--gutter);
// }

/// Media query used to create responsive grid items
/// @group mixins
Expand Down Expand Up @@ -125,6 +127,6 @@
}

&.rh-m-gutters {
grid-gap: var(--rh-l-grid--m-gutter--GridGap);
grid-gap: var(--rh-l-grid--m-gutter--GridGap, $rh-global--spacer);
}
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"postinstall": "npm run bootstrap && npm run wct-kludge",
"precommit": "npm run update-test-suite > /dev/null && lint-staged",
"update-test-suite": "node scripts/test-suite-inject.js",
"storybook": "start-storybook -c .storybook -p 9001",
"storybook": "start-storybook -c .storybook -p 9001 -s ./elements",
"build-storybook": "build-storybook -c .storybook -o .storybook_out",
"new": "cd elements && yo rhelement && npm run update-test-suite"
},
Expand Down