Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/fabric-website/src/data/colors-accent.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
},
{
"name": "blue",
"value": "#0078d7",
"value": "#0078d4",
"labelColorClass": "ms-fontColor-white"
},
{
Expand Down
2 changes: 1 addition & 1 deletion apps/fabric-website/src/data/colors-theme.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
{
"name": "themePrimary",
"value": "#0078d7",
"value": "#0078d4",
"labelColorClass": "ms-fontColor-white"
},
{
Expand Down
2 changes: 1 addition & 1 deletion apps/fabric-website/src/styles/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// Colors (all taken from the MDL2 palette)
$color-home-darker: #004e8c;
$color-home-dark: #0063b1;
$color-home-medium: #0078d7;
$color-home-medium: #0078d4;
$color-home-light: #3a96dd;
$color-home-lighter: #b3dbf2;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/example-app-base",
"comment": "ThemePrimary: Updating this color along with an Office branding update.",
"type": "minor"
}
],
"packageName": "@uifabric/example-app-base",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/fabric-website",
"comment": "ThemePrimary: Updating this color along with an Office branding update.",
"type": "minor"
}
],
"packageName": "@uifabric/fabric-website",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/styling",
"comment": "ThemePrimary: Updating this color along with an Office branding update.",
"type": "minor"
}
],
"packageName": "@uifabric/styling",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/variants",
"comment": "ThemePrimary: Updating this color along with an Office branding update.",
"type": "minor"
}
],
"packageName": "@uifabric/variants",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "ThemePrimary: Updating this color along with an Office branding update.",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
2 changes: 1 addition & 1 deletion ghdocs/Theming.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Theming is a mechanism by which a consistent look and feel can be applied to all

## What's in a theme?
A theme is defined by a simple collection of variables (which we call slots) with string values.
For example, `themePrimary` by default is `"#0078d7"`, but it could easily be `"rgba(0, 120, 215)"`.
For example, `themePrimary` by default is `"#0078d4"`, but it could easily be `"rgba(0, 120, 212)"`.


## What are theme slots?
Expand Down
4 changes: 2 additions & 2 deletions packages/example-app-base/src/common/_themeOverrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$ms-color-themeDarker: "[theme:themeDarker, default: #004578]";
$ms-color-themeDark: "[theme:themeDark, default: #005a9e]";
$ms-color-themeDarkAlt: "[theme:themeDarkAlt, default: #106ebe]";
$ms-color-themePrimary: "[theme:themePrimary, default: #0078d7]";
$ms-color-themePrimary: "[theme:themePrimary, default: #0078d4]";
$ms-color-themeSecondary: "[theme:themeSecondary, default: #2b88d8]";
$ms-color-themeTertiary: "[theme:themeTertiary, default: #71afe5]";
$ms-color-themeLight: "[theme:themeLight, default: #c7e0f4]";
Expand Down Expand Up @@ -38,7 +38,7 @@ $ms-color-purple: "[theme:purple, default: #5c2d91]";
$ms-color-purpleLight: "[theme:purpleLight, default: #b4a0ff]";
$ms-color-blueDark: "[theme:blueDark, default: #002050]";
$ms-color-blueMid: "[theme:blueMid, default: #00188f]";
$ms-color-blue: "[theme:blue, default: #0078d7]";
$ms-color-blue: "[theme:blue, default: #0078d4]";
$ms-color-blueLight: "[theme:blueLight, default: #00bcf2]";
$ms-color-tealDark: "[theme:tealDark, default: #004b50]";
$ms-color-teal: "[theme:teal, default: #008272]";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ $successBackgroundColor: "[theme:successBackground, default: rgba(186,216,10,.2)
$inputBackgroundColor: "[theme:inputBackground, default: #ffffff]";
$inputBorderColor: "[theme:inputBorder, default: #a6a6a6]";
$inputBorderHoveredColor: "[theme:inputBorderHovered, default: #212121]";
$inputBackgroundCheckedColor: "[theme:inputBackgroundChecked, default: #0078d7]";
$inputBackgroundCheckedColor: "[theme:inputBackgroundChecked, default: #0078d4]";
$inputBackgroundCheckedHoveredColor: "[theme:inputBackgroundCheckedHovered, default: #106ebe]";
$inputForegroundCheckedColor: "[theme:inputForegroundChecked, default: #ffffff]";
$inputFocusBorderAltColor: "[theme:inputFocusBorderAlt, default: #0078d7]";
$inputFocusBorderAltColor: "[theme:inputFocusBorderAlt, default: #0078d4]";
$smallInputBorderColor: "[theme:inputBorder, default: #666666]";
$inputPlaceholderTextColor: "[theme:inputPlaceholderText, default: #666666]";

