Commit Graph

182 Commits

Author SHA1 Message Date
Kevin G Christiano
9b86b4449f dcsds 2019-10-22 11:54:13 -04:00
Pfeil, Scott Robert
758615bcb7 Merge branch 'feature/healine_body_button_molecule' into 'develop'
HeadlineBodyButton Mole

See merge request BPHV_MIPS/mvm_core_ui!134
2019-10-22 11:13:30 -04:00
Kevin G Christiano
2248b36ccb one less body. 2019-10-22 11:10:06 -04:00
Kevin G Christiano
b79b999910 added secondary. 2019-10-22 11:04:22 -04:00
Kevin G Christiano
f067a20ba9 hero stuff. 2019-10-18 08:47:14 -04:00
Kevin G Christiano
720d17d751 revisions made. 2019-10-17 15:35:14 -04:00
Kevin G Christiano
3178fa0223 Merge branch 'develop' into feature/healine_body_button_molecule
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-10-17 14:40:51 -04:00
Kevin G Christiano
6d52663b4f fixed small error in refactor. 2019-10-17 14:06:01 -04:00
Kevin G Christiano
11b2ddc4dd Merge branch 'develop' into feature/label_hero_character 2019-10-17 12:17:17 -04:00
Pfeil, Scott Robert
bb51fba0e5 remove legacy os code 2019-10-17 10:31:34 -04:00
Kevin G Christiano
96e5f47dd0 Merge branch 'develop' into feature/label_hero_character 2019-09-23 14:28:42 -04:00
Pfeil, Scott Robert
0bb3c8a719 new molecule and gone state of stack. 2019-09-23 12:21:59 -04:00
Pfeil, Scott Robert
6cdde756e5 bug fixes 2019-09-19 09:06:14 -04:00
Kevin G Christiano
1c416b5653 revised. 2019-09-18 14:15:56 -04:00
Kevin G Christiano
4ea916bbcd commenting. 2019-09-18 14:14:37 -04:00
Kevin G Christiano
5bc420ac05 accessoryVIew can now center itself in relation to the hero character. 2019-09-18 14:13:33 -04:00
Kevin G Christiano
6f4db10d33 beginning work on hero. 2019-09-16 10:24:18 -04:00
Kevin G Christiano
cdc7ae2f1e added layoutMarginsGuide. 2019-09-13 09:08:33 -04:00
Kevin G Christiano
ad1def8ddc changed default state name. 2019-09-12 16:38:18 -04:00
Kevin G Christiano
bedd05daa6 Creation and inclusion of HeadlineBodyButton molecule. 2019-09-12 14:42:10 -04:00
Pan, Xinlei (Ryan)
52679e95f3 Merge branch 'bugfix/constraining_molecules' into 'develop'
alignment fix issues.

See merge request BPHV_MIPS/mvm_core_ui!133
2019-09-12 09:51:14 -04:00
Pfeil, Scott Robert
4050b784ed alignment fix issues. 2019-09-10 14:11:09 -04:00
Pfeil, Scott Robert
b4c53f838b Tabs table cell 2019-09-09 14:07:32 -04:00
Pfeil, Scott Robert
3ff48cf700 Style 2019-09-04 13:45:41 -04:00
Pan, Xinlei (Ryan)
a80b68dc14 Merge branch 'bugfix/secondary_button_color' into 'develop'
border the button

See merge request BPHV_MIPS/mvm_core_ui!124
2019-09-03 17:31:31 -04:00
Pfeil, Scott Robert
2fd55f0aff border the button 2019-09-03 17:12:17 -04:00
Pfeil, Scott Robert
ea13603b7d font update 2019-09-03 16:52:10 -04:00
Pfeil, Scott Robert
32b2ab825b hide separator flag 2019-09-03 15:52:23 -04:00
Pfeil, Scott Robert
aeaf7ecc5e Merge remote-tracking branch 'refs/remotes/origin/develop' 2019-09-03 15:14:21 -04:00
Pfeil, Scott Robert
658ed16bbd accordion list item 2019-09-03 15:14:12 -04:00
Kevin G Christiano
2792808c9e Further changes made. 2019-08-29 14:20:42 -04:00
Kevin G Christiano
8e216f8b90 Corrections made. 2019-08-29 14:13:44 -04:00
Kevin G Christiano
0a97774098 Merge branch 'develop' into feature/align_actiondetaiimage_with_android 2019-08-29 13:29:16 -04:00
Kevin G Christiano
40b771f2da Merge branch 'develop' into feature/align_actiondetaiimage_with_android 2019-08-29 10:52:45 -04:00
Kevin G Christiano
4f47aa9ad5 changed key. 2019-08-29 10:52:20 -04:00
Pfeil, Scott Robert
3e426cb80b Fix to two button view 2019-08-29 10:19:28 -04:00
Pfeil, Scott Robert
3234a6ee7e estimated heights update 2019-08-29 08:35:27 -04:00
Pfeil, Scott Robert
b5276f5519 New molecules and arranging files 2019-08-29 08:28:07 -04:00
Pfeil, Scott Robert
4bc22dbb8e switches 2019-08-26 12:35:04 -04:00
Pfeil, Scott Robert
a9539c6c89 Fix competition 2019-08-20 10:44:15 -04:00
Pfeil, Scott Robert
6a2405989d Fixes to ambiguity 2019-08-20 10:00:07 -04:00
Pfeil, Scott Robert
11669c173e typo fix 2019-08-19 16:18:27 -04:00
Pfeil, Scott Robert
021036d88c fix to use margins 2019-08-19 16:16:50 -04:00
Pfeil, Scott Robert
10755d888f change vertical 2019-08-15 15:24:37 -04:00
Pfeil, Scott Robert
f3f8d57a0b timing fix... 2019-08-15 10:59:25 -04:00
Pfeil, Scott Robert
d5e49d0e5a progress bar fixes 2019-08-15 10:50:29 -04:00
Kevin G Christiano
248ee9a0d4 Changed code to align with Android. 2019-08-14 10:05:44 -04:00
Pan, Xinlei (Ryan)
b65cb3ed5c Merge branch 'bugfix/insets' into 'develop'
fix inset defect for safe area

See merge request BPHV_MIPS/mvm_core_ui!114
2019-08-13 16:24:18 -04:00
Pfeil, Scott Robert
ab08845708 fix inset defect for safe area 2019-08-13 15:38:06 -04:00
Kevin G Christiano
669d087a57 moved file. 2019-08-13 09:38:05 -04:00