Commit Graph

175 Commits

Author SHA1 Message Date
panxi
b58c191401 update stylegetattributestring function name to 2.0
change grayish color to mfgraycolor for body lighter
2019-04-03 16:12:27 -04:00
panxi
4e328eeb83 update label and styler 2019-04-03 15:46:06 -04:00
panxi
7d7284bd8d remove actions from mflabel 2019-04-03 12:21:31 -04:00
panxi
1f83778680 remove useless font 2019-04-01 15:22:17 -04:00
panxi
1baa755cae change font to B20 form feed message 2019-04-01 15:05:42 -04:00
panxi
b70f27f67a change feed headline to H32 2019-04-01 14:53:29 -04:00
panxi
560ea1030d add actions into mflabel 2019-04-01 12:01:44 -04:00
panxi
8e0671f9bc Merge branch 'develop' into feature/label 2019-03-29 09:45:22 -04:00
Pfeil, Scott Robert
de0c031b7f Merge branch 'feature/kevin' into 'develop'
Removed a comma at the end

See merge request BPHV_MIPS/mvm_core_ui!18
2019-03-29 09:03:59 -04:00
Christiano, Kevin
814f2e1386 Removed a comma at the end 2019-03-29 08:54:36 -04:00
Pfeil, Scott Robert
0c172ebeb8 Merge branch 'feature/kevin' into 'develop'
Feature/kevin

See merge request BPHV_MIPS/mvm_core_ui!9
2019-03-29 08:53:14 -04:00
Christiano, Kevin
5083fb7c88 molecule map change. 2019-03-29 08:52:22 -04:00
Christiano, Kevin
f12f9b17f7 Removed dash line from molecule map. 2019-03-29 08:51:37 -04:00
Christiano, Kevin
ef1e43f6c2 Merge branch 'develop' into feature/kevin 2019-03-28 13:21:41 -04:00
panxi
0db36c1405 reduce fonts 2019-03-28 12:01:57 -04:00
panxi
b43690d10e clean up some fonts method 2019-03-28 11:19:18 -04:00
panxi
6ee6170031 remove feedsubmessage 2019-03-28 10:43:09 -04:00
panxi
3cc9750333 remove 1.0 fonts 2019-03-28 10:39:02 -04:00
panxi
5fa9bd1572 remove SubheadBold and SubheadBoldlarge 2019-03-27 17:40:37 -04:00
panxi
ca1c77bc10 remove plan card title 2019-03-27 17:13:20 -04:00
panxi
883c4b6ea2 remove headlineblack 2019-03-27 17:02:17 -04:00
panxi
6c7e745358 remove HeadlineExtraLarge 2019-03-27 16:57:13 -04:00
panxi
23f75ab2cc remove BodyLighter font and label 2019-03-27 16:52:14 -04:00
panxi
4240b6a2f4 change body bold to b1 2019-03-27 16:35:55 -04:00
panxi
124069c0be change body bold to b1 2019-03-27 15:59:28 -04:00
Suresh, Kamlesh
1d6293a0d5 Merge branch 'feature/html_label' into 'develop'
html string

See merge request BPHV_MIPS/mvm_core_ui!15
2019-03-27 11:30:34 -04:00
Christiano, Kevin
f903e4ee60 Removed Line. Changed comment. 2019-03-27 11:17:05 -04:00
Christiano, Kevin
42e482d727 Returned addCaretImageView() to the golden path. 2019-03-27 10:46:26 -04:00
Pfeil, Scott Robert
ae4512abff html string 2019-03-27 10:13:51 -04:00
Christiano, Kevin
f154befabf Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-03-26 16:43:47 -04:00
Christiano, Kevin
6f77c64e16 Improvements made. 2019-03-26 16:40:23 -04:00
Pfeil, Scott Robert
4dea8a784f Merge branch 'feature/swifty_buttons' into 'develop'
Feature/swifty buttons

See merge request BPHV_MIPS/mvm_core_ui!13
2019-03-26 11:24:58 -04:00
Pfeil, Scott Robert
bc5e4b311b un nonnulla 2019-03-25 17:32:24 -04:00
Pfeil, Scott Robert
623b1590ee delete unused 2019-03-25 17:11:31 -04:00
Pfeil, Scott Robert
aab0fbc083 non null 2019-03-25 17:07:02 -04:00
Pfeil, Scott Robert
f63b157c16 Fixes to make two button more compatible with legacy 2019-03-25 16:51:51 -04:00
Christiano, Kevin
45467c9e3f Merge branch 'develop' into feature/kevin 2019-03-25 13:15:36 -04:00
Pfeil, Scott Robert
b25b869c4d fix to size check 2019-03-25 12:59:07 -04:00
Pfeil, Scott Robert
b7556fdce9 merge 2019-03-25 09:57:47 -04:00
Pfeil, Scott Robert
b61b6959ca Merge branch 'develop' into feature/load_image_swift 2019-03-25 09:53:46 -04:00
Pfeil, Scott Robert
a2ab8c6571 swifty buttons 2019-03-25 09:37:54 -04:00
Suresh, Kamlesh
7920f8f550 Merge branch 'bugfix/nib_crash' into 'develop'
Fix mfloadimageView to swift crash

See merge request BPHV_MIPS/mvm_core_ui!12
2019-03-22 12:31:02 -04:00
Pfeil, Scott Robert
7341e6930c Fix mfloadimageView to swift crash 2019-03-22 12:06:24 -04:00
Christiano, Kevin
a4bb00d1ae Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-03-21 16:11:26 -04:00
Christiano, Kevin
b592ff5047 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-03-21 15:47:49 -04:00
Christiano, Kevin
d8fedf4d8b placing CaretButton in molecule map. 2019-03-21 14:58:22 -04:00
Suresh, Kamlesh
103f465cc8 Merge branch 'feature/load_image_swift' into 'develop'
Feature/load image swift

See merge request BPHV_MIPS/mvm_core_ui!8
2019-03-21 14:46:44 -04:00
Christiano, Kevin
c7bcd6e03d Converted and atomized CaretButton. Removed old objc files of MFCaretButton. Reflected import changes where necessary. 2019-03-21 14:39:25 -04:00
Pfeil, Scott Robert
12faad3d0d merge 2019-03-21 14:17:18 -04:00
Pfeil, Scott Robert
c411ec83ee Button defaulting 2019-03-20 14:42:20 -04:00