Commit Graph

16 Commits

Author SHA1 Message Date
Christiano, Kevin
8ebcef3a60 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
2019-06-04 16:23:06 -04:00
Pfeil, Scott Robert
161f3e9f08 reset function.
standard spacing for cell molecule
MFTextField to view contstraining view
constraining protocol
2019-06-04 12:42:52 -04:00
Christiano, Kevin
b00d439ead Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-05-29 10:51:11 -04:00
Pfeil, Scott Robert
a3325035b9 fix override... 2019-05-28 17:04:25 -04:00
Pfeil, Scott Robert
403f0bbea8 42 update to estimated height 2019-05-28 16:47:07 -04:00
Pfeil, Scott Robert
0f5cb47765 molecule list
moduleMolecule
2019-05-23 18:32:11 -04:00
Christiano, Kevin
f64c793aeb Multi-action-text label WIP. 2019-05-01 15:42:49 -04:00
Pfeil, Scott Robert
8c19755ba8 warning fix 2019-04-15 13:31:45 -04:00
Pfeil, Scott Robert
5ebcba15fa molecule delegate object 2019-04-15 12:59:27 -04:00
Suresh, Kamlesh
02efde760d Merge branch 'feature/template_layout_guide' into 'develop'
Feature/template layout guide

See merge request BPHV_MIPS/mvm_core_ui!27
2019-04-10 16:35:43 -04:00
Pfeil, Scott Robert
56ed225564 Merge branch 'bugfix/button_delegate' into 'develop'
button_delegate

See merge request BPHV_MIPS/mvm_core_ui!28
2019-04-10 16:27:25 -04:00
Suresh, Kamlesh
b1869730f5 button_delegate 2019-04-10 12:43:39 -04:00
Pfeil, Scott Robert
741785cc22 secondary default as white for the feed 2019-04-09 13:46:28 -04:00
Pfeil, Scott Robert
3ee784ccb0 Changes for new feed template 2019-04-09 10:38:26 -04:00
Pfeil, Scott Robert
f63b157c16 Fixes to make two button more compatible with legacy 2019-03-25 16:51:51 -04:00
Pfeil, Scott Robert
a2ab8c6571 swifty buttons 2019-03-25 09:37:54 -04:00