alihan/openmct
1
0
Fork 0
Code Issues Pull Requests 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
parent 1e6731e6f2 bc82a5bf7e
commit 485e6a9de1
1 changed files with 4 additions and 4 deletions
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; position: absolute;
} }
.editor { //.editor {
@include border-radius($basicCr * 1.5); // @include border-radius($basicCr * 1.5);
} //}
.contents { .contents {
$myM: 0; //$interiorMargin; $myM: 0; //$interiorMargin;
@@ -359,4 +359,4 @@
@include webkitProp(flex, '1 1 0'); @include webkitProp(flex, '1 1 0');
padding-right: $interiorMarginLg; padding-right: $interiorMarginLg;
} }
} }