ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-29 05:34:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[wtf] Merge open155 > github/master

Browse Source 
open #155
open #186
WTF yet again getting merge conflicts when remerging open155;
This commit is contained in:
Charles Hacskaylo 2015-10-30 16:24:20 -07:00
commit 485e6a9de1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/commonUI/general/res/sass/user-environ/_layout.scss
View File

@ -43,9 +43,9 @@
position: absolute;
}
.editor {
@include border-radius($basicCr * 1.5);
}
//.editor {
// @include border-radius($basicCr * 1.5);
//}
.contents {
$myM: 0; //$interiorMargin;
@ -359,4 +359,4 @@
@include webkitProp(flex, '1 1 0');
padding-right: $interiorMarginLg;
}
}
}