ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-23 17:53:28 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Frontend] Merge old open1233a into latest master

Browse Source 
Fixes #1233
This commit is contained in:
Charles Hacskaylo
2017-01-27 15:39:18 -08:00
parent 3ae0fd7bc9
commit 77396093d8
12 changed files with 341 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
platform/commonUI/general/res/sass/_about.scss
View File

@ -42,6 +42,27 @@
a {
color: $colorAboutLink;
}
h1, h2, h3 {
color: pullForward($colorBodyFg, 20%);
margin-bottom: 1em;
}
h1 {
font-size: 2.25em;
}
h2 {
border-top: 1px solid $colorInteriorBorder;
font-size: 1.5em;
margin-top: 2em;
padding-top: 1em;
}
h3 {
margin-top: 2em;
}
.s-description,
.s-button {
line-height: 2em;

4
platform/commonUI/general/res/sass/_archetypes.scss
View File

@ -21,7 +21,7 @@
*****************************************************************************/
/********************************************* COLUMN LAYOUTS STYLES */
@mixin cols($totalCols, $span) {
/*@mixin cols($totalCols, $span) {
$cw: 100% / $totalCols;
min-width: (500px / $totalCols) * $span;
@if ($totalCols != $span) {
@ -89,7 +89,7 @@
@include clearfix;
padding: $interiorMargin 0;
}
}
}*/
/********************************************* FLEX STYLES */
.l-flex-row,

18
platform/commonUI/general/res/sass/_text.scss
View File

@ -37,20 +37,6 @@
}
h1, h2, h3 {
color: pullForward($colorBodyFg, 20%);
font-weight: normal !important;
margin-bottom: 1em;
}
h2 {
border-top: 1px solid $colorInteriorBorder;
font-size: 1.5em;
margin-top: 2em;
padding-top: 1em;
}
h3 {
margin-top: 2em;
}
font-weight: 200 !important;
}
}