Skip to content
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.

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

ZeroClipboard replaced by clipboard.js #7629

Closed
Prev Previous commit
Next Next commit
Fixed merge conflicts
colin-marshall committed Dec 19, 2015

Verified

This commit was signed with the committer’s verified signature.
commit a56e47a0ea227fa7dd077fbc48424cbb564dbf95
36 changes: 36 additions & 0 deletions docs/pages/flex-grid.md
Original file line number Diff line number Diff line change
@@ -226,6 +226,42 @@ The same alignment classes can also be applied to individual columns.

---

## Collapse/Uncollapse Rows

The `.collapse` class lets you remove column gutters (padding).

There are times when you won't want each media query to be collapsed or uncollapsed. In this case, use the media query size you want and collapse or uncollapse and add that to your row element. Example shows no gutter at small media size and then adds the gutter to columns at medium.

```html
<div class="row medium-uncollapse large-collapse">
<div class="small-6 columns">
Removes gutter at large media query
</div>
<div class="small-6 columns">
Removes gutter at large media query
</div>
</div>
```

<p class="lead">Scale the browser down to a medium size to see the difference.</p>

<div class="row medium-uncollapse large-collapse">
<div class="small-6 columns">
<div class="callout secondary">
<p class="show-for-medium-only">On a medium screen, I have gutters!</p>
<p class="show-for-large-up">On a large screen, I have no gutters!</p>
</div>
</div>
<div class="small-6 columns">
<div class="callout secondary">
<p class="show-for-medium-only">On a medium screen, I have gutters!</p>
<p class="show-for-large-up">On a large screen, I have no gutters!</p>
</div>
</div>
</div>

---

## Offsets

Offsets work identically to the float grid, by applying `margin-left` to a column.
3 changes: 0 additions & 3 deletions foundation-flex.scss

This file was deleted.

3 changes: 0 additions & 3 deletions foundation.scss

This file was deleted.

2 changes: 2 additions & 0 deletions scss/_global.scss
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@
// foundation.zurb.com
// Licensed under MIT Open Source

// scss-lint:disable ColorVariable, QualifyingElement, VendorPrefix

////
/// @group global
////
2 changes: 1 addition & 1 deletion scss/components/_callout.scss
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ $callout-link-tint: 30% !default;
}

&.small {
@include callout-size(.5rem);
@include callout-size(0.5rem);
}

&.large {
7 changes: 6 additions & 1 deletion scss/components/_dropdown-menu.scss
Original file line number Diff line number Diff line change
@@ -50,18 +50,21 @@ $dropdownmenu-border-width: nth($dropdownmenu-border, 1);
padding-#{$global-right}: 1.5rem;
position: relative;
}

&.is-down-arrow > a::after {
@include css-triangle(5px, $dropdownmenu-arrow-color, down);
position: absolute;
top: rem-calc(2px) + rem-calc(get-side($menu-item-padding, top));
#{$global-right}: 5px;
}

&.is-left-arrow > a::after {
@include css-triangle(5px, $dropdownmenu-arrow-color, left);
float: left;
margin-left: 0;
margin-right: 10px;
}

&.is-right-arrow > a::after {
@include css-triangle(5px, $dropdownmenu-arrow-color, right);
}
@@ -71,10 +74,12 @@ $dropdownmenu-border-width: nth($dropdownmenu-border, 1);
right: 0;
left: auto;
}

&.is-right-arrow.opens-inner .submenu {
left: 0;
right: auto;
}

&.opens-inner .submenu {
top: 100%;
}
@@ -94,7 +99,7 @@ $dropdownmenu-border-width: nth($dropdownmenu-border, 1);
background: $dropdownmenu-background;
border: $dropdownmenu-border;

@if (type_of($dropdownmenu-border-width) == 'number') {
@if (type-of($dropdownmenu-border-width) == 'number') {
margin-top: (-$dropdownmenu-border-width);
}

3 changes: 2 additions & 1 deletion scss/components/_off-canvas.scss
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ $maincontent-shadow: 0 0 10px rgba($black, 0.5) !default;
z-index: $offcanvas-zindex;
max-height: 100%;
overflow-y: auto;
transform: translateX(0px);
transform: translateX(0);
}

