Skip to content
Permalink
Browse files

Merge pull request #1137 from salesforce-ux/chore/root-index

Move shared styles to root index
  • Loading branch information...
Kaelig
Kaelig committed Jun 27, 2016
2 parents 841f96d + d02ed1f commit de2dc7f6bd5aff31998fb43254d438ec9cec8dc3
@@ -12,29 +12,32 @@
@import

// Activity Timeline
'activity-timeline/flavors/base/index',
'activity-timeline/index',

// Badges
'badges/index',

// Breadcrumbs
'breadcrumbs/flavors/base/index',
'breadcrumbs/index',

// Button Groups
'button-groups/flavors/base/index',
'button-groups/index',

// Button
'buttons/flavors/base/index',
'buttons/flavors/stateful/index',
'buttons/flavors/icon/index',

// Icons
'icons/flavors/base/index',
'icons/index',
'icons/flavors/icon-colors/index',
'icons/flavors/background-colors/index',
'icons/flavors/sizes/index',

// Card
'cards/flavors/base/index',
'cards/index',

// Forms
'forms/index',
'forms/flavors/input/index',
'forms/flavors/textarea/index',
'forms/flavors/radio/index',
@@ -45,44 +48,44 @@
'forms/flavors/checkbox-alternate/index',
'forms/flavors/multi-select/index',
'forms/flavors/edit-dialog-for-touch/index',
'forms/flavors/form-element/index',
'forms/flavors/horizontal-form/index',
'forms/flavors/stacked-form/index',
'forms/flavors/inline-form/index',
'forms/flavors/compound-form/index',

// Tooltip
// Tooltip - This is deprecated
'tooltips/flavors/base/index',

// Page Headers
'page-headers/flavors/base/index',
'page-headers/index',
'page-headers/flavors/record-home/index',

// Panels
'panels/flavors/detail/index',
'panels/index',

// Popovers
'popovers/flavors/base/index',
'popovers/index',
'popovers/flavors/tooltips/index',
'popovers/flavors/panels/index',
'popovers/flavors/nubbins/index',

// Menus
'menus/flavors/dropdown/index',
'menus/index',
'menus/flavors/picklist/index',
'menus/flavors/action-overflow/index',
'menus/flavors/action-overflow-for-touch/index',

// Datepicker
'datepickers/flavors/base/index',
'datepickers/index',
'datepickers/flavors/time/index',

// Docked Composer
'docked-composer/flavors/base/index',
'docked-composer/index',
'docked-composer/flavors/email/index',
'docked-composer/flavors/task/index',

// Publishers
'publishers/index',
'publishers/flavors/discussion-feed/index',
'publishers/flavors/comment/index',

@@ -91,24 +94,25 @@
'feeds/flavors/comment/index',

// Modal
'modals/flavors/base/index',
'modals/index',

// Pills
'pills/flavors/base/index',
'pills/index',

// Process
'process/flavors/wizard/index',
'process/flavors/sales-path-coach/index',

// Spinners
'spinners/index',
'spinners/flavors/small/index',
'spinners/flavors/medium/index',
'spinners/flavors/large/index',
'spinners/flavors/brand-small/index',
'spinners/flavors/inverse-small/index',

// Title
'tiles/flavors/base/index',
'tiles/index',
'tiles/flavors/board/index',

// Tabs
@@ -131,9 +135,6 @@
// Images
'images/flavors/avatar/index',

// Badges
'badges/flavors/base/index',

// Tables
'data-tables/index',
'data-tables/flavors/responsive/index',
@@ -0,0 +1,44 @@
// Copyright (c) 2015, salesforce.com, inc. All rights reserved.

// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
// Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.



.#{$css-prefix}breadcrumb {

.#{$css-prefix}list__item,
&__item {
position: relative;

&:before {
content: '\003E';
position: absolute;
left: (($spacing-x-small / 2) * -1);
}

> a {
display: block;
padding: 0 $spacing-x-small;

&:hover {
text-decoration: none;
}
}

&:first-child {

> a {
padding-left: 0;
}

&:before {
content: '';
}
}
}
}

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -0,0 +1,58 @@
// Copyright (c) 2015, salesforce.com, inc. All rights reserved.

// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
// Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


.#{$css-prefix}icon_container,
.#{$css-prefix}icon__container {

@include deprecate('4.0.0', '#{$css-prefix}icon__container is deprecated. Use #{$css-prefix}icon_container instead.');
display: inline-block;
border-radius: $border-radius-medium;

&--circle {
padding: $spacing-x-small;
border-radius: $border-radius-circle;
}
}

.#{$css-prefix}icon {
@include square($square-icon-medium-boundary);
border-radius: $border-radius-medium;
fill: $color-text-icon-inverse;
}

@each $name, $color in $bg-actions-map {
.#{$css-prefix}icon-#{$name} {
background-color: $color;
}
}

// TODO: Depend on a correct map to generate icons named slds-icon-custom-customXX
@each $name, $color in $bg-custom-map {
$prefix-length: str-length('custom-');
// In Sass, str-slice's first character is 1 (instead of 0 in other languages)
// so we need to add +1 when slicing
$id: str-slice($name, $prefix-length + 1);

// We generate both icons named:
// 1. slds-icon-custom-customXX (new: consistent with icon names)
// 2. slds-icon-custom-XX (legacy: depends on a map that is inconsistent with icon names)
@include deprecate('4.0.0', 'slds-icon-custom-XX classes are deprecated, use slds-icon-custom-customXX instead');
.#{$css-prefix}icon-custom-custom#{$id},
.#{$css-prefix}icon-#{$name} {
background-color: $color;
color: $color-text-inverse; // This is for text based icon created with just the first letters of the words
}
}

@each $name, $color in $bg-standard-map {
.#{$css-prefix}icon-standard-#{$name} {
background-color: $color;
}
}
@@ -7,7 +7,19 @@

// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.#{$css-prefix}panel {
background: $color-background-alt;
border-radius: $border-radius-medium;

.#{$css-prefix}icon-text-error {
fill: $color-text-error;
&__section {
padding: $spacing-medium;
}

&__actions {
padding: $spacing-small;
}

&.#{$css-prefix}is-editing {
box-shadow: $shadow-drop-down;
}
}
@@ -0,0 +1,46 @@
// Copyright (c) 2015, salesforce.com, inc. All rights reserved.

// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
// Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.#{$css-prefix}publisher {

&.#{$css-prefix}is-active {

.#{$css-prefix}publisher__toggle-visibility {
display: inherit;
}

.#{$css-prefix}publisher__input {
line-height: $line-height-text;
height: auto;
max-height: 10rem;
resize: vertical;
padding: {
top: $spacing-small;
bottom: $spacing-small;
}
}
}

&__input {
line-height: $line-height-button;
padding: 0 $spacing-medium;
resize: none;
min-height: calc(#{$line-height-button} + 2px);
max-height: calc(#{$line-height-button} + 2px);
width: 100%;
}

&__actions > .#{$css-prefix}button {
margin-left: $spacing-small;
}

.#{$css-prefix}publisher__toggle-visibility {
display: none;
}
}
@@ -7,43 +7,6 @@

// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.#{$css-prefix}publisher {

&.#{$css-prefix}is-active {

.#{$css-prefix}publisher__toggle-visibility {
display: inherit;
}

.#{$css-prefix}publisher__input {
line-height: $line-height-text;
height: auto;
max-height: 10rem;
resize: vertical;
padding: {
top: $spacing-small;
bottom: $spacing-small;
}
}
}

&__input {
line-height: $line-height-button;
padding: 0 $spacing-medium;
resize: none;
min-height: calc(#{$line-height-button} + 2px);
max-height: calc(#{$line-height-button} + 2px);
width: 100%;
}

&__actions > .#{$css-prefix}button {
margin-left: $spacing-small;
}

.#{$css-prefix}publisher__toggle-visibility {
display: none;
}
}

.#{$css-prefix}publisher--discussion {
display: flex;
Oops, something went wrong.

0 comments on commit de2dc7f

Please sign in to comment.
You can’t perform that action at this time.