Merge remote-tracking branch 'github/master' into open236

Browse Source

Resolve CSS conflicts for nasa/openmctweb#236

Conflicts:
	platform/commonUI/general/res/sass/controls/_controls.scss
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css

...

This commit is contained in:

Victor Woeltjen

2015-11-04 13:02:17 -08:00

parent 6a42d0c7a1 15f9bc083c

commit ab01f64cea

125 changed files with 9727 additions and 3378 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

3164

platform/commonUI/themes/espresso/res/css/theme-espresso.css

File diff suppressed because it is too large Load Diff