alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'open-master' into open1295

Browse Source 
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/_main.scss
This commit is contained in:
Charles Hacskaylo
2015-06-17 11:00:53 -07:00
parent 70e1a8ad9e d614d7ee86
commit 2677dcd10c
3 changed files with 107 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/general/res/sass/_main.scss
View File

@@ -45,10 +45,10 @@
@import "controls/controls";
@import "controls/lists";
@import "controls/menus";
@import "controls/time-controller";
@import "edit/editor";
@import "features/imagery";
@import "features/time-display";
@import "controls/time-controller";
@import "forms/mixins";
@import "forms/elems";
@import "forms/validation";

10
platform/commonUI/general/res/sass/controls/_buttons.scss
View File

@@ -148,14 +148,4 @@ a.btn span,
a.l-btn,
a.l-btn span {
display: inline-block;
}
.l-btn {
padding: 0 $pad;
&.sm {
padding: 0 $interiorMargin;
}
&.vsm {
padding: 0 $interiorMargin/2;
}
}