Merged PR 923076: Merge develop into master
This commit is contained in:
Andy Zhu
Коммит
c0a4d66de6
|
|
@ -1 +1,333 @@
|
|||
## Ignore Visual Studio temporary files, build results, and
|
||||
## files generated by popular Visual Studio add-ons.
|
||||
##
|
||||
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
|
||||
|
||||
# User-specific files
|
||||
*.suo
|
||||
*.user
|
||||
*.userosscache
|
||||
*.sln.docstates
|
||||
|
||||
# User-specific files (MonoDevelop/Xamarin Studio)
|
||||
*.userprefs
|
||||
|
||||
# Build results
|
||||
[Dd]ebug/
|
||||
[Dd]ebugPublic/
|
||||
[Rr]elease/
|
||||
[Rr]eleases/
|
||||
x64/
|
||||
x86/
|
||||
bld/
|
||||
[Bb]in/
|
||||
[Oo]bj/
|
||||
[Ll]og/
|
||||
|
||||
# Visual Studio 2015/2017 cache/options directory
|
||||
.vs/
|
||||
# Uncomment if you have tasks that create the project's static files in wwwroot
|
||||
#wwwroot/
|
||||
|
||||
# Visual Studio 2017 auto generated files
|
||||
Generated\ Files/
|
||||
|
||||
# MSTest test Results
|
||||
[Tt]est[Rr]esult*/
|
||||
[Bb]uild[Ll]og.*
|
||||
|
||||
# NUNIT
|
||||
*.VisualState.xml
|
||||
TestResult.xml
|
||||
|
||||
# Build Results of an ATL Project
|
||||
[Dd]ebugPS/
|
||||
[Rr]eleasePS/
|
||||
dlldata.c
|
||||
|
||||
# Benchmark Results
|
||||
BenchmarkDotNet.Artifacts/
|
||||
|
||||
# .NET Core
|
||||
project.lock.json
|
||||
project.fragment.lock.json
|
||||
artifacts/
|
||||
**/Properties/launchSettings.json
|
||||
|
||||
# StyleCop
|
||||
StyleCopReport.xml
|
||||
|
||||
# Files built by Visual Studio
|
||||
*_i.c
|
||||
*_p.c
|
||||
*_i.h
|
||||
*.ilk
|
||||
*.meta
|
||||
*.obj
|
||||
*.iobj
|
||||
*.pch
|
||||
*.pdb
|
||||
*.ipdb
|
||||
*.pgc
|
||||
*.pgd
|
||||
*.rsp
|
||||
*.sbr
|
||||
*.tlb
|
||||
*.tli
|
||||
*.tlh
|
||||
*.tmp
|
||||
*.tmp_proj
|
||||
*.log
|
||||
*.vspscc
|
||||
*.vssscc
|
||||
.builds
|
||||
*.pidb
|
||||
*.svclog
|
||||
*.scc
|
||||
|
||||
# Chutzpah Test files
|
||||
_Chutzpah*
|
||||
|
||||
# Visual C++ cache files
|
||||
ipch/
|
||||
*.aps
|
||||
*.ncb
|
||||
*.opendb
|
||||
*.opensdf
|
||||
*.sdf
|
||||
*.cachefile
|
||||
*.VC.db
|
||||
*.VC.VC.opendb
|
||||
|
||||
# Visual Studio profiler
|
||||
*.psess
|
||||
*.vsp
|
||||
*.vspx
|
||||
*.sap
|
||||
|
||||
# Visual Studio Trace Files
|
||||
*.e2e
|
||||
|
||||
# TFS 2012 Local Workspace
|
||||
$tf/
|
||||
|
||||
# Guidance Automation Toolkit
|
||||
*.gpState
|
||||
|
||||
# ReSharper is a .NET coding add-in
|
||||
_ReSharper*/
|
||||
*.[Rr]e[Ss]harper
|
||||
*.DotSettings.user
|
||||
|
||||
# JustCode is a .NET coding add-in
|
||||
.JustCode
|
||||
|
||||
# TeamCity is a build add-in
|
||||
_TeamCity*
|
||||
|
||||
# DotCover is a Code Coverage Tool
|
||||
*.dotCover
|
||||
|
||||
# AxoCover is a Code Coverage Tool
|
||||
.axoCover/*
|
||||
!.axoCover/settings.json
|
||||
|
||||
# Visual Studio code coverage results
|
||||
*.coverage
|
||||
*.coveragexml
|
||||
|
||||
# NCrunch
|
||||
_NCrunch_*
|
||||
.*crunch*.local.xml
|
||||
nCrunchTemp_*
|
||||
|
||||
# MightyMoose
|
||||
*.mm.*
|
||||
AutoTest.Net/
|
||||
|
||||
# Web workbench (sass)
|
||||
.sass-cache/
|
||||
|
||||
# Installshield output folder
|
||||
[Ee]xpress/
|
||||
|
||||
# DocProject is a documentation generator add-in
|
||||
DocProject/buildhelp/
|
||||
DocProject/Help/*.HxT
|
||||
DocProject/Help/*.HxC
|
||||
DocProject/Help/*.hhc
|
||||
DocProject/Help/*.hhk
|
||||
DocProject/Help/*.hhp
|
||||
DocProject/Help/Html2
|
||||
DocProject/Help/html
|
||||
|
||||
# Click-Once directory
|
||||
publish/
|
||||
|
||||
# Publish Web Output
|
||||
*.[Pp]ublish.xml
|
||||
*.azurePubxml
|
||||
# Note: Comment the next line if you want to checkin your web deploy settings,
|
||||
# but database connection strings (with potential passwords) will be unencrypted
|
||||
*.pubxml
|
||||
*.publishproj
|
||||
|
||||
# Microsoft Azure Web App publish settings. Comment the next line if you want to
|
||||
# checkin your Azure Web App publish settings, but sensitive information contained
|
||||
# in these scripts will be unencrypted
|
||||
PublishScripts/
|
||||
|
||||
# NuGet Packages
|
||||
*.nupkg
|
||||
# The packages folder can be ignored because of Package Restore
|
||||
**/[Pp]ackages/*
|
||||
# except build/, which is used as an MSBuild target.
|
||||
!**/[Pp]ackages/build/
|
||||
# Uncomment if necessary however generally it will be regenerated when needed
|
||||
#!**/[Pp]ackages/repositories.config
|
||||
# NuGet v3's project.json files produces more ignorable files
|
||||
*.nuget.props
|
||||
*.nuget.targets
|
||||
|
||||
# Microsoft Azure Build Output
|
||||
csx/
|
||||
*.build.csdef
|
||||
|
||||
# Microsoft Azure Emulator
|
||||
ecf/
|
||||
rcf/
|
||||
|
||||
# Windows Store app package directories and files
|
||||
AppPackages/
|
||||
BundleArtifacts/
|
||||
Package.StoreAssociation.xml
|
||||
_pkginfo.txt
|
||||
*.appx
|
||||
|
||||
# Visual Studio cache files
|
||||
# files ending in .cache can be ignored
|
||||
*.[Cc]ache
|
||||
# but keep track of directories ending in .cache
|
||||
!*.[Cc]ache/
|
||||
|
||||
# Others
|
||||
ClientBin/
|
||||
~$*
|
||||
*~
|
||||
*.dbmdl
|
||||
*.dbproj.schemaview
|
||||
*.jfm
|
||||
*.pfx
|
||||
*.publishsettings
|
||||
orleans.codegen.cs
|
||||
|
||||
# Including strong name files can present a security risk
|
||||
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
|
||||
#*.snk
|
||||
|
||||
# Since there are multiple workflows, uncomment next line to ignore bower_components
|
||||
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
|
||||
#bower_components/
|
||||
|
||||
# RIA/Silverlight projects
|
||||
Generated_Code/
|
||||
|
||||
# Backup & report files from converting an old project file
|
||||
# to a newer Visual Studio version. Backup files are not needed,
|
||||
# because we have git ;-)
|
||||
_UpgradeReport_Files/
|
||||
Backup*/
|
||||
UpgradeLog*.XML
|
||||
UpgradeLog*.htm
|
||||
ServiceFabricBackup/
|
||||
*.rptproj.bak
|
||||
|
||||
# SQL Server files
|
||||
*.mdf
|
||||
*.ldf
|
||||
*.ndf
|
||||
|
||||
# Business Intelligence projects
|
||||
*.rdl.data
|
||||
*.bim.layout
|
||||
*.bim_*.settings
|
||||
*.rptproj.rsuser
|
||||
|
||||
# Microsoft Fakes
|
||||
FakesAssemblies/
|
||||
|
||||
# GhostDoc plugin setting file
|
||||
*.GhostDoc.xml
|
||||
|
||||
# Node.js Tools for Visual Studio
|
||||
.ntvs_analysis.dat
|
||||
node_modules/
|
||||
|
||||
# Visual Studio 6 build log
|
||||
*.plg
|
||||
|
||||
# Visual Studio 6 workspace options file
|
||||
*.opt
|
||||
|
||||
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
|
||||
*.vbw
|
||||
|
||||
# Visual Studio LightSwitch build output
|
||||
**/*.HTMLClient/GeneratedArtifacts
|
||||
**/*.DesktopClient/GeneratedArtifacts
|
||||
**/*.DesktopClient/ModelManifest.xml
|
||||
**/*.Server/GeneratedArtifacts
|
||||
**/*.Server/ModelManifest.xml
|
||||
_Pvt_Extensions
|
||||
|
||||
# Paket dependency manager
|
||||
.paket/paket.exe
|
||||
paket-files/
|
||||
|
||||
# FAKE - F# Make
|
||||
.fake/
|
||||
|
||||
# JetBrains Rider
|
||||
.idea/
|
||||
*.sln.iml
|
||||
|
||||
# CodeRush
|
||||
.cr/
|
||||
|
||||
# Python Tools for Visual Studio (PTVS)
|
||||
__pycache__/
|
||||
*.pyc
|
||||
|
||||
# Cake - Uncomment if you are using it
|
||||
# tools/**
|
||||
# !tools/packages.config
|
||||
|
||||
# Tabs Studio
|
||||
*.tss
|
||||
|
||||
# Telerik's JustMock configuration file
|
||||
*.jmconfig
|
||||
|
||||
# BizTalk build output
|
||||
*.btp.cs
|
||||
*.btm.cs
|
||||
*.odx.cs
|
||||
*.xsd.cs
|
||||
|
||||
# OpenCover UI analysis results
|
||||
OpenCover/
|
||||
|
||||
# Azure Stream Analytics local run output
|
||||
ASALocalRun/
|
||||
|
||||
# MSBuild Binary and Structured Log
|
||||
*.binlog
|
||||
|
||||
# NVidia Nsight GPU debugger configuration file
|
||||
*.nvuser
|
||||
|
||||
# MFractors (Xamarin productivity tool) working folder
|
||||
.mfractor/
|
||||
|
||||
# Node modules
|
||||
node_modules
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE
|
||||
40
README.md
40
README.md
|
|
@ -27,6 +27,7 @@ To theme your app, wrap the themed properties in @themify mixin.
|
|||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
padding: $gutter-small;
|
||||
|
||||
@include themify {
|
||||
fill: themed('color-fill-tile-symbol');
|
||||
|
|
@ -39,16 +40,22 @@ The above SCSS will generate two separate theme variations.
|
|||
|
||||
```
|
||||
.symbol {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%); }
|
||||
.theme-dark .symbol {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
padding: 16px;
|
||||
}
|
||||
|
||||
.theme-dark .symbol {
|
||||
fill: #FFFFFF;
|
||||
stroke: #FFFFFF; }
|
||||
.theme-light .symbol {
|
||||
stroke: #FFFFFF;
|
||||
}
|
||||
|
||||
.theme-light .symbol {
|
||||
fill: #212121;
|
||||
stroke: #212121; }
|
||||
stroke: #212121;
|
||||
}
|
||||
```
|
||||
|
||||
This technique is relatively efficient, as only the necessary css markups that vary between the themes are generated.
|
||||
|
|
@ -99,4 +106,19 @@ $themes: (
|
|||
);
|
||||
```
|
||||
|
||||
See the `example` directory for sample consumption code. Use `npm run build` to see the sample css output.
|
||||
See the `example` directory for sample consumption code. Use `npm run build` to see the sample css output.
|
||||
|
||||
Contributing
|
||||
============
|
||||
|
||||
This project welcomes contributions and suggestions. Most contributions require you to agree to a
|
||||
Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
|
||||
the rights to use your contribution. For details, visit https://cla.microsoft.com.
|
||||
|
||||
When you submit a pull request, a CLA-bot will automatically determine whether you need to provide
|
||||
a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions
|
||||
provided by the bot. You will only need to do this once across all repos using our CLA.
|
||||
|
||||
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
|
||||
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
|
||||
contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@azure-iot/ux-fluent-css",
|
||||
"version": "2.0.5",
|
||||
"version": "2.0.17",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@azure-iot/ux-fluent-css",
|
||||
"description": "Common styles library for CSS, Colors and Themes",
|
||||
"version": "2.0.5",
|
||||
"version": "2.0.17",
|
||||
"license": "ISC",
|
||||
"engines": {
|
||||
"node": "^8.0.0"
|
||||
|
|
|
|||
|
|
@ -143,4 +143,5 @@ $color-blue-800: #DEECF9;
|
|||
$color-black-transparent-primary: rgba($color-black, 0.8);
|
||||
$color-black-transparent-half: rgba($color-black, 0.5);
|
||||
$color-black-transparent-third: rgba($color-black,0.33);
|
||||
$color-black-transparent-tenth: rgba($color-black,0.1);
|
||||
$color-transparent: transparent;
|
||||
|
|
@ -16,7 +16,7 @@ $gutter-bigger: 40px;
|
|||
$grid-size: 4px;
|
||||
|
||||
|
||||
// Z Index
|
||||
// Z Index
|
||||
|
||||
$z-index-large-step: 1000;
|
||||
$z-index-medium-step: 100;
|
||||
|
|
@ -71,19 +71,3 @@ $layout-chart-axis-tick-size: 6px;
|
|||
|
||||
$nav-expanded-width: 220px;
|
||||
$nav-collapsed-width: $layout-nav-item-height;
|
||||
|
||||
|
||||
// Text overflow
|
||||
|
||||
.inline-text-overflow {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
|
||||
// Hidden
|
||||
|
||||
.hidden {
|
||||
display: none !important;
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/**
|
||||
/**
|
||||
* Normalize
|
||||
*/
|
||||
|
||||
|
|
@ -7,133 +7,144 @@
|
|||
@import "typography";
|
||||
@import "mixins";
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-family: $font-family-default;
|
||||
font-size: $font-size-default;
|
||||
line-height: $line-height-base;
|
||||
}
|
||||
:global {
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-family: $font-family-default;
|
||||
font-size: $font-size-default;
|
||||
line-height: $line-height-base;
|
||||
}
|
||||
|
||||
* {
|
||||
@include box-sizing(border-box);
|
||||
}
|
||||
* {
|
||||
@include box-sizing(border-box);
|
||||
}
|
||||
|
||||
*:before,
|
||||
*:after {
|
||||
@include box-sizing(border-box);
|
||||
}
|
||||
*:before,
|
||||
*:after {
|
||||
@include box-sizing(border-box);
|
||||
}
|
||||
|
||||
// Reset fonts for relevant elements
|
||||
input,
|
||||
button,
|
||||
select,
|
||||
textarea {
|
||||
font-family: inherit;
|
||||
font-size: inherit;
|
||||
line-height: inherit;
|
||||
}
|
||||
// Reset fonts for relevant elements
|
||||
input,
|
||||
button,
|
||||
select,
|
||||
textarea {
|
||||
font-family: inherit;
|
||||
font-size: inherit;
|
||||
line-height: inherit;
|
||||
}
|
||||
|
||||
// override bootstrap's vertical margins for headings since we override
|
||||
// heading sizes in overrides.scss
|
||||
h1, .h1,
|
||||
h2, .h2,
|
||||
h3, .h3 {
|
||||
margin-top: $gutter-small / 2;
|
||||
margin-bottom: $gutter-small / 2;
|
||||
}
|
||||
// override bootstrap's vertical margins for headings since we override
|
||||
// heading sizes in overrides.scss
|
||||
h1, .h1,
|
||||
h2, .h2,
|
||||
h3, .h3 {
|
||||
margin-top: $gutter-small / 2;
|
||||
margin-bottom: $gutter-small / 2;
|
||||
}
|
||||
|
||||
// Headings
|
||||
// -------------------------
|
||||
// Headings
|
||||
// -------------------------
|
||||
|
||||
h1, h2, h3, h4, h5, h6,
|
||||
.h1, .h2, .h3, .h4, .h5, .h6 {
|
||||
font-family: $font-family-default;
|
||||
font-weight: $headings-font-weight;
|
||||
line-height: $headings-line-height;
|
||||
h1, h2, h3, h4, h5, h6,
|
||||
.h1, .h2, .h3, .h4, .h5, .h6 {
|
||||
font-family: $font-family-default;
|
||||
font-weight: $headings-font-weight;
|
||||
line-height: $headings-line-height;
|
||||
|
||||
small,
|
||||
.small {
|
||||
small,
|
||||
.small {
|
||||
font-weight: normal;
|
||||
line-height: 1;
|
||||
}
|
||||
}
|
||||
|
||||
h1, .h1,
|
||||
h2, .h2,
|
||||
h3, .h3 {
|
||||
margin-top: ($gutter-small / 2);
|
||||
margin-bottom: ($gutter-small / 2);
|
||||
|
||||
small,
|
||||
.small {
|
||||
font-size: 65%;
|
||||
}
|
||||
}
|
||||
|
||||
h4, .h4,
|
||||
h5, .h5,
|
||||
h6, .h6 {
|
||||
margin-top: ($gutter-small / 2);
|
||||
margin-bottom: ($gutter-small / 2);
|
||||
|
||||
small,
|
||||
.small {
|
||||
font-size: 75%;
|
||||
}
|
||||
}
|
||||
|
||||
h1, .h1 { font-size: $font-size-h1; }
|
||||
h2, .h2 { font-size: $font-size-h2; }
|
||||
h3, .h3 { font-size: $font-size-h3; }
|
||||
h4, .h4 { font-size: $font-size-h4; }
|
||||
|
||||
|
||||
// Body text
|
||||
// -------------------------
|
||||
|
||||
p {
|
||||
margin: 0 0 ($line-height-computed / 2);
|
||||
}
|
||||
|
||||
label {
|
||||
font-weight: normal;
|
||||
line-height: 1;
|
||||
}
|
||||
}
|
||||
|
||||
h1, .h1,
|
||||
h2, .h2,
|
||||
h3, .h3 {
|
||||
margin-top: ($gutter-small / 2);
|
||||
margin-bottom: ($gutter-small / 2);
|
||||
|
||||
small,
|
||||
.small {
|
||||
font-size: 65%;
|
||||
a {
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
|
||||
h4, .h4,
|
||||
h5, .h5,
|
||||
h6, .h6 {
|
||||
margin-top: ($gutter-small / 2);
|
||||
margin-bottom: ($gutter-small / 2);
|
||||
|
||||
small,
|
||||
.small {
|
||||
font-size: 75%;
|
||||
}
|
||||
}
|
||||
|
||||
h1, .h1 { font-size: $font-size-h1; }
|
||||
h2, .h2 { font-size: $font-size-h2; }
|
||||
h3, .h3 { font-size: $font-size-h3; }
|
||||
h4, .h4 { font-size: $font-size-h4; }
|
||||
|
||||
|
||||
// Body text
|
||||
// -------------------------
|
||||
|
||||
p {
|
||||
margin: 0 0 ($line-height-computed / 2);
|
||||
}
|
||||
|
||||
label {
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
a {
|
||||
text-decoration: none;
|
||||
&:focus {
|
||||
@include tab-focus;
|
||||
}
|
||||
}
|
||||
|
||||
// Unordered and Ordered lists
|
||||
ul,
|
||||
ol {
|
||||
margin-top: 0;
|
||||
margin-bottom: ($line-height-computed / 2);
|
||||
|
||||
// Unordered and Ordered lists
|
||||
ul,
|
||||
ol {
|
||||
margin-bottom: 0;
|
||||
margin-top: 0;
|
||||
margin-bottom: ($line-height-computed / 2);
|
||||
|
||||
ul,
|
||||
ol {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Description Lists
|
||||
dl {
|
||||
margin-top: 0; // Remove browser default
|
||||
margin-bottom: $line-height-computed;
|
||||
}
|
||||
|
||||
dt,
|
||||
dd {
|
||||
line-height: $line-height-base;
|
||||
}
|
||||
|
||||
dt {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
dd {
|
||||
margin-left: 0; // Undo browser default
|
||||
}
|
||||
|
||||
// define some common css classes that everyone needs to use. These
|
||||
// need to be declared as global so they're not mangled:
|
||||
.inline-text-overflow {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.hidden {
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
// Description Lists
|
||||
dl {
|
||||
margin-top: 0; // Remove browser default
|
||||
margin-bottom: $line-height-computed;
|
||||
}
|
||||
|
||||
dt,
|
||||
dd {
|
||||
line-height: $line-height-base;
|
||||
}
|
||||
|
||||
dt {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
dd {
|
||||
margin-left: 0; // Undo browser default
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/**
|
||||
/**
|
||||
* Default Dark Theme Colors
|
||||
*/
|
||||
|
||||
|
|
@ -13,10 +13,11 @@ $theme-dark: map-merge((
|
|||
// Layouts
|
||||
color-bg-navbar: $color-grey-900,
|
||||
color-bg-navbar-hover: $color-grey-700,
|
||||
color-bg-header: $color-grey-1400,
|
||||
color-bg-header: $color-grey-1400,
|
||||
color-bg-header-hover: $color-grey-700,
|
||||
color-bg-masthead: $color-grey-1300,
|
||||
color-bg-masthead-hover: $color-grey-700,
|
||||
color-border-masthead-item: $color-grey-600,
|
||||
|
||||
// Surfaces
|
||||
color-bg-panel-primary: $color-grey-1400,
|
||||
|
|
@ -28,12 +29,14 @@ $theme-dark: map-merge((
|
|||
color-border-grid: $color-grey-700,
|
||||
|
||||
// Controls
|
||||
color-bg-blastshield: $color-black-transparent-half,
|
||||
color-bg-blastshield: $color-black-transparent-primary,
|
||||
color-bg-balloon: $color-grey-1500,
|
||||
color-bg-form: $color-grey-1500,
|
||||
color-bg-table: $color-grey-1500,
|
||||
color-bg-searchbar: $color-grey-1500,
|
||||
color-bg-guidance: $color-blue-400,
|
||||
color-bg-thumbnail: $color-grey-600,
|
||||
color-text-thumbnail: $color-grey-100,
|
||||
|
||||
// Interactions
|
||||
color-bg-item-hover: $color-grey-700,
|
||||
|
|
@ -127,7 +130,7 @@ $theme-dark: map-merge((
|
|||
color-bg-checkbox-pressed-selected: $color-blue-100,
|
||||
color-bg-checkbox-disabled: $color-grey-1100,
|
||||
color-border-checkbox-hover: $color-grey-600,
|
||||
color-border-checkbox-focused: $color-grey-600,
|
||||
color-border-checkbox-focused: $color-grey-600,
|
||||
color-border-checkbox-selected-hover: $color-blue-300,
|
||||
color-border-checkbox-pressed-selected: $color-blue-100,
|
||||
color-border-checkbox-disabled-selected: $color-grey-1100,
|
||||
|
|
@ -143,7 +146,7 @@ $theme-dark: map-merge((
|
|||
color-border-rest: $color-grey-700,
|
||||
color-border-hover: $color-blue-100,
|
||||
color-border-focus: $color-blue-100,
|
||||
color-border-selected: $color-grey-700,
|
||||
color-border-selected: $color-blue-100,
|
||||
color-border-disabled: $color-grey-500,
|
||||
color-border-error: $color-error-local-100,
|
||||
color-border-controls: $color-blue-100,
|
||||
|
|
@ -160,23 +163,23 @@ $theme-dark: map-merge((
|
|||
color-text-black: $color-black,
|
||||
|
||||
// Buttons
|
||||
color-bg-btn-standard-rest: $color-grey-100,
|
||||
color-bg-btn-standard-hover: $color-grey-200,
|
||||
color-bg-btn-standard-focus: $color-grey-100,
|
||||
color-bg-btn-standard-pressed-selected: $color-grey-300,
|
||||
color-bg-btn-standard-disabled: $color-grey-100,
|
||||
color-bg-btn-standard-rest: $color-grey-200,
|
||||
color-bg-btn-standard-hover: $color-grey-300,
|
||||
color-bg-btn-standard-focus: $color-grey-300,
|
||||
color-bg-btn-standard-pressed-selected: $color-grey-400,
|
||||
color-bg-btn-standard-disabled: $color-grey-1000,
|
||||
|
||||
color-bg-btn-primary-rest: $color-blue-100,
|
||||
color-bg-btn-primary-hover: $color-blue-200,
|
||||
color-bg-btn-primary-focus: $color-blue-200,
|
||||
color-bg-btn-primary-pressed-selected: $color-blue-300,
|
||||
color-bg-btn-primary-disabled: $color-grey-1100,
|
||||
color-bg-btn-primary-disabled: $color-grey-1000,
|
||||
|
||||
color-bg-btn-danger-rest: $color-red-400,
|
||||
color-bg-btn-danger-hover: $color-red-500,
|
||||
color-bg-btn-danger-focus: $color-red-400,
|
||||
color-bg-btn-danger-focus: $color-red-500,
|
||||
color-bg-btn-danger-pressed-selected: $color-red-600,
|
||||
color-bg-btn-danger-disabled: $color-grey-200,
|
||||
color-bg-btn-danger-disabled: $color-grey-1000,
|
||||
|
||||
// Layout Buttons
|
||||
color-bg-btn-layout-rest: $color-grey-1500,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/**
|
||||
/**
|
||||
* Default Light Theme Colors
|
||||
*/
|
||||
|
||||
|
|
@ -13,10 +13,11 @@ $theme-light: map-merge((
|
|||
// Layouts
|
||||
color-bg-navbar: $color-grey-900,
|
||||
color-bg-navbar-hover: $color-grey-600,
|
||||
color-bg-header: $color-grey-100,
|
||||
color-bg-header: $color-grey-100,
|
||||
color-bg-header-hover: $color-grey-600,
|
||||
color-bg-masthead: $color-grey-1300,
|
||||
color-bg-masthead-hover: $color-grey-600,
|
||||
color-border-masthead-item: $color-grey-500,
|
||||
|
||||
// Surfaces
|
||||
color-bg-panel-primary: $color-grey-100,
|
||||
|
|
@ -28,12 +29,14 @@ $theme-light: map-merge((
|
|||
color-border-grid: $color-grey-300,
|
||||
|
||||
// Controls
|
||||
color-bg-blastshield: $color-black-transparent-half,
|
||||
color-bg-blastshield: $color-black-transparent-primary,
|
||||
color-bg-balloon: $color-white,
|
||||
color-bg-form: $color-white,
|
||||
color-bg-table: $color-white,
|
||||
color-bg-searchbar: $color-white,
|
||||
color-bg-guidance: $color-blue-300,
|
||||
color-bg-thumbnail: $color-grey-600,
|
||||
color-text-thumbnail: $color-grey-100,
|
||||
|
||||
// Interactions
|
||||
color-bg-item-hover: $color-grey-200,
|
||||
|
|
@ -80,7 +83,7 @@ $theme-light: map-merge((
|
|||
color-border-dropdown-focus: $color-grey-600,
|
||||
color-dropdown-disabled-text: $color-grey-400,
|
||||
|
||||
// Radio button
|
||||
// Radio button
|
||||
color-bg-radio-btn-rest: $color-white,
|
||||
color-bg-radio-btn-hover: $color-white,
|
||||
color-bg-radio-btn-selected: $color-white,
|
||||
|
|
@ -106,7 +109,7 @@ $theme-light: map-merge((
|
|||
color-bg-toggle-btn-disabled-off: $color-grey-100,
|
||||
color-border-toggle-btn-rest-on: $color-white,
|
||||
color-border-toggle-btn-rest-off: $color-grey-600,
|
||||
color-border-toggle-btn-hover-on: $color-blue-300,
|
||||
color-border-toggle-btn-hover-on: $color-white,
|
||||
color-border-toggle-btn-hover-off: $color-grey-600,
|
||||
color-border-toggle-btn-focus-on: $color-white,
|
||||
color-border-toggle-btn-focus-off: $color-grey-600,
|
||||
|
|
@ -127,7 +130,7 @@ $theme-light: map-merge((
|
|||
color-bg-checkbox-pressed-selected: $color-blue-100,
|
||||
color-bg-checkbox-disabled: $color-white,
|
||||
color-border-checkbox-hover: $color-grey-1200,
|
||||
color-border-checkbox-focused: $color-grey-1200,
|
||||
color-border-checkbox-focused: $color-grey-1200,
|
||||
color-border-checkbox-selected-hover: $color-blue-300,
|
||||
color-border-checkbox-pressed-selected: $color-blue-100,
|
||||
color-border-checkbox-disabled-selected: $color-grey-300,
|
||||
|
|
@ -143,7 +146,7 @@ $theme-light: map-merge((
|
|||
color-border-rest: $color-grey-300,
|
||||
color-border-hover: $color-blue-100,
|
||||
color-border-focus: $color-blue-100,
|
||||
color-border-selected: $color-grey-300,
|
||||
color-border-selected: $color-blue-100,
|
||||
color-border-disabled: $color-grey-500,
|
||||
color-border-error: $color-error-local-200,
|
||||
color-border-controls: $color-blue-100,
|
||||
|
|
@ -160,21 +163,21 @@ $theme-light: map-merge((
|
|||
color-text-black: $color-black,
|
||||
|
||||
// Buttons
|
||||
color-bg-btn-standard-rest: $color-grey-100,
|
||||
color-bg-btn-standard-hover: $color-grey-200,
|
||||
color-bg-btn-standard-focus: $color-grey-100,
|
||||
color-bg-btn-standard-pressed-selected: $color-grey-300,
|
||||
color-bg-btn-standard-disabled: $color-grey-100,
|
||||
color-bg-btn-standard-rest: $color-grey-200,
|
||||
color-bg-btn-standard-hover: $color-grey-300,
|
||||
color-bg-btn-standard-focus: $color-grey-300,
|
||||
color-bg-btn-standard-pressed-selected: $color-grey-400,
|
||||
color-bg-btn-standard-disabled: $color-grey-200,
|
||||
|
||||
color-bg-btn-primary-rest: $color-blue-100,
|
||||
color-bg-btn-primary-hover: $color-blue-200,
|
||||
color-bg-btn-primary-focus: $color-blue-200,
|
||||
color-bg-btn-primary-pressed-selected: $color-blue-300,
|
||||
color-bg-btn-primary-disabled: $color-grey-100,
|
||||
color-bg-btn-primary-disabled: $color-grey-200,
|
||||
|
||||
color-bg-btn-danger-rest: $color-red-400,
|
||||
color-bg-btn-danger-hover: $color-red-500,
|
||||
color-bg-btn-danger-focus: $color-red-400,
|
||||
color-bg-btn-danger-focus: $color-red-500,
|
||||
color-bg-btn-danger-pressed-selected: $color-red-600,
|
||||
color-bg-btn-danger-disabled: $color-grey-200,
|
||||
|
||||
|
|
@ -203,9 +206,9 @@ $theme-light: map-merge((
|
|||
|
||||
// Loading
|
||||
color-bg-loader-panel: $color-grey-200,
|
||||
color-bg-loader-spinner: $color-grey-200,
|
||||
color-bg-loader-spinner: $color-grey-700,
|
||||
color-border-loader-global-segment: $color-blue-100,
|
||||
color-border-loader-global-track: $color-grey-800,
|
||||
color-border-loader-global-track: $color-grey-300,
|
||||
|
||||
// Upload
|
||||
color-bg-upload: $color-grey-400,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче