Skip to content

Commit

Permalink
Merge pull request #436 from shadowfoundry/dev
Browse files Browse the repository at this point in the history 
v11.0.8
  • Loading branch information
@karmaroms
karmaroms committed Oct 7, 2023
2 parents 7c0bf33 + 90f95ca commit f74c72d
Show file tree
Hide file tree
Showing 16 changed files with 484 additions and 7 deletions.
Binary file added css/fonts/sabon_roman.otf
View file
Binary file not shown.
65 changes: 65 additions & 0 deletions css/sr5.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1419,6 +1419,10 @@ input[type=range]:focus::-ms-fill-upper {
font-weight: bold;
src: url("./fonts/srfoundry_bold.otf");
}
@font-face {
font-family: "srfoundry_journal";
src: url("./fonts/sabon_roman.otf");
}
.SR5iconActor {
height: 32px;
width: 32px;
Expand Down Expand Up @@ -4155,6 +4159,67 @@ input[type=range]:focus::-ms-fill-upper {
background-position: top;
background-repeat: repeat;
}
.app.window-app.journal-sheet .journal-entry-page p,
.app.window-app.journal-sheet .journal-page-content p {
font-family: "srfoundry_journal";
}
.app.window-app.journal-sheet .journal-entry-page code,
.app.window-app.journal-sheet .journal-page-content code {
text-wrap: wrap;
font-family: "srfoundry_regular";
}
.app.window-app.journal-sheet .journal-entry-page blockquote,
.app.window-app.journal-sheet .journal-page-content blockquote {
background: rgba(147, 16, 4, 0.1);
border: 1px solid #931004;
margin: 1em 0 1em 0;
padding: 0px 10px 0px 10px;
}
.app.window-app.journal-sheet .journal-entry-page blockquote p,
.app.window-app.journal-sheet .journal-page-content blockquote p {
font-family: "srfoundry_regular";
font-style: normal;
}
.app.window-app.journal-sheet .journal-entry-page blockquote p:not(:first-child),
.app.window-app.journal-sheet .journal-page-content blockquote p:not(:first-child) {
margin-top: 0px;
}
.app.window-app.journal-sheet .journal-entry-page blockquote h1,
.app.window-app.journal-sheet .journal-page-content blockquote h1,
.app.window-app.journal-sheet .journal-entry-page blockquote h2,
.app.window-app.journal-sheet .journal-page-content blockquote h2,
.app.window-app.journal-sheet .journal-entry-page blockquote h3,
.app.window-app.journal-sheet .journal-page-content blockquote h3,
.app.window-app.journal-sheet .journal-entry-page blockquote h4,
.app.window-app.journal-sheet .journal-page-content blockquote h4 {
font-family: "srfoundry_primary";
text-transform: uppercase;
color: #931004;
font-style: normal;
border-bottom: none;
margin-bottom: 0;
}
.app.window-app.journal-sheet .journal-entry-page blockquote h1:not(:first-child),
.app.window-app.journal-sheet .journal-page-content blockquote h1:not(:first-child),
.app.window-app.journal-sheet .journal-entry-page blockquote h2:not(:first-child),
.app.window-app.journal-sheet .journal-page-content blockquote h2:not(:first-child),
.app.window-app.journal-sheet .journal-entry-page blockquote h3:not(:first-child),
.app.window-app.journal-sheet .journal-page-content blockquote h3:not(:first-child),
.app.window-app.journal-sheet .journal-entry-page blockquote h4:not(:first-child),
.app.window-app.journal-sheet .journal-page-content blockquote h4:not(:first-child) {
margin-top: 20px;
}
.app.window-app.journal-sheet .journal-entry-page a.content-link,
.app.window-app.journal-sheet .journal-page-content a.content-link {
color: #931004;
background: transparent;
border: none;
font-family: "srfoundry_regular";
}
.app.window-app.journal-sheet .journal-entry-page a.content-link i,
.app.window-app.journal-sheet .journal-page-content a.content-link i {
color: #931004;
}
.app.window-app.journal-sheet .journal-entry-content {
background-image: url("../img/ui/SR5_BG_NoteTop.png"), url("../img/ui/SR5_BG_Blanc.jpg");
background-size: auto 90px, cover;
Expand Down
65 changes: 65 additions & 0 deletions css/sr6.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1419,6 +1419,10 @@ input[type=range]:focus::-ms-fill-upper {
font-weight: bold;
src: url("./fonts/srfoundry_bold.otf");
}
@font-face {
font-family: "srfoundry_journal";
src: url("./fonts/sabon_roman.otf");
}
.SR5iconActor {
height: 32px;
width: 32px;
Expand Down Expand Up @@ -4155,6 +4159,67 @@ input[type=range]:focus::-ms-fill-upper {
background-position: top;
background-repeat: repeat;
}
.app.window-app.journal-sheet .journal-entry-page p,
.app.window-app.journal-sheet .journal-page-content p {
font-family: "srfoundry_journal";
}
.app.window-app.journal-sheet .journal-entry-page code,
.app.window-app.journal-sheet .journal-page-content code {
text-wrap: wrap;
font-family: "srfoundry_regular";
}
.app.window-app.journal-sheet .journal-entry-page blockquote,
.app.window-app.journal-sheet .journal-page-content blockquote {
background: rgba(178, 0, 122, 0.1);
border: 1px solid #b2007a;
margin: 1em 0 1em 0;
padding: 0px 10px 0px 10px;
}
.app.window-app.journal-sheet .journal-entry-page blockquote p,
.app.window-app.journal-sheet .journal-page-content blockquote p {
font-family: "srfoundry_regular";
font-style: normal;
}
.app.window-app.journal-sheet .journal-entry-page blockquote p:not(:first-child),
.app.window-app.journal-sheet .journal-page-content blockquote p:not(:first-child) {
margin-top: 0px;
}
.app.window-app.journal-sheet .journal-entry-page blockquote h1,
.app.window-app.journal-sheet .journal-page-content blockquote h1,
.app.window-app.journal-sheet .journal-entry-page blockquote h2,
.app.window-app.journal-sheet .journal-page-content blockquote h2,
.app.window-app.journal-sheet .journal-entry-page blockquote h3,
.app.window-app.journal-sheet .journal-page-content blockquote h3,
.app.window-app.journal-sheet .journal-entry-page blockquote h4,
.app.window-app.journal-sheet .journal-page-content blockquote h4 {
font-family: "srfoundry_primary";
text-transform: uppercase;
color: #b2007a;
font-style: normal;
border-bottom: none;
margin-bottom: 0;
}
.app.window-app.journal-sheet .journal-entry-page blockquote h1:not(:first-child),
.app.window-app.journal-sheet .journal-page-content blockquote h1:not(:first-child),
.app.window-app.journal-sheet .journal-entry-page blockquote h2:not(:first-child),
.app.window-app.journal-sheet .journal-page-content blockquote h2:not(:first-child),
.app.window-app.journal-sheet .journal-entry-page blockquote h3:not(:first-child),
.app.window-app.journal-sheet .journal-page-content blockquote h3:not(:first-child),
.app.window-app.journal-sheet .journal-entry-page blockquote h4:not(:first-child),
.app.window-app.journal-sheet .journal-page-content blockquote h4:not(:first-child) {
margin-top: 20px;
}
.app.window-app.journal-sheet .journal-entry-page a.content-link,
.app.window-app.journal-sheet .journal-page-content a.content-link {
color: #b2007a;
background: transparent;
border: none;
font-family: "srfoundry_regular";
}
.app.window-app.journal-sheet .journal-entry-page a.content-link i,
.app.window-app.journal-sheet .journal-page-content a.content-link i {
color: #b2007a;
}
.app.window-app.journal-sheet .journal-entry-content {
background-image: url("../img/ui/SR6_BG_NoteTop.png"), url("../img/ui/SR6_BG_Blanc.jpg");
background-size: auto 90px, cover;
Expand Down
57 changes: 57 additions & 0 deletions lang/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"SOURCE.DataTrails": "Data Trails",
"SOURCE.ForbiddenArcana": "Forbidden Arcana",
"SOURCE.GunHeaven3": "Gun Heaven 3",
"SOURCE.HardTargets": "Hard Targets",
"SOURCE.HowlingShadows": "Howling Shadows",
"SOURCE.KillCode": "Kill Code",
"SOURCE.Lockdown": "Lockdown",
Expand All @@ -71,6 +72,8 @@
"SOURCE.StreetGrimoire": "Street Grimoire",
"SOURCE.StreetLethal": "Street Lethal",
"SR5.Abomination": "Abomination",
"SR5.AccessoryAdditionalClipMagazine": "Additional Clip / Magazine",
"SR5.AccessoryAdditionalClipMagazine_GE": "",
"SR5.AccessoryAdvancedSafetySystem": "Advanced Safety System",
"SR5.AccessoryAdvancedSafetySystem_GE": "",
"SR5.AccessoryAdvancedSafetySystemElec": "Advanced Safety System (Electro shocker)",
Expand All @@ -83,6 +86,8 @@
"SR5.AccessoryAdvancedSafetySystemSelfD_GE": "",
"SR5.AccessoryAirburstLink": "Airburst Link",
"SR5.AccessoryAirburstLink_GE": "",
"SR5.AccessoryAmmoSkipSystem": "Ammo Skip System",
"SR5.AccessoryAmmoSkipSystem_GE": "",
"SR5.AccessoryBatteryBackPack": "Peak-discharge battery packs (backpack)",
"SR5.AccessoryBatteryBackPack_GE": "",
"SR5.AccessoryBatteryClip": "Peak-discharge battery packs (clip)",
Expand All @@ -95,14 +100,40 @@
"SR5.AccessoryBipod_GE": "",
"SR5.AccessoryCapBall": "Cap & Ball",
"SR5.AccessoryCapBall_GE": "",
"SR5.AccessoryCeramicPlasteelCompo1": "Ceramic/Plasteel Components (1)",
"SR5.AccessoryCeramicPlasteelCompo1_GE": "",
"SR5.AccessoryCeramicPlasteelCompo2": "Ceramic/Plasteel Components (2)",
"SR5.AccessoryCeramicPlasteelCompo2_GE": "",
"SR5.AccessoryCeramicPlasteelCompo3": "Ceramic/Plasteel Components (3)",
"SR5.AccessoryCeramicPlasteelCompo3_GE": "",
"SR5.AccessoryCeramicPlasteelCompo4": "Ceramic/Plasteel Components (4)",
"SR5.AccessoryCeramicPlasteelCompo4_GE": "",
"SR5.AccessoryCeramicPlasteelCompo5": "Ceramic/Plasteel Components (5)",
"SR5.AccessoryCeramicPlasteelCompo5_GE": "",
"SR5.AccessoryCeramicPlasteelCompo6": "Ceramic/Plasteel Components (6)",
"SR5.AccessoryCeramicPlasteelCompo6_GE": "",
"SR5.AccessoryChameleonCoating": "Chameleon coating",
"SR5.AccessoryChameleonCoating_GE": "",
"SR5.AccessoryConcealableHolster": "Concealable Holster",
"SR5.AccessoryConcealableHolster_GE": "",
"SR5.AccessoryConcealedQDHolster": "Concealable Quick-draw Holster",
"SR5.AccessoryConcealedQDHolster_GE": "",
"SR5.AccessoryCustomLook": "Custom Look",
"SR5.AccessoryCustomLook_GE": "",
"SR5.AccessoryEasyBreakdownManual": "Easy Breakdown (Manual)",
"SR5.AccessoryEasyBreakdownManual_GE": "",
"SR5.AccessoryEasyBreakdownPowered": "Easy Breakdown (Powered)",
"SR5.AccessoryEasyBreakdownPowered_GE": "",
"SR5.AccessoryElectronicFiring": "Electronic Firing",
"SR5.AccessoryElectronicFiring_GE": "",
"SR5.AccessoryExplosiveClip": "Explosive Clip",
"SR5.AccessoryExplosiveClip_GE": "",
"SR5.AccessoryExtendedBarrel": "Extended Barrel",
"SR5.AccessoryExtendedBarrel_GE": "",
"SR5.AccessoryExtendedClip1": "Extended Clip (1)",
"SR5.AccessoryExtendedClip1_GE": "",
"SR5.AccessoryExtendedClip2": "Extended Clip (2)",
"SR5.AccessoryExtendedClip2_GE": "",
"SR5.AccessoryExtremeEnvironment": "Extreme environment modification",
"SR5.AccessoryExtremeEnvironment_GE": "",
"SR5.AccessoryFlashLight": "Flash Light",
Expand All @@ -127,6 +158,8 @@
"SR5.AccessoryGuncam_GE": "",
"SR5.AccessoryGyroMount": "Gyro Mount",
"SR5.AccessoryGyroMount_GE": "",
"SR5.AccessoryHolographicSight": "Holographic Sight",
"SR5.AccessoryHolographicSight_GE": "",
"SR5.AccessoryHiddenArmSlide": "Hidden Arm Slide",
"SR5.AccessoryHiddenArmSlide_GE": "",
"SR5.AccessoryHipPad": "Hip pad bracing system",
Expand All @@ -135,16 +168,34 @@
"SR5.AccessoryImagingScope_GE": "",
"SR5.AccessoryImprovedRangeFinder": "ImprovedRangeFinder",
"SR5.AccessoryImprovedRangeFinder_GE": "",
"SR5.AccessoryKrimePack": "Krime Pack",
"SR5.AccessoryKrimePack_GE": "",
"SR5.AccessoryKrimeStunONet": "Krime Stun'O'Net",
"SR5.AccessoryKrimeStunONet_GE": "",
"SR5.AccessoryLaserSight": "Laser Sight",
"SR5.AccessoryLaserSight_GE": "",
"SR5.AccessoryLongbarrel": "Longbarrel",
"SR5.AccessoryLongbarrel_GE": "",
"SR5.AccessoryMeleeHardening": "Melee Hardening",
"SR5.AccessoryMeleeHardening_GE": "",
"SR5.AccessoryMountedCrossbow": "Mounted Crossbow",
"SR5.AccessoryMountedCrossbow_GE": "",
"SR5.AccessoryNarcojectDazzler": "Narcoject Dazzler",
"SR5.AccessoryNarcojectDazzler_GE": "",
"SR5.AccessoryOverclocked": "Overclocked",
"SR5.AccessoryOverclocked_GE": "",
"SR5.AccessoryPeriscope": "Periscope",
"SR5.AccessoryPeriscope_GE": "",
"SR5.AccessoryPersonalizedGrip": "Personalized Grip",
"SR5.AccessoryPersonalizedGrip_GE": "",
"SR5.AccessoryQuickDrawHolster": "Quick-Draw Holster",
"SR5.AccessoryQuickDrawHolster_GE": "",
"SR5.AccessoryReducedWeight": "Reduced Weight",
"SR5.AccessoryReducedWeight_GE": "",
"SR5.AccessoryRetractibleBayonet": "Retractible bayonet",
"SR5.AccessoryRetractibleBayonet_GE": "",
"SR5.AccessorySawedoffShortbarrel": "Sawed-off/Shortbarrel",
"SR5.AccessorySawedoffShortbarrel_GE": "",
"SR5.AccessorySafeTargetSystem": "Safe Target System",
"SR5.AccessorySafeTargetSystem_GE": "",
"SR5.AccessorySafeTargetSystemWithImage": "Safe Target System (with images)",
Expand All @@ -167,6 +218,8 @@
"SR5.AccessorySpareClip_GE": "",
"SR5.AccessorySpeedLoader": "Speed Loader",
"SR5.AccessorySpeedLoader_GE": "",
"SR5.AccessoryStockRemoval": "Stock Removal",
"SR5.AccessoryStockRemoval_GE": "",
"SR5.AccessoryTracker": "Tracker",
"SR5.AccessoryTracker_GE": "",
"SR5.AccessoryTriggerRemoval": "Trigger Removal",
Expand All @@ -179,12 +232,16 @@
"SR5.AccessoryUnderbarrelBolaLauncher_GE": "",
"SR5.AccessoryUnderbarrelChainsaw": "Underbarrel Chainsaw",
"SR5.AccessoryUnderbarrelChainsaw_GE": "",
"SR5.AccessoryUnderbarrelLaser": "Underbarrel Laser",
"SR5.AccessoryUnderbarrelLaser_GE": "",
"SR5.AccessoryUnderbarrelFlamethrower": "Underbarrel Flamethrower",
"SR5.AccessoryUnderbarrelFlamethrower_GE": "",
"SR5.AccessoryUnderbarrelGrappleGun": "Underbarrel Grapple Gun",
"SR5.AccessoryUnderbarrelGrappleGun_GE": "",
"SR5.AccessoryUnderbarrelGrenadeLauncher": "Underbarrel Grenade Launcher",
"SR5.AccessoryUnderbarrelGrenadeLauncher_GE": "",
"SR5.AccessoryUnderbarrelShotgun": "Underbarrel Shotgun",
"SR5.AccessoryUnderbarrelShotgun_GE": "",
"SR5.AccessoryVintage": "Vintage",
"SR5.AccessoryVintage_GE": "",
"SR5.AccessoryWeaponCommlink": "Weapon Commlink",
Expand Down
Loading

0 comments on commit f74c72d

Please sign in to comment.