Expand All @@ -44,8 +44,8 @@ $buttonTextCheckedHoveredColor: "[theme:buttonTextCheckedHovered, default: #0000
/* Menus */
$menuItemBackgroundHoveredColor: "[theme:menuItemBackgroundHovered, default: #f8f8f8]";
$menuItemBackgroundCheckedColor: "[theme:menuItemBackgroundChecked, default: #eaeaea]";
$menuIconColor: "[theme:menuIcon, default: #0078d7]";
$menuHeaderColor: "[theme:menuHeader, default: #0078d7]";
$menuIconColor: "[theme:menuIcon, default: #0078d4]";
$menuHeaderColor: "[theme:menuHeader, default: #0078d4]";

/* Lists */
$listBackgroundColor: "[theme:listBackground, default: #ffffff]";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$ms-color-themeDarker: "[theme:themeDarker, default: #004578]";
$ms-color-themeDark: "[theme:themeDark, default: #005a9e]";
$ms-color-themeDarkAlt: "[theme:themeDarkAlt, default: #106ebe]";
$ms-color-themePrimary: "[theme:themePrimary, default: #0078d7]";
$ms-color-themePrimary: "[theme:themePrimary, default: #0078d4]";
$ms-color-themeSecondary: "[theme:themeSecondary, default: #2b88d8]";
$ms-color-themeTertiary: "[theme:themeTertiary, default: #71afe5]";
$ms-color-themeLight: "[theme:themeLight, default: #c7e0f4]";
Expand Down Expand Up @@ -40,7 +40,7 @@ $ms-color-purple: "[theme:purple, default: #5c2d91]";
$ms-color-purpleLight: "[theme:purpleLight, default: #b4a0ff]";
$ms-color-blueDark: "[theme:blueDark, default: #002050]";
$ms-color-blueMid: "[theme:blueMid, default: #00188f]";
$ms-color-blue: "[theme:blue, default: #0078d7]";
$ms-color-blue: "[theme:blue, default: #0078d4]";
$ms-color-blueLight: "[theme:blueLight, default: #00bcf2]";
$ms-color-tealDark: "[theme:tealDark, default: #004b50]";
$ms-color-teal: "[theme:teal, default: #008272]";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ exports[`ActivityItem renders compact with a single persona correctly 1`] = `
className=
ms-ActivityItem-activityTypeIcon
{
color: #0078d7;
color: #0078d4;
font-size: 13px;
height: 16px;
line-height: 13px;
Expand Down Expand Up @@ -175,7 +175,7 @@ exports[`ActivityItem renders compact with an icon correctly 1`] = `
className=
ms-ActivityItem-activityTypeIcon
{
color: #0078d7;
color: #0078d4;
font-size: 13px;
height: 16px;
line-height: 13px;
Expand Down Expand Up @@ -254,7 +254,7 @@ exports[`ActivityItem renders compact with multiple personas correctly 1`] = `
className=
ms-ActivityItem-activityTypeIcon
{
color: #0078d7;
color: #0078d4;
font-size: 13px;
height: 16px;
line-height: 13px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ exports[`Breadcrumb renders breadcumb correctly 2`] = `
color: #004578;
}
&:active {
color: #0078d7;
color: #0078d4;
}
data-is-focusable={true}
disabled={undefined}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ exports[`Button renders ActionButton correctly 1`] = `
z-index: 1;
}
&:hover {
color: #0078d7;
color: #0078d4;
}
&:hover .ms-Button-icon {
color: #0078d7;
color: #0078d4;
}
&:active {
color: #000000;
Expand Down Expand Up @@ -531,7 +531,7 @@ exports[`Button renders IconButton correctly 1`] = `
color: #004578;
}
&:active {
color: #0078d7;
color: #0078d4;
}
data-is-focusable={true}
disabled={undefined}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ exports[`ComboBox Renders ComboBox correctly 1`] = `
display: none;
}
&.is-open {
border-color: #0078d7;
border-color: #0078d4;
}
@media screen and (-ms-high-contrast: active){&.is-open {
-ms-high-contrast-adjust: none;
Expand All @@ -70,7 +70,7 @@ exports[`ComboBox Renders ComboBox correctly 1`] = `
color: HighlightText;
}
&:active {
border-color: #0078d7;
border-color: #0078d4;
}
@media screen and (-ms-high-contrast: active){&:active {
-ms-high-contrast-adjust: none;
Expand All @@ -87,7 +87,7 @@ exports[`ComboBox Renders ComboBox correctly 1`] = `
top: -2px;
}
&:focus {
border-color: #0078d7;
border-color: #0078d4;
}
@media screen and (-ms-high-contrast: active){&:focus {
-ms-high-contrast-adjust: none;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports[`Link renders Link correctly 1`] = `
className=
ms-Link
{
color: #0078d7;
color: #0078d4;
outline: transparent;
position: relative;
text-decoration: none;
Expand All @@ -29,7 +29,7 @@ exports[`Link renders Link correctly 1`] = `
color: #004578;
}
&:focus {
color: #0078d7;
color: #0078d4;
}
href="#"
onClick={[Function]}
Expand All @@ -46,7 +46,7 @@ exports[`Link renders Link with a custom class name 1`] = `
ms-Link
customClassName
{
color: #0078d7;
color: #0078d4;
outline: transparent;
position: relative;
text-decoration: none;
Expand All @@ -69,7 +69,7 @@ exports[`Link renders Link with a custom class name 1`] = `
color: #004578;
}
&:focus {
color: #0078d7;
color: #0078d4;
}
href="#"
onClick={[Function]}
Expand All @@ -87,7 +87,7 @@ exports[`Link renders Link with no href as a button 1`] = `
{
background: none;
border: none;
color: #0078d7;
color: #0078d4;
cursor: pointer;
display: inline;
font-size: inherit;
Expand Down Expand Up @@ -123,7 +123,7 @@ exports[`Link renders Link with no href as a button 1`] = `
color: #004578;
}
&:focus {
color: #0078d7;
color: #0078d4;
}
onClick={[Function]}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@ exports[`Nav renders Nav correctly 1`] = `
color: #333333;
}
&:hover {
color: #0078d7;
color: #0078d4;
}
&:hover .ms-Button-icon {
color: #0078d7;
color: #0078d4;
}
&:active {
color: #000000;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ exports[`Pivot renders Pivot correctly 1`] = `
z-index: 1;
}
&:hover {
color: #0078d7;
color: #0078d4;
}
&:hover .ms-Button-icon {
color: #0078d7;
color: #0078d4;
}
&:active {
color: #000000;
Expand Down Expand Up @@ -163,10 +163,10 @@ exports[`Pivot renders Pivot correctly 1`] = `
z-index: 1;
}
&:hover {
color: #0078d7;
color: #0078d4;
}
&:hover .ms-Button-icon {
color: #0078d7;
color: #0078d4;
}
&:active {
color: #000000;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ exports[`SearchBox renders SearchBox correctly 1`] = `
className=
ms-SearchBox-iconContainer
{
color: #0078d7;
color: #0078d4;
display: flex;
flex-direction: column;
flex-shrink: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ exports[`SpinButton renders SpinButton correctly 1`] = `
width: calc(100% - 14px);
}
&::selection {
background-color: #0078d7;
background-color: #0078d4;
color: #ffffff;
}
@media screen and (-ms-high-contrast: active){&::selection {
Expand Down
Loading