diff --git a/code/apps/Managed Software Center/MSCDockTilePlugin/DockTilePlugIn.h b/code/apps/Managed Software Center/MSCDockTilePlugin/DockTilePlugIn.h index 69b685a0..87009d14 100644 --- a/code/apps/Managed Software Center/MSCDockTilePlugin/DockTilePlugIn.h +++ b/code/apps/Managed Software Center/MSCDockTilePlugin/DockTilePlugIn.h @@ -2,7 +2,7 @@ File: DockTilePlugIn.h - Copyright 2015 Greg Neagle. + Copyright 2015-2016 Greg Neagle. Liberally adapted from Apple sample code: https://developer.apple.com/library/mac/samplecode/DockTile/Listings/DockTilePlugIn_DockTilePlugIn_h.html diff --git a/code/apps/Managed Software Center/MSCDockTilePlugin/DockTilePlugIn.m b/code/apps/Managed Software Center/MSCDockTilePlugin/DockTilePlugIn.m index c7fa4836..c2ec2f64 100644 --- a/code/apps/Managed Software Center/MSCDockTilePlugin/DockTilePlugIn.m +++ b/code/apps/Managed Software Center/MSCDockTilePlugin/DockTilePlugIn.m @@ -2,7 +2,7 @@ File: DockTilePlugIn.m - Copyright 2015 Greg Neagle. + Copyright 2015-2016 Greg Neagle. Liberally adapted from Apple sample code: https://developer.apple.com/library/mac/samplecode/DockTile/Listings/DockTilePlugIn_DockTilePlugIn_h.html diff --git a/code/apps/Managed Software Center/MSCDockTilePlugin/Info.plist b/code/apps/Managed Software Center/MSCDockTilePlugin/Info.plist index 953fc50e..f1f87ab4 100644 --- a/code/apps/Managed Software Center/MSCDockTilePlugin/Info.plist +++ b/code/apps/Managed Software Center/MSCDockTilePlugin/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.googlecode.munki.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType @@ -19,7 +19,7 @@ CFBundleVersion 1 NSHumanReadableCopyright - Copyright © 2015 The Munki Project. All rights reserved. + Copyright © 2016 The Munki Project. All rights reserved. NSPrincipalClass DockTile diff --git a/code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj b/code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj index d5dcd75a..f4b9019a 100644 --- a/code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj +++ b/code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj @@ -34,7 +34,7 @@ C0B9E8B619AF7E9E00DB7247 /* Managed Software Center 10_6.icns in Resources */ = {isa = PBXBuildFile; fileRef = C0B9E8B519AF7E9E00DB7247 /* Managed Software Center 10_6.icns */; }; C0E098BC1857A3C80045DEEB /* msclib.py in Resources */ = {isa = PBXBuildFile; fileRef = C0E098BB1857A3C80045DEEB /* msclib.py */; }; C0EF96BA1ADDB9B2002C02FF /* DockTilePlugIn.m in Sources */ = {isa = PBXBuildFile; fileRef = C0EF96B91ADDB9B2002C02FF /* DockTilePlugIn.m */; }; - C0EF96BD1ADDBD88002C02FF /* MSCDockTilePlugin.docktileplugin in Copy Files */ = {isa = PBXBuildFile; fileRef = C0EF96B11ADDB90B002C02FF /* MSCDockTilePlugin.docktileplugin */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + C0EF96BD1ADDBD88002C02FF /* MSCDockTilePlugin.docktileplugin in Copy Files */ = {isa = PBXBuildFile; fileRef = C0EF96B11ADDB90B002C02FF /* MSCDockTilePlugin.docktileplugin */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; C0F1586E187D256200052F9A /* MyStuffTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = C0F1586D187D256200052F9A /* MyStuffTemplate.png */; }; /* End PBXBuildFile section */ @@ -335,7 +335,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = MSC; - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0720; ORGANIZATIONNAME = "The Munki Project"; TargetAttributes = { C0EF96B01ADDB90B002C02FF = { @@ -606,6 +606,7 @@ CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -649,7 +650,6 @@ C090050F16CDD84E00BE34CE /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Managed Software Center/Managed Software Center-Prefix.pch"; @@ -665,6 +665,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = NO; + PRODUCT_BUNDLE_IDENTIFIER = com.googlecode.munki.ManagedSoftwareCenter; PRODUCT_NAME = "Managed Software Center"; SDKROOT = macosx; WRAPPER_EXTENSION = app; @@ -674,7 +675,6 @@ C090051016CDD84E00BE34CE /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Managed Software Center/Managed Software Center-Prefix.pch"; @@ -689,6 +689,7 @@ "$(SYSTEM_LIBRARY_DIR)/Frameworks/Python.framework/Versions/2.6/lib/python2.6/config", ); MACOSX_DEPLOYMENT_TARGET = 10.6; + PRODUCT_BUNDLE_IDENTIFIER = com.googlecode.munki.ManagedSoftwareCenter; PRODUCT_NAME = "Managed Software Center"; SDKROOT = macosx; WRAPPER_EXTENSION = app; @@ -698,7 +699,6 @@ C0EF96B61ADDB90B002C02FF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = NO; CLANG_WARN_BOOL_CONVERSION = YES; @@ -731,6 +731,7 @@ "-framework", AppKit, ); + PRODUCT_BUNDLE_IDENTIFIER = "com.googlecode.munki.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = NO; @@ -741,7 +742,6 @@ C0EF96B71ADDB90B002C02FF /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = NO; CLANG_WARN_BOOL_CONVERSION = YES; @@ -770,6 +770,7 @@ "-framework", AppKit, ); + PRODUCT_BUNDLE_IDENTIFIER = "com.googlecode.munki.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = NO; diff --git a/code/apps/Managed Software Center/Managed Software Center/FoundationPlist.py b/code/apps/Managed Software Center/Managed Software Center/FoundationPlist.py index 4afce132..5de85025 100644 --- a/code/apps/Managed Software Center/Managed Software Center/FoundationPlist.py +++ b/code/apps/Managed Software Center/Managed Software Center/FoundationPlist.py @@ -1,6 +1,6 @@ # encoding: utf-8 # -# Copyright 2009-2014 Greg Neagle. +# Copyright 2009-2016 Greg Neagle. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/code/apps/Managed Software Center/Managed Software Center/MSCAppDelegate.py b/code/apps/Managed Software Center/Managed Software Center/MSCAppDelegate.py index 4a7d0cd3..3b4e434d 100644 --- a/code/apps/Managed Software Center/Managed Software Center/MSCAppDelegate.py +++ b/code/apps/Managed Software Center/Managed Software Center/MSCAppDelegate.py @@ -3,7 +3,7 @@ # MSCAppDelegate.py # Managed Software Center # -# Copyright 2013-2014 Greg Neagle. +# Copyright 2013-2016 Greg Neagle. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/code/apps/Managed Software Center/Managed Software Center/MSCBadgedTemplateImage.py b/code/apps/Managed Software Center/Managed Software Center/MSCBadgedTemplateImage.py index a19ec7e2..8b7101ae 100644 --- a/code/apps/Managed Software Center/Managed Software Center/MSCBadgedTemplateImage.py +++ b/code/apps/Managed Software Center/Managed Software Center/MSCBadgedTemplateImage.py @@ -3,7 +3,7 @@ # MSCBadgedTemplateImage.py # Managed Software Center # -# Copyright 2014 Greg Neagle. +# Copyright 2014-2016 Greg Neagle. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -68,8 +68,8 @@ class MSCBadgedTemplateImage(NSImage): badgeOutlineWidth, badgeOutlineHeight) # shift the rects around to look better. These are magic numbers. - badgeStringRect = NSOffsetRect(badgeStringRect, -4.75, -1) - badgeOutlineRect = NSOffsetRect(badgeOutlineRect, -1, -4) + badgeStringRect = NSOffsetRect(badgeStringRect, -4.75, -2) + badgeOutlineRect = NSOffsetRect(badgeOutlineRect, -1, -5) # our erase rect needs to be a little bigger than the badge itself badgeEraseRect = NSInsetRect(badgeOutlineRect, -1.5, -1.5) diff --git a/code/apps/Managed Software Center/Managed Software Center/MSCMainWindowController.py b/code/apps/Managed Software Center/Managed Software Center/MSCMainWindowController.py index e9b4f165..259b083f 100644 --- a/code/apps/Managed Software Center/Managed Software Center/MSCMainWindowController.py +++ b/code/apps/Managed Software Center/Managed Software Center/MSCMainWindowController.py @@ -3,7 +3,7 @@ # MSCMainWindowController.py # Managed Software Center # -# Copyright 2013-2014 Greg Neagle. +# Copyright 2013-2016 Greg Neagle. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/code/apps/Managed Software Center/Managed Software Center/MSCStatusController.py b/code/apps/Managed Software Center/Managed Software Center/MSCStatusController.py index 473718fa..a9094797 100644 --- a/code/apps/Managed Software Center/Managed Software Center/MSCStatusController.py +++ b/code/apps/Managed Software Center/Managed Software Center/MSCStatusController.py @@ -2,7 +2,7 @@ # # MSCStatusController.py # -# Copyright 2009-2014 Greg Neagle. +# Copyright 2009-2016 Greg Neagle. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/code/apps/Managed Software Center/Managed Software Center/Managed Software Center-Info.plist b/code/apps/Managed Software Center/Managed Software Center/Managed Software Center-Info.plist index ab2dd430..f3f2863b 100644 --- a/code/apps/Managed Software Center/Managed Software Center/Managed Software Center-Info.plist +++ b/code/apps/Managed Software Center/Managed Software Center/Managed Software Center-Info.plist @@ -2,22 +2,16 @@ - NSUserNotificationAlertStyle - alert - NSDockTilePlugIn - MSCDockTilePlugin.docktileplugin - CFBundleDisplayName - ${PRODUCT_NAME} - LSHasLocalizedDisplayName - CFBundleDevelopmentRegion en + CFBundleDisplayName + ${PRODUCT_NAME} CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIconFile ${EXECUTABLE_NAME} CFBundleIdentifier - com.googlecode.munki.ManagedSoftwareCenter + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -25,21 +19,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.1 + 4.2 CFBundleSignature ???? - CFBundleVersion - 1 - GitRevision - - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSHumanReadableCopyright - Copyright © 2015 The Munki Project https://github.com/munki/munki - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication CFBundleURLTypes @@ -51,5 +33,23 @@ + CFBundleVersion + 1 + GitRevision + + LSHasLocalizedDisplayName + + LSMinimumSystemVersion + ${MACOSX_DEPLOYMENT_TARGET} + NSDockTilePlugIn + MSCDockTilePlugin.docktileplugin + NSHumanReadableCopyright + Copyright © 2016 The Munki Project https://github.com/munki/munki + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + NSUserNotificationAlertStyle + alert diff --git a/code/apps/Managed Software Center/Managed Software Center/MunkiItems.py b/code/apps/Managed Software Center/Managed Software Center/MunkiItems.py index 6c8047f9..1b265a30 100644 --- a/code/apps/Managed Software Center/Managed Software Center/MunkiItems.py +++ b/code/apps/Managed Software Center/Managed Software Center/MunkiItems.py @@ -5,7 +5,7 @@ # # Created by Greg Neagle on 2/21/14. # -# Copyright 2014 Greg Neagle. +# Copyright 2014-2016 Greg Neagle. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/code/apps/Managed Software Center/Managed Software Center/WebResources/base.css b/code/apps/Managed Software Center/Managed Software Center/WebResources/base.css index c99f9fbe..3e6b02f0 100644 --- a/code/apps/Managed Software Center/Managed Software Center/WebResources/base.css +++ b/code/apps/Managed Software Center/Managed Software Center/WebResources/base.css @@ -49,7 +49,7 @@ option { } body, button, input { - font-family: "Helvetica", "Arial"; + font-family: "Helvetica Neue", "Helvetica", "Arial"; font-smooth: always; -webkit-font-smoothing: antialiased } @@ -223,8 +223,8 @@ a { html, body { -webkit-background-size: 36px 635px; background-repeat: repeat-x; - background-color: #f5f6f7; - font-family: "Lucida Grande", Helvetica, sans-serif; + background-color: white; + font-family: "Helvetica Neue", Helvetica, sans-serif; font-size: 11px } @@ -276,7 +276,7 @@ div.columns { .sidebar { width: 200px; - margin-left: 15px + margin-left: 26px; } .sidebar h1, .main>h1 { @@ -284,15 +284,14 @@ div.columns { -webkit-font-smoothing: subpixel-antialiased; background-color: #002354; color: transparent; - font-family: Helvetica; + font-family: "Helvetica Neue", Helvetica; font-size: 24px; - font-weight: bold; + font-weight: normal; line-height: 26px; margin-bottom: 5px; overflow: visible; position: relative; - text-shadow: rgba(255, 255, 255, .496094) 0 1px 2px; - top: -5px + top: -5px; } footer { @@ -309,7 +308,7 @@ footer { } footer div.bottom-links { - margin: 0 35px 0 0; + margin: 0 0 0 0; border-top: 1px solid #d3d7db; position: relative } @@ -324,7 +323,6 @@ footer div.bottom-links * { color: #4f5f6e; font-size: 10px; font-weight: normal; - text-shadow: #fff 0 1px 0 } footer div.bottom-links>span { @@ -333,7 +331,7 @@ footer div.bottom-links>span { footer div.bottom-links li a { color: #576982; - font-weight: bold + font-weight: normal } footer div.bottom-links>ul>li:not(:last-child):after { @@ -396,14 +394,14 @@ div.select { div.select select { background: -webkit-gradient(linear, left top, left bottom, from( #fff), to( #eaeaea)); font-size: 11px; - font-weight: bold; - color: #626262; + font-weight: normal; + /*color: #626262;*/ outline: 0; line-height: 15px; margin: 0; padding: 0 25px 1px 5px; border: 0; - text-shadow: #fff 0 1px 0; + /*text-shadow: #fff 0 1px 0;*/ -webkit-appearance: none; -webkit-box-shadow: rgba(0, 0, 0, .35) 0 1px 2px, rgba(0, 0, 0, .8) 0 0 1px; box-shadow: rgba(0, 0, 0, .35) 0 1px 2px, rgba(0, 0, 0, .2) 0 0 1px; @@ -443,19 +441,14 @@ div.select:after { } div.titled-box { - background-color: #fff; margin-bottom: 15px; padding-bottom: 10px; -webkit-border-radius: 5px; - -webkit-box-shadow: rgba(0, 0, 0, .45) 0 1px 3px, rgba(0, 0, 0, .8) 0 0 1px; - box-shadow: rgba(0, 0, 0, .45) 0 1px 4px, rgba(0, 0, 0, .2) 0 0 1px; - -webkit-background-clip: padding } div.titled-box h2 { - font: bold 13px 'Lucida Grande'; + font: normal 14px "Helvetica Neue", 'Helvetica'; color: #53565e; - padding: 0 10px; line-height: 24px; overflow: hidden; text-overflow: ellipsis; @@ -463,9 +456,9 @@ div.titled-box h2 { } div.titled-box h2 a { - font: bold 12px 'Lucida Grande'; + font: normal 12px "Helvetica Neue", 'Helvetica'; color: #53565e; - line-height: 25px + line-height: 24px } div.titled-box>div.content { @@ -477,11 +470,11 @@ div.titled-box.quick-links>div.content { } div.titled-box h2, div.titled-box hr { - border-width: 0 0 3px 0; + border: none; } div.titled-box hr { - margin: 8px 0 + margin: 28px 0 } div.titled-box li.popup { @@ -507,7 +500,7 @@ div.titled-box li.link { padding: 0 11px; height: 19px; line-height: 16px; - font-weight: bold; + font-weight: normal; border-color: transparent; border-width: 1px 0; border-style: solid @@ -523,7 +516,7 @@ div.titled-box li.link.selected { div.titled-box li.link a { display: block; font-size: 11px; - font-weight: bold; + font-weight: normal; color: #222; overflow: hidden; text-overflow: ellipsis; @@ -539,32 +532,24 @@ body.screen-reader div.chart ol>li div.lockup div.lockup-info>div.multi-button { } div.lockup-container, div.container, div.titled-container { - background-color: #fff; - -webkit-border-radius: 5px; - -webkit-box-shadow: rgba(0, 0, 0, .45) 0 1px 3px, rgba(0, 0, 0, .8) 0 0 1px; - box-shadow: rgba(0, 0, 0, .45) 0 1px 4px, rgba(0, 0, 0, .2) 0 0 1px; - -webkit-background-clip: padding + /*-webkit-border-radius: 5px;*/ } div.lockup-container .title, div.titled-container .title { - padding: 0 10px; height: 32px; border-bottom: 1px solid #d7d7d7 } div.lockup-container .title h2, div.titled-container .title h2 { display: inline-block; - font: bold 14px 'Lucida Grande'; + font: normal 14px "Helvetica Neue", 'Helvetica'; color: #53565e; - padding: 0 10px 0 0; line-height: 32px } div.lockup-container .title, div.titled-container .title, div.titled-box h2 { - text-shadow: 0 1px 0 #fff; -webkit-border-top-left-radius: 5px; -webkit-border-top-right-radius: 5px; - background: -webkit-gradient(linear, left bottom, left top, from( #e3e3e3), color-stop(0.49, #ededed), color-stop(0.5, #f4f4f4), to(#fff)) } div.titled-box h2 { @@ -572,14 +557,16 @@ div.titled-box h2 { border-bottom: 1px solid #cacaca; border-width: 0 0 1px !important; margin-bottom: 6px; - -webkit-border-image: none + margin-top: 10px; + -webkit-border-image: none; + font-size: 13px; + line-height: 22px } div.lockup-container .title h1 { display: inline-block; - font: bold 14px Lucida Grande; + font: normal 14px "Helvetica Neue", Helvetica; color: #53565e; - padding: 0 10px 0 0; line-height: 32px } @@ -591,7 +578,7 @@ div.lockup-container .title h1 a { div.lockup-container .title span { color: #53565e; font-size: 10px; - font-weight: bold + font-weight: normal } div.lockup-container .content-and-controls, div.titled-container .content-and-controls { @@ -604,7 +591,6 @@ div.lockup-container .content-and-controls:before, div.titled-container .content position: absolute; width: 100%; top: -1px; - border-width: 0 0 3px 0; } div.lockup-container .content-and-controls:after, div.titled-container .content-and-controls:before { @@ -623,9 +609,6 @@ div.lockup-container div.lockup { float: left; width: 33.3%; height: 98px; - border-right: 1px solid #d9d9d9; - border-bottom: 1px solid #d9d9d9; - border-left: 1px solid #fff } div.lockup-container div.lockup div.artwork { @@ -673,18 +656,6 @@ div.lockup-container[data-columns-current="3"] div.lockup:nth-of-type(3n+2) { width: 33.4% } -div.lockup-container[data-columns-current="3"] div.lockup:nth-of-type(6n+1), -div.lockup-container[data-columns-current="3"] div.lockup:nth-of-type(6n+2), -div.lockup-container[data-columns-current="3"] div.lockup:nth-of-type(6n+3) { - background: #fff -} - -div.lockup-container[data-columns-current="3"] div.lockup:nth-of-type(6n+4), -div.lockup-container[data-columns-current="3"] div.lockup:nth-of-type(6n+5), -div.lockup-container[data-columns-current="3"] div.lockup:nth-of-type(6n+6) { - background: -webkit-gradient(linear, left top, left bottom, from( #f3f3f3), to( #eaeaea)) -} - div.lockup-container[data-columns-current="3"] div.lockup:nth-of-type(3n+1) { border-left: 0 } @@ -693,43 +664,16 @@ div.lockup-container:not(.shelf)[data-columns-current="3"] div.lockup:nth-of-typ display: table-cell; /*float: none;*/ /*height: auto;*/ - border-right: 0; } div.lockup-container[data-columns-current="3"] div.lockup:nth-last-of-type(3) { -webkit-border-bottom-left-radius: 5px } -div.lockup-container[data-columns-current="4"] div.lockup:nth-of-type(8n+1), -div.lockup-container[data-columns-current="4"] div.lockup:nth-of-type(8n+2), -div.lockup-container[data-columns-current="4"] div.lockup:nth-of-type(8n+3), -div.lockup-container[data-columns-current="4"] div.lockup:nth-of-type(8n+4) { - background: #fff -} - -div.lockup-container[data-columns-current="4"] div.lockup:nth-of-type(8n+5), -div.lockup-container[data-columns-current="4"] div.lockup:nth-of-type(8n+6), -div.lockup-container[data-columns-current="4"] div.lockup:nth-of-type(8n+7), -div.lockup-container[data-columns-current="4"] div.lockup:nth-of-type(8n+8) { - background: -webkit-gradient(linear, left top, left bottom, from( #f3f3f3), to( #eaeaea)) -} - div.lockup-container[data-columns-current="4"] div.lockup, div.lockup-container[data-columns-current="4"] div.lockup:nth-of-type(3n+2) { width: 25% } -div.lockup-container[data-columns-current="4"] div.lockup:nth-of-type(3n+1) { - border-left: 1px solid #fff -} - -div.lockup-container[data-columns-current="4"] div.lockup:nth-of-type(3n) { - border-right: 1px solid #d9d9d9 -} - -div.lockup-container[data-columns-current="4"] div.lockup:nth-of-type(4n+1) { - border-left: 0 -} - div.lockup-container:not(.shelf)[data-columns-current="4"] div.lockup:nth-of-type(4n) { display: table-cell; /*float: none; @@ -749,41 +693,10 @@ div.lockup-container[data-columns-current="5"] div.lockup, div.lockup-container[ width: 20% } -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(10n+1), -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(10n+2), -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(10n+3), -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(10n+4), -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(10n+5) { - background: #fff -} - -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(10n+6), -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(10n+7), -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(10n+8), -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(10n+9), -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(10n+10) { - background: -webkit-gradient(linear, left top, left bottom, from( #f3f3f3), to( #eaeaea)) -} - -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(3n+1), -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(4n+1) { - border-left: 1px solid #fff -} - -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(3n), -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(4n) { - border-right: 1px solid #d9d9d9 -} - -div.lockup-container[data-columns-current="5"] div.lockup:nth-of-type(5n+1) { - border-left: 0 -} - div.lockup-container:not(.shelf)[data-columns-current="5"] div.lockup:nth-of-type(5n) { display: table-cell; /*float: none; height: auto;*/ - border-right: 0 } div.lockup-container[data-columns-current="5"] div.lockup:nth-last-of-type(5) { @@ -817,7 +730,6 @@ div.lockup ul li { div.lockup li.name { color: #000; - font-weight: bold; max-width: 190px } @@ -839,8 +751,7 @@ div.lockup-container div.lockup ul li { div.lockup-container div.lockup.category ul { margin-top: 6px; - font-weight: bold; - text-shadow: 0 1px 0 #fff + font-weight: normal; } div.lockup-container div.lockup.category li.genre a { @@ -853,13 +764,13 @@ div.msc-button.small { div.msc-button-inner { height: 13px; - -webkit-border-radius: 10px; - background: -webkit-gradient(linear, 0% 0, 0% 100%, from( #A8AAAF), color-stop(0.05, #A6A8AE), color-stop(0.5, #A1A3A9), color-stop(0.96, #9C9EA4), to( #989DA3)); + -webkit-border-radius: 3px; + background: -webkit-gradient(linear, 0% 0, 0% 100%, from(rgb(166, 168, 174)), to(rgb(157, 159, 164))); border: 1px solid rgba(136, 136, 138, .746094); text-transform: uppercase; /*text-shadow: rgba(0, 0, 0, .5) 0 -1px 0;*/ color: #fff; - font: normal normal bold 9px/11px 'Lucida Grande'; + font: normal normal bold 9px/12px 'Helvetica'; padding-left: 10px; padding-right: 10px; } @@ -878,7 +789,7 @@ div.msc-button-inner.removing { } div.msc-button-inner:not(.installed-not-removable):hover { - background: -webkit-gradient(linear, left top, left bottom, from( #85868d), color-stop(0.05, #84858c), color-stop(0.5, #888188), color-stop(0.96, #7b7c83), to( #7a7bb2)) + background: -webkit-gradient(linear, left top, left bottom, from( #85868d), to( #7a7bb2)) } div.msc-button button { @@ -901,11 +812,10 @@ div.msc-button-inner.large { font-size: 13px; font-family: "Helvetica"; text-transform: capitalize; - line-height: 24px; - border: 0; + line-height: 21px; + border: 1px solid rgb(42, 73, 118); color: #fff; - text-shadow: rgba(0, 0, 0, .5) 0 -1px 0; - background: -webkit-gradient(linear, left top, left bottom, from( #367FD4), color-stop(0.50, #2255A0), color-stop(0.49, #2B68B6), to( #234F92)); + background: -webkit-gradient(linear, left top, left bottom, from(rgb(73,124,205)), to(rgb(47,79,143))); border-color: #1F4A7A; -webkit-border-radius: 5px; } @@ -925,7 +835,7 @@ div.msc-button-inner.large.removing { } div.msc-button-inner.large:not(.installed-not-removable):hover { - background: -webkit-gradient(linear, left top, left bottom, from( #0067B8), color-stop(0.49, #00509A), color-stop(0.50, #003E85), to( #003777)) + background: -webkit-gradient(linear, left top, left bottom, from( #0067B8), to( #003777)) } div.msc-button.install-updates { @@ -1072,9 +982,9 @@ div.msc-button-inner.install-updates:not(.installed-not-removable):hover { div.progress-spinner { background: url(progress-spinner.png) 0 0 no-repeat; - -webkit-background-size: 21px 20px; + -webkit-background-size: 20px 20px; opacity: 1; - width: 21px; + width: 20px; height: 20px; -webkit-animation-name: 'generic-loading-spinner-animation'; -webkit-animation-iteration-count: infinite; @@ -1202,7 +1112,6 @@ div.showcase { overflow: hidden; -webkit-transition: opacity .25s; -webkit-border-bottom-right-radius: 8px; - -webkit-box-shadow: 0 1px 3px #999; position: relative; left: 0; margin-right: 0; @@ -1223,7 +1132,7 @@ div.stage>img { position: absolute; height: 200px; left: 0; - background-color: #000; + /*background-color: #000;*/ text-align: left; overflow: hidden; -webkit-transition: opacity 1s ease-in-out; @@ -1346,9 +1255,9 @@ div.lockup li.removing span.progress-spinner { visibility: visible !important; float: right; background: url(progress-spinner.png) 0 0 no-repeat; - -webkit-background-size: 21px 20px; + -webkit-background-size: 20px 20px; opacity: 1; - width: 21px; + width: 20px; height: 20px; -webkit-animation-name: 'generic-loading-spinner-animation'; -webkit-animation-iteration-count: infinite; @@ -1361,8 +1270,8 @@ div.lockup li.preparing-removal span.progress-spinner, div.lockup li.installing span.progress-spinner, div.lockup li.removing span.progress-spinner { position: absolute; - bottom: 2px; - right: 2px; + bottom: 20px; + right: 20px; } div.lockup li { diff --git a/code/apps/Managed Software Center/Managed Software Center/WebResources/detail.css b/code/apps/Managed Software Center/Managed Software Center/WebResources/detail.css index 3d3681e2..2232793f 100644 --- a/code/apps/Managed Software Center/Managed Software Center/WebResources/detail.css +++ b/code/apps/Managed Software Center/Managed Software Center/WebResources/detail.css @@ -40,11 +40,11 @@ body.product .product-detail .product-info { } body.product .product-detail .product-info .title h1 { margin-bottom: 12px; -font-family: Helvetica; +font-family: "Helvetica Neue", Helvetica; font-size: 24px; line-height: 22px; -font-weight: bold; -color: #6d83a2; +/*font-weight: bold;*/ +/*color: #6d83a2;*/ text-shadow: rgba(255,255,255,1) 0 1px 0 } body.product .product-detail .product-info .title a { @@ -52,7 +52,7 @@ color: currentcolor } body.product .product-detail .product-info .product-review h4 { margin-bottom: 4px; -font-family: Helvetica; +font-family: "Helvetica Neue", Helvetica; font-size: 16px; font-weight: bold; color: #6d83a2; @@ -63,7 +63,6 @@ font-size: 12px; line-height: 16px } body.product .sidebar .app-info .content { -padding: 0 10px; font-size: 11px; color: #000 } @@ -72,7 +71,7 @@ margin-bottom: 5px } body.product .sidebar .app-info li .label, body.product .sidebar .app-info p span.label { -font-weight: bold; +font-weight: normal; color: #787878 } body.product .sidebar .more-by { @@ -85,7 +84,6 @@ body.product .sidebar .more-by div.lockup { display: -webkit-box; padding: 7px 10px; border-width: 0 0 1px 0; -background-image: -webkit-gradient(linear,left top,left bottom,from(#fff),to( #f9f9f9)); height: 55px } body.product .sidebar .more-by div.lockup:last-child { @@ -115,7 +113,7 @@ overflow: hidden body.product .sidebar .more-by div.lockup li.name { margin-bottom: 1px; font-size: 11px; -font-weight: bold +/*font-weight: bold*/ } body.product .sidebar .more-by div.lockup li.genre { color: #6c6c6c; diff --git a/code/apps/Managed Software Center/Managed Software Center/WebResources/progress-spinner.png b/code/apps/Managed Software Center/Managed Software Center/WebResources/progress-spinner.png index febc11e7..a42843bc 100644 Binary files a/code/apps/Managed Software Center/Managed Software Center/WebResources/progress-spinner.png and b/code/apps/Managed Software Center/Managed Software Center/WebResources/progress-spinner.png differ diff --git a/code/apps/Managed Software Center/Managed Software Center/WebResources/updates.css b/code/apps/Managed Software Center/Managed Software Center/WebResources/updates.css index 279fc4da..22f6a526 100644 --- a/code/apps/Managed Software Center/Managed Software Center/WebResources/updates.css +++ b/code/apps/Managed Software Center/Managed Software Center/WebResources/updates.css @@ -22,6 +22,9 @@ .main>div:not(:last-of-type) { margin-bottom: 20px } +div.status-results { + border-bottom: 1px solid #d9d9d9 +} div.installations { margin: 14px 0; position: relative @@ -41,19 +44,15 @@ div.installations table:not(.no-header):before { } div.installations thead { border-radius: 5px 5px 0 0; - padding: 0 0 0 10px; height: 32px; border-bottom: 1px solid #d7d7d7; - text-shadow: 0 1px 0 #fff; - background: -webkit-gradient(linear,left bottom,left top,from( #e3e3e3),color-stop(0.49, #ededed),color-stop(0.5, #f4f4f4),to(#fff)) } div.installations th { color: #53565e; font-size: 14px; - font-weight: bold; + font-weight: normal; height: 32px; line-height: 14px; - padding: 0 10px; text-align: left } #updates div.installations th { @@ -63,7 +62,13 @@ div.installations th { } #update-count-string { - margin-left: -10px + /*margin-left: -10px*/ +} + +#updates-progress-spinner { + margin-right: 4px; + position: relative; + left: 0px; } div.installations th:first-child { @@ -72,9 +77,6 @@ div.installations th:first-child { div.installations th:last-child { -webkit-border-top-right-radius: 5px } -div.installations tbody tr:nth-of-type(even) { - background: -webkit-gradient(linear,left top,left bottom,from( #f3f3f3),to( #eaeaea)) -} .installation td { border-top: 1px solid #fff; border-bottom: 1px solid #d9d9d9; @@ -83,6 +85,9 @@ div.installations tbody tr:nth-of-type(even) { .installation td,.installation td a { color: #494949 } +.installation td.install-info-cell,.installation td.install-info-cell a, li.install-info-cell { + color: rgb(121,121,121) +} .installation:first-child td { border-top: transparent } @@ -100,7 +105,7 @@ div.installations tbody tr:nth-of-type(even) { .installation h2 { color: #565656; font-size: 13px; - font-weight: bold; + font-weight: normal; overflow: hidden; text-overflow: ellipsis; max-width: 300px @@ -133,7 +138,7 @@ div.installations tbody tr:nth-of-type(even) { -webkit-box-shadow: none } #other-updates #os-updates,#os-and-app-updates #os-updates { - border-bottom: 1px solid #d9d9d9 + /*border-bottom: 1px solid #d9d9d9*/ } #other-updates #os-updatesth:last-child,#os-and-app-updates #os-updates th:last-child { width: 100%; @@ -148,29 +153,21 @@ div.installations tbody tr:nth-of-type(even) { top: 6px; left: 0 } -#os-and-app-updates #os-updates:not(.hidden)+#app-updates tbody tr:nth-of-type(even) { - background: 0 -} -#os-and-app-updates #os-updates:not(.hidden)+#app-updates tbody tr:nth-of-type(odd) { - background: -webkit-gradient(linear,left top,left bottom,from( #f3f3f3),to( #eaeaea)) -} + @-webkit-keyframes fade-out-and-remove { 0% {opacity: 1} 100% {opacity: 0} } -#purchases { - text-shadow:#fff 0 1px 0 -} div.purchases .installation td { height: 41px } -div.purchases .installation:last-child td:first-child { +/*div.purchases .installation:last-child td:first-child { -webkit-border-bottom-left-radius: 5px } div.purchases .installation:last-child td:last-child { -webkit-border-bottom-right-radius: 5px -} +}*/ div.purchases .installation td:first-child { width: 225px } @@ -238,9 +235,8 @@ div.purchases .installation td.status span.preparing-removal } #updates #header h1 { font-size: 15px; - font-weight: bold; + font-weight: normal; color: #929292; - text-shadow: 0 1px 0 #fff; text-align: center } div.updates table { @@ -385,13 +381,12 @@ div.os-updates.expanded tbody tr:nth-child(n+3):before { top: 0; right: 100px; left: 240px; - background: -webkit-linear-gradient(left,rgba(0,0,0,.04) 0,rgba(0,0,0,.16) 20%,rgba(0,0,0,.16) 80%,rgba(0,0,0,.04) 100%) } div.os-updates.expanded tbody tr.sosumi:before { display: none } .activity-indicator { - font: bold 20px Helvetica + font: normal 20px "Helvetica Neue", Helvetica } #updates #header .scan-progress { padding: 0 0 1px 13px diff --git a/code/apps/Managed Software Center/Managed Software Center/da.lproj/InfoPlist.strings b/code/apps/Managed Software Center/Managed Software Center/da.lproj/InfoPlist.strings index ec46d6c7..d5dca659 100644 --- a/code/apps/Managed Software Center/Managed Software Center/da.lproj/InfoPlist.strings +++ b/code/apps/Managed Software Center/Managed Software Center/da.lproj/InfoPlist.strings @@ -2,4 +2,4 @@ "CFBundleName" = "Managed Software Center"; "CFBundleDisplayName" = "Managed Software Center"; -NSHumanReadableCopyright = "Copyright © 2010-2014 The Munki Project\nhttps://github.com/munki/munki"; \ No newline at end of file +NSHumanReadableCopyright = "Copyright © 2010-2016 The Munki Project\nhttps://github.com/munki/munki"; \ No newline at end of file diff --git a/code/apps/Managed Software Center/Managed Software Center/de.lproj/InfoPlist.strings b/code/apps/Managed Software Center/Managed Software Center/de.lproj/InfoPlist.strings index 358d0665..4cbe6fc9 100644 --- a/code/apps/Managed Software Center/Managed Software Center/de.lproj/InfoPlist.strings +++ b/code/apps/Managed Software Center/Managed Software Center/de.lproj/InfoPlist.strings @@ -2,4 +2,4 @@ "CFBundleName" = "Geführte Softwareaktualisierung"; "CFBundleDisplayName" = "Geführte Softwareaktualisierung"; -NSHumanReadableCopyright = "Copyright © 2010-2014 The Munki Project\nhttps://github.com/munki/munki"; \ No newline at end of file +NSHumanReadableCopyright = "Copyright © 2010-2016 The Munki Project\nhttps://github.com/munki/munki"; \ No newline at end of file diff --git a/code/apps/Managed Software Center/Managed Software Center/en.lproj/InfoPlist.strings b/code/apps/Managed Software Center/Managed Software Center/en.lproj/InfoPlist.strings index ec46d6c7..d5dca659 100644 --- a/code/apps/Managed Software Center/Managed Software Center/en.lproj/InfoPlist.strings +++ b/code/apps/Managed Software Center/Managed Software Center/en.lproj/InfoPlist.strings @@ -2,4 +2,4 @@ "CFBundleName" = "Managed Software Center"; "CFBundleDisplayName" = "Managed Software Center"; -NSHumanReadableCopyright = "Copyright © 2010-2014 The Munki Project\nhttps://github.com/munki/munki"; \ No newline at end of file +NSHumanReadableCopyright = "Copyright © 2010-2016 The Munki Project\nhttps://github.com/munki/munki"; \ No newline at end of file diff --git a/code/apps/Managed Software Center/Managed Software Center/en.lproj/MainMenu.xib b/code/apps/Managed Software Center/Managed Software Center/en.lproj/MainMenu.xib index 6c96d878..159f2405 100644 --- a/code/apps/Managed Software Center/Managed Software Center/en.lproj/MainMenu.xib +++ b/code/apps/Managed Software Center/Managed Software Center/en.lproj/MainMenu.xib @@ -1,9 +1,9 @@ - + - - + + @@ -211,11 +211,13 @@ + + @@ -228,6 +230,7 @@