Commit Graph

73 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
Pfeil, Scott Robert
38dc726f41 Setting up for defaults 2019-05-31 09:42:31 -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
341aef0184 more merge fixes 2019-05-29 10:13:48 -04:00
Pfeil, Scott Robert
119a9e8c0f merge develop 2019-05-29 09:07:15 -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
f4cfd0386c add forgotten separator override 2019-05-24 12:30:04 -04:00
Pfeil, Scott Robert
89ed78a0eb miss 2019-05-24 11:57:00 -04:00
Pfeil, Scott Robert
699aa94d0a fixes 2019-05-24 11:56:07 -04:00
Christiano, Kevin
3b66bcfdc3 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-05-24 09:20:56 -04:00
Pfeil, Scott Robert
0f5cb47765 molecule list
moduleMolecule
2019-05-23 18:32:11 -04:00
Priya
f53bd03212 Switch molecule 2019-05-23 17:02:30 -04:00
Priya
b73c916192 Switch molecule 2019-05-23 16:32:14 -04:00
Priya
344163de49 Switch molecule 2019-05-23 16:22:32 -04:00
Priya
89b1c9a21b Switch molecule 2019-05-23 11:40:21 -04:00
Priya
9fd2d2cbda Switch molecule 2019-05-21 14:04:46 -04:00
Priya
9f5600a0f3 switch modification 2019-05-20 15:51:07 -04:00
Priya
ddd8eb9d45 Switch molecule 2019-05-20 09:35:35 -04:00
Priya
aac9db9ca5 Switch molecule 2019-05-17 15:22:12 -04:00
Priya
281a10f7e1 Switch molecule 2019-05-17 14:36:18 -04:00
Priya
85e9c56dcf switch modification 2019-05-16 15:05:05 -04:00
Priya
9ecc7f21a6 switch modification 2019-05-16 11:54:57 -04:00
Priya
97b7fbebad switch modification 2019-05-16 10:20:13 -04:00
Priya
8ef420e3a4 switch modification 2019-05-15 12:01:30 -04:00
Priya
b77ec675e0 Switch molecule 2019-05-14 14:34:54 -04:00
Priya
af81b62f93 switch 2019-05-09 10:58:05 -04:00
Priya
14b01d0ae0 switch changes 2019-05-07 12:55:46 -04:00
Christiano, Kevin
f64c793aeb Multi-action-text label WIP. 2019-05-01 15:42:49 -04:00
Pfeil, Scott Robert
973ba11822 fix 2019-04-30 13:29:30 -04:00
Pfeil, Scott Robert
2d73f89fd4 separator
keys
clean up
2019-04-30 10:34:25 -04:00
Pfeil, Scott Robert
302a2f887f thickness. molecule alignment 2019-04-29 13:36:36 -04:00
Pfeil, Scott Robert
dc1372ca40 merge 2019-04-24 15:38:35 -04:00
Christiano, Kevin
4e6bd61ae6 Merge branch 'develop' into feature/kevin 2019-04-23 11:44:36 -04:00
Pfeil, Scott Robert
b00b43eab0 Helper functions
Molecule List.
Back to view instead of margins for stack due to background color issues.
Standard Header View to margin for internal use.
2019-04-22 13:14:22 -04:00
Christiano, Kevin
17decc6602 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atoms/Views/MFLabel.h
#	MVMCoreUI/Atoms/Views/MFLabel.m
2019-04-18 09:32:31 -04:00
Pfeil, Scott Robert
bd62fc14ce fill back 2019-04-16 14:02:20 -04:00
Christiano, Kevin
3a8b6890fa Merge branch 'develop' into feature/kevin 2019-04-16 09:15:05 -04:00
Christiano, Kevin
da1f5a5703 Converted MFLabel (objc) to Label (Swift). Pulled LabelWithoutAccessibilityTraits from Mobilefirst module and converted it. Altered imports where needed. 2019-04-15 16:50:35 -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
Pfeil, Scott Robert
ad3c0f90b4 molecule view changes 2019-04-15 11:46:26 -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
Pfeil, Scott Robert
074efcbf1d layout margins 2019-04-10 15:49:07 -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
62fe21a9d3 Merge branch 'feature/label' into 'develop'
Feature/label

See merge request BPHV_MIPS/mvm_core_ui!17
2019-04-04 13:57:26 -04:00