From 52c7e97be28cbf9f94e57da6ce16af87c997386a Mon Sep 17 00:00:00 2001 From: "Embruch, Gerd" <gerd.embruch@uni-hamburg.de> Date: Mon, 1 Jul 2024 11:29:10 +0200 Subject: [PATCH] added UHH Font & some styling --- src/assets/css/app.min.css | 2 +- src/assets/css/app.min.css.map | 2 +- src/assets/sass/app.scss | 1 + src/assets/sass/partials/_fonts.scss | 82 ++++++++++++++++++++++++++++ tailwind.config.js | 69 ++++++++++++++++++++++- 5 files changed, 153 insertions(+), 3 deletions(-) create mode 100644 src/assets/sass/partials/_fonts.scss diff --git a/src/assets/css/app.min.css b/src/assets/css/app.min.css index 4609575..02cea9f 100644 --- a/src/assets/css/app.min.css +++ b/src/assets/css/app.min.css @@ -1 +1 @@ -@tailwind base;@tailwind components;@tailwind utilities/*# sourceMappingURL=app.min.css.map */ \ No newline at end of file +@font-face{font-family:"TheSansUHHSemiLightCaps";font-display:fallback;src:url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHSemiLightCaps-6948b01b715690a2b9506f63305ee0c3abd9ad2010d89a1202df00d39d100954.woff2) format("woff2"),url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHSemiLightCaps-f2aa5e1a44c9fd5db30254599c5ac8ccc944b711798d961e35924e413d81ad50.woff) format("woff");font-weight:normal;font-style:normal}@font-face{font-family:"TheSansUHHBold";font-display:fallback;src:url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHBold-6a239f69f764ae41ead96462cb9973fdde7c66739769d13776e0dfb896a96ab5.woff2) format("woff2"),url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHBold-026d11467c2214c911121580ced3b1fe4d5ba42da11107194e4c378b02a9b46c.woff) format("woff");font-weight:normal;font-style:normal}@font-face{font-family:"TheSansUHHBoldCaps";font-display:fallback;src:url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHBoldCaps-f0c825ec667e94a17d4e77b97493a2586655b053421a08418f0a6a75500eb8a9.woff2) format("woff2"),url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHBoldCaps-7fd206907219f3ec347a062d4e7decf51dd742c8fad3d1a9c92609f00e059c1e.woff) format("woff");font-weight:normal;font-style:normal}@font-face{font-family:"TheSansUHHRegular";font-display:fallback;src:url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegular-dd85da951afc3550ff98f11056eac2bcbba855c879809fd00caf60929a3cbd4f.woff2) format("woff2"),url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegular-7af4ba764ea22bd512c10b580f199e97beea980e3bf60090743ee3f5f36c66ce.woff) format("woff");font-weight:normal;font-style:normal}@font-face{font-family:"TheSansUHH";font-display:fallback;src:url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegular-dd85da951afc3550ff98f11056eac2bcbba855c879809fd00caf60929a3cbd4f.woff2) format("woff2"),url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegular-7af4ba764ea22bd512c10b580f199e97beea980e3bf60090743ee3f5f36c66ce.woff) format("woff");font-weight:normal;font-style:normal}@font-face{font-family:"TheSansUHHRegularCaps";font-display:fallback;src:url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegularCaps-7072a6f8ebbb26d334ca7e14826795068429a0072220dac594063678de20e698.woff2) format("woff2"),url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegularCaps-fdce39405f802f0295dd3e70bf62fd3cc725a72d0883c39081af20e0cc90e624.woff) format("woff");font-weight:normal;font-style:normal}@font-face{font-family:"TheSansUHHItalic";font-display:fallback;src:url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegularItalic-d3186420f2bbe557092314ef3043b74e450cf52459bc7ce3f2c73f9194e15a79.woff2) format("woff2"),url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegularItalic-62190ab7d86db0f3eab9e0fca925474c5fe192483468a88b2094dd46c3fe93e2.woff) format("woff");font-weight:normal;font-style:normal}@tailwind base;@tailwind components;@tailwind utilities/*# sourceMappingURL=app.min.css.map */ \ No newline at end of file diff --git a/src/assets/css/app.min.css.map b/src/assets/css/app.min.css.map index b51cf23..37110f0 100644 --- a/src/assets/css/app.min.css.map +++ b/src/assets/css/app.min.css.map @@ -1 +1 @@ -{"version":3,"sources":["../sass/tailwind.presets.scss"],"names":[],"mappings":"AAAA,cAAA,CACA,oBAAA,CACA","file":"app.min.css"} \ No newline at end of file +{"version":3,"sources":["../sass/partials/_fonts.scss","../sass/tailwind.presets.scss"],"names":[],"mappings":"AAKA,WACE,qCAAA,CACA,qBAAA,CACA,2TACE,CAIF,kBAAA,CACA,iBAAA,CAEF,WACE,4BAAA,CACA,qBAAA,CACA,ySACE,CAIF,kBAAA,CACA,iBAAA,CAEF,WACE,gCAAA,CACA,qBAAA,CACA,iTACE,CAIF,kBAAA,CACA,iBAAA,CAEF,WACE,+BAAA,CACA,qBAAA,CACA,+SACE,CAIF,kBAAA,CACA,iBAAA,CAEF,WACE,wBAAA,CACA,qBAAA,CACA,+SACE,CAIF,kBAAA,CACA,iBAAA,CAEF,WACE,mCAAA,CACA,qBAAA,CACA,uTACE,CAIF,kBAAA,CACA,iBAAA,CAEF,WACE,8BAAA,CACA,qBAAA,CACA,2TACE,CAIF,kBAAA,CACA,iBAAA,CChFF,cAAA,CACA,oBAAA,CACA","file":"app.min.css"} \ No newline at end of file diff --git a/src/assets/sass/app.scss b/src/assets/sass/app.scss index d451cea..b6d886d 100644 --- a/src/assets/sass/app.scss +++ b/src/assets/sass/app.scss @@ -1 +1,2 @@ +@import "partials/fonts"; @import "tailwind.presets.scss"; diff --git a/src/assets/sass/partials/_fonts.scss b/src/assets/sass/partials/_fonts.scss new file mode 100644 index 0000000..7f44a1b --- /dev/null +++ b/src/assets/sass/partials/_fonts.scss @@ -0,0 +1,82 @@ +/********************************************** +CUSTOM FONTS +in here you can specify the font-face with all of it's values +**********************************************/ + +@font-face { + font-family: "TheSansUHHSemiLightCaps"; + font-display: fallback; + src: + url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHSemiLightCaps-6948b01b715690a2b9506f63305ee0c3abd9ad2010d89a1202df00d39d100954.woff2) + format("woff2"), + url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHSemiLightCaps-f2aa5e1a44c9fd5db30254599c5ac8ccc944b711798d961e35924e413d81ad50.woff) + format("woff"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: "TheSansUHHBold"; + font-display: fallback; + src: + url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHBold-6a239f69f764ae41ead96462cb9973fdde7c66739769d13776e0dfb896a96ab5.woff2) + format("woff2"), + url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHBold-026d11467c2214c911121580ced3b1fe4d5ba42da11107194e4c378b02a9b46c.woff) + format("woff"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: "TheSansUHHBoldCaps"; + font-display: fallback; + src: + url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHBoldCaps-f0c825ec667e94a17d4e77b97493a2586655b053421a08418f0a6a75500eb8a9.woff2) + format("woff2"), + url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHBoldCaps-7fd206907219f3ec347a062d4e7decf51dd742c8fad3d1a9c92609f00e059c1e.woff) + format("woff"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: "TheSansUHHRegular"; + font-display: fallback; + src: + url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegular-dd85da951afc3550ff98f11056eac2bcbba855c879809fd00caf60929a3cbd4f.woff2) + format("woff2"), + url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegular-7af4ba764ea22bd512c10b580f199e97beea980e3bf60090743ee3f5f36c66ce.woff) + format("woff"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: "TheSansUHH"; + font-display: fallback; + src: + url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegular-dd85da951afc3550ff98f11056eac2bcbba855c879809fd00caf60929a3cbd4f.woff2) + format("woff2"), + url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegular-7af4ba764ea22bd512c10b580f199e97beea980e3bf60090743ee3f5f36c66ce.woff) + format("woff"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: "TheSansUHHRegularCaps"; + font-display: fallback; + src: + url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegularCaps-7072a6f8ebbb26d334ca7e14826795068429a0072220dac594063678de20e698.woff2) + format("woff2"), + url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegularCaps-fdce39405f802f0295dd3e70bf62fd3cc725a72d0883c39081af20e0cc90e624.woff) + format("woff"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: "TheSansUHHItalic"; + font-display: fallback; + src: + url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegularItalic-d3186420f2bbe557092314ef3043b74e450cf52459bc7ce3f2c73f9194e15a79.woff2) + format("woff2"), + url(https://assets.rrz.uni-hamburg.de/assets/TheSansUHHRegularItalic-62190ab7d86db0f3eab9e0fca925474c5fe192483468a88b2094dd46c3fe93e2.woff) + format("woff"); + font-weight: normal; + font-style: normal; +} diff --git a/tailwind.config.js b/tailwind.config.js index d37737f..c9d44c7 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -5,7 +5,74 @@ export default { "./src/**/*.{js,ts,jsx,tsx}", ], theme: { - extend: {}, + extend: { + colors: { + UhhBlue: '#0271bb', + UhhLightBlue: 'rgba(128, 184, 219, 0.5)', + UhhRed: '#e2001a', + UhhLightRed: 'rgba(240, 130, 136, 0.5)', + UhhGrey: '#3b515b', + UhhLightGrey: '#f3f3f3', + UhhWhite: '#fff', + UhhWLightWhite: '#FFFAF0', + border: "hsl(var(--border))", + input: "hsl(var(--input))", + ring: "hsl(var(--ring))", + background: "hsl(var(--background))", + foreground: "hsl(var(--foreground))", + primary: { + DEFAULT: "hsl(var(--primary))", + foreground: "hsl(var(--primary-foreground))", + }, + secondary: { + DEFAULT: "hsl(var(--secondary))", + foreground: "hsl(var(--secondary-foreground))", + }, + destructive: { + DEFAULT: "hsl(var(--destructive))", + foreground: "hsl(var(--destructive-foreground))", + }, + muted: { + DEFAULT: "hsl(var(--muted))", + foreground: "hsl(var(--muted-foreground))", + }, + accent: { + DEFAULT: "hsl(var(--accent))", + foreground: "hsl(var(--accent-foreground))", + }, + popover: { + DEFAULT: "hsl(var(--popover))", + foreground: "hsl(var(--popover-foreground))", + }, + card: { + DEFAULT: "hsl(var(--card))", + foreground: "hsl(var(--card-foreground))", + }, + }, + spacing: { + '1/7': '14.285%' + }, + fontFamily: { + 'UhhSLC': ['TheSansUHHSemiLightCaps'], + 'UhhB': ['TheSansUHHBold'], + 'UhhBC': ['TheSansUHHBoldCaps'], + 'UhhR': ['TheSansUHHRegular'], + 'Uhh': ['TheSansUHH'], + 'UhhRC': ['TheSansUHHRegularCaps'], + 'UhhI': ['TheSansUHHItalic'], + }, + borderColor: { + DEFAULT: '#3b515b' + }, + minWidth: { + 'xs': '20rem', + 'sm': '24rem', + 'md': '28rem', + 'lg': '32rem', + 'xl': '36rem', + '2xl': '42rem', + } + }, }, plugins: [], } -- GitLab