@mixin off-canvas-position(
@@ -170,6 +170,7 @@ $maincontent-shadow: 0 0 10px rgba($black, 0.5) !default;
.position-left.reveal-for-#{$name} {
@include off-canvas-reveal(left);
}

.position-right.reveal-for-#{$name} {
@include off-canvas-reveal(right);
}
1 change: 1 addition & 0 deletions scss/components/_orbit.scss
Original file line number Diff line number Diff line change
@@ -67,6 +67,7 @@ $orbit-control-zindex: 10 !default;
@mixin orbit-slide {
width: 100%;
max-height: 100%;

&.no-motionui {
&.is-active {
top: 0;
8 changes: 4 additions & 4 deletions scss/components/_reveal.scss
Original file line number Diff line number Diff line change
@@ -63,8 +63,7 @@ $reveal-overlay-background: rgba($black, 0.45) !default;
z-index: $reveal-zindex + 1;
padding: $reveal-padding;
border: $reveal-border;
// margin: 100px auto 0 100px;
margin: 100px auto 0 auto;
margin: 100px auto 0;
background-color: $reveal-background;
border-radius: $reveal-radius;

@@ -109,14 +108,14 @@ $reveal-overlay-background: rgba($black, 0.45) !default;
min-height: 100vh;
max-width: none;
margin-left: 0;
border: none;
border: 0;
}

@mixin foundation-reveal {
body.is-reveal-open {
overflow: hidden;
}

// Overlay
.reveal-overlay {
@include reveal-overlay;
@@ -128,6 +127,7 @@ $reveal-overlay-background: rgba($black, 0.45) !default;
@include reveal-modal-width($reveal-width);
position: absolute;
overflow-y: auto;

// Remove padding
&.collapse {
padding: 0;
2 changes: 1 addition & 1 deletion scss/components/_sticky.scss
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
.sticky {
position: absolute;
z-index: 0;
transform: translate3d(0,0,0);
transform: translate3d(0, 0, 0);
}

.sticky.is-stuck {
3 changes: 2 additions & 1 deletion scss/components/_table.scss
Original file line number Diff line number Diff line change
@@ -170,7 +170,8 @@ $show-header-for-stacked: false !default;
display: none;
}
}
} @else {
}
@else {
thead {
display: none;
}
6 changes: 3 additions & 3 deletions scss/components/_tabs.scss
Original file line number Diff line number Diff line change
@@ -85,7 +85,7 @@ $tab-content-padding: 1rem !default;
&:hover {
background: $tab-item-background-hover;
}

&:focus,
&[aria-selected='true'] {
background: $tab-background-active;
@@ -124,7 +124,7 @@ $tab-content-padding: 1rem !default;

// Vertical
.tabs.vertical {
@include tabs-container-vertical;
@include tabs-container-vertical;
}

// Simple
@@ -165,6 +165,6 @@ $tab-content-padding: 1rem !default;
}

.tabs-panel {
@include tabs-panel;
@include tabs-panel;
}
}
12 changes: 8 additions & 4 deletions scss/components/_top-bar.scss
Original file line number Diff line number Diff line change
@@ -42,16 +42,17 @@ $topbar-input-width: 200px !default;
}

input.button {
width:auto;
width: auto;
}
}

/// makes sections stacked
@mixin top-bar-stacked() {
@mixin top-bar-stacked {
// Sub-sections
.top-bar-right {
width: 100%;
}

.top-bar-left {
width: 100%;
}
@@ -62,15 +63,17 @@ $topbar-input-width: 200px !default;
.top-bar {
@include top-bar-container;
}
// generate classes for stacking on each screen size (defined in $breakpoint-classes)

// Generate classes for stacking on each screen size (defined in $breakpoint-classes)
@each $size in $breakpoint-classes {
.stacked-for-#{$size} {
@include breakpoint($size down) {
@include top-bar-stacked;
}
}
}
// stack on small screens as default

// Stack on small screens as default
@include breakpoint(small down) {
@include top-bar-stacked;
}
@@ -79,6 +82,7 @@ $topbar-input-width: 200px !default;
.top-bar-left {
float: left;
}

.top-bar-right {
float: right;
}
6 changes: 3 additions & 3 deletions scss/forms/_input-group.scss
Original file line number Diff line number Diff line change
@@ -30,12 +30,12 @@ $input-prefix-padding: 1rem !default;
width: 100%;
margin-bottom: $form-spacing;

& > *:first-child {
> :first-child {
border-radius: $global-radius 0 0 $global-radius;
}

& > *:last-child {
& > * {
> :last-child {
> * {
border-radius: 0 $global-radius $global-radius 0;
}
}
1 change: 1 addition & 0 deletions scss/forms/_text.scss
Original file line number Diff line number Diff line change
@@ -134,6 +134,7 @@ $input-radius: $global-radius !default;
}

// Reset Normalize setting content-box to search elements
// scss-lint:disable QualifyingElement
input[type='search'] {
box-sizing: border-box;
}
2 changes: 1 addition & 1 deletion scss/grid/_column.scss
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@
) {
@include grid-row;
@include grid-column($gutter: $gutter);

&,
&:last-child {
float: none;
17 changes: 17 additions & 0 deletions scss/grid/_flex-grid.scss
Original file line number Diff line number Diff line change
@@ -105,6 +105,10 @@
&.expanded {
max-width: none;
}

&.collapse {
> .column { @include grid-col-collapse; }
}
}

// Column
@@ -145,6 +149,19 @@
flex: flex-grid-column(shrink);
}

// Responsive collapsing
@each $size in $breakpoint-classes {
@include breakpoint($size) {
&.#{$size}-collapse {
> .column { @include grid-col-collapse; }
}

&.#{$size}-uncollapse {
> .column { @include grid-col-uncollapse; }
}
}
}

// Auto-stacking/unstacking
@each $size in $breakpoint-classes {
@if $size != small {
6 changes: 3 additions & 3 deletions scss/grid/_gutter.scss
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
////

/// Collapse the gutters on a column by removing the padding.
@mixin grid-column-collapse() {
@mixin grid-column-collapse {
padding-left: 0;
padding-right: 0;
}
@@ -23,12 +23,12 @@

/// Shorthand for `grid-column-collapse()`.
/// @alias grid-column-collapse
@mixin grid-col-collapse() {
@mixin grid-col-collapse {
@include grid-column-collapse;
}

/// Shorthand for `grid-column-uncollapse()`.
/// @alias grid-column-uncollapse
@mixin grid-col-uncollapse() {
@mixin grid-col-uncollapse {
@include grid-column-uncollapse;
}
22 changes: 11 additions & 11 deletions scss/typography/_alignment.scss
Original file line number Diff line number Diff line change
@@ -3,20 +3,20 @@
// Licensed under MIT Open Source

@mixin foundation-text-alignment {
@each $size in $breakpoint-classes {
@include breakpoint($size) {
@each $align in (left, right, center, justify) {
@if $size != 'small' {
.#{$size}-text-#{$align} {
text-align: $align;
}
@each $size in $breakpoint-classes {
@include breakpoint($size) {
@each $align in (left, right, center, justify) {
@if $size != 'small' {
.#{$size}-text-#{$align} {
text-align: $align;
}
@else {
.text-#{$align} {
text-align: $align;
}
}
@else {
.text-#{$align} {
text-align: $align;
}
}
}
}
}
}
4 changes: 3 additions & 1 deletion scss/typography/_base.scss
Original file line number Diff line number Diff line change
@@ -306,7 +306,9 @@ $abbr-underline: 1px dotted $black !default;
@each $size, $headers in $header-sizes {
@include breakpoint($size) {
@each $header, $font-size in $headers {
#{$header} { font-size: rem-calc($font-size); }
#{$header} {
font-size: rem-calc($font-size);
}
}
}
}
2 changes: 1 addition & 1 deletion scss/util/_mixins.scss
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@
/// @param {Number} $weight - Height of individual bars in the icon.
/// @param {Number} $bars - Number of bars in the icon.
@mixin hamburger(
$color: black,
$color: #000,
$color-hover: #666,
$width: 20px,
$height: 16px,
You are viewing a condensed version of this merge commit. You can view the full changes here.