Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
GSC Material UI
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GSC Frameworks
GSC Material UI
Commits
abbf1fbe
Commit
abbf1fbe
authored
Jan 23, 2020
by
Ben Galloway
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sort font definitions for Proxima Nova bold
parent
8ab12f4c
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
27 deletions
+37
-27
ProximaNovaFontFace.css
ProximaNovaFontFace.css
+15
-4
package.json
package.json
+1
-1
src/ProximaNovaFontFace.css
src/ProximaNovaFontFace.css
+15
-4
src/themeDefinition.js
src/themeDefinition.js
+0
-6
themeDefinition.js
themeDefinition.js
+6
-12
No files found.
ProximaNovaFontFace.css
View file @
abbf1fbe
@font-face
{
font-family
:
"ProximaNova"
;
font-style
:
normal
;
font-weight
:
3
00
;
font-weight
:
1
00
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-Light.eot")
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-Light.eot?#iefix")
format
(
"embedded-opentype"
),
url("https://style.gsc.org.uk/fonts/ProximaNova-Light.woff2")
format
(
"woff2"
),
...
...
@@ -13,7 +13,7 @@
@font-face
{
font-family
:
"ProximaNova"
;
font-style
:
normal
;
font-weight
:
6
00
;
font-weight
:
2
00
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.eot")
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.eot?#iefix")
format
(
"embedded-opentype"
),
url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.woff2")
format
(
"woff2"
),
...
...
@@ -22,10 +22,21 @@
url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.svg#ProximaNova-Semibold")
format
(
"svg"
);
}
@font-face
{
font-family
:
"ProximaNova"
;
font-style
:
normal
;
font-weight
:
400
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.eot")
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.eot?#iefix")
format
(
"embedded-opentype"
),
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.woff")
format
(
"woff"
),
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.ttf")
format
(
"truetype"
),
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.svg#ProximaNova-Bold")
format
(
"svg"
);
}
@font-face
{
font-family
:
"ProximaNova"
;
font-style
:
italic
;
font-weight
:
3
00
;
font-weight
:
1
00
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.eot")
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.eot?#iefix")
format
(
"embedded-opentype"
),
url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.woff2")
format
(
"woff2"
),
...
...
@@ -37,7 +48,7 @@
@font-face
{
font-family
:
"ProximaNova"
;
font-style
:
italic
;
font-weight
:
6
00
;
font-weight
:
2
00
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.eot")
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.eot?#iefix")
format
(
"embedded-opentype"
),
url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.woff2")
format
(
"woff2"
),
...
...
package.json
View file @
abbf1fbe
{
"name"
:
"@gsc/material"
,
"version"
:
"2.
2.1
"
,
"version"
:
"2.
3.0
"
,
"description"
:
"An implementation of Material-UI with GSC styling"
,
"main"
:
"index.js"
,
"repository"
:
"https://gitlab.gsc.org.uk/gsc-frameworks/gsc-material.git"
,
...
...
src/ProximaNovaFontFace.css
View file @
abbf1fbe
@font-face
{
font-family
:
"ProximaNova"
;
font-style
:
normal
;
font-weight
:
3
00
;
font-weight
:
1
00
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-Light.eot")
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-Light.eot?#iefix")
format
(
"embedded-opentype"
),
url("https://style.gsc.org.uk/fonts/ProximaNova-Light.woff2")
format
(
"woff2"
),
...
...
@@ -13,7 +13,7 @@
@font-face
{
font-family
:
"ProximaNova"
;
font-style
:
normal
;
font-weight
:
6
00
;
font-weight
:
2
00
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.eot")
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.eot?#iefix")
format
(
"embedded-opentype"
),
url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.woff2")
format
(
"woff2"
),
...
...
@@ -22,10 +22,21 @@
url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.svg#ProximaNova-Semibold")
format
(
"svg"
);
}
@font-face
{
font-family
:
"ProximaNova"
;
font-style
:
normal
;
font-weight
:
400
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.eot")
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.eot?#iefix")
format
(
"embedded-opentype"
),
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.woff")
format
(
"woff"
),
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.ttf")
format
(
"truetype"
),
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.svg#ProximaNova-Bold")
format
(
"svg"
);
}
@font-face
{
font-family
:
"ProximaNova"
;
font-style
:
italic
;
font-weight
:
3
00
;
font-weight
:
1
00
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.eot")
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.eot?#iefix")
format
(
"embedded-opentype"
),
url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.woff2")
format
(
"woff2"
),
...
...
@@ -37,7 +48,7 @@
@font-face
{
font-family
:
"ProximaNova"
;
font-style
:
italic
;
font-weight
:
6
00
;
font-weight
:
2
00
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.eot")
;
src
:
url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.eot?#iefix")
format
(
"embedded-opentype"
),
url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.woff2")
format
(
"woff2"
),
...
...
src/themeDefinition.js
View file @
abbf1fbe
...
...
@@ -48,27 +48,21 @@ const GSCTheme = {
].
join
(
"
,
"
),
h1
:
{
fontFamily
:
"
ProximaNova
"
,
fontWeight
:
600
,
},
h2
:
{
fontFamily
:
"
ProximaNova
"
,
fontWeight
:
600
,
},
h3
:
{
fontFamily
:
"
ProximaNova
"
,
fontWeight
:
600
,
},
h4
:
{
fontFamily
:
"
ProximaNova
"
,
fontWeight
:
600
,
},
h5
:
{
fontFamily
:
"
ProximaNova
"
,
fontWeight
:
600
,
},
h6
:
{
fontFamily
:
"
ProximaNova
"
,
fontWeight
:
600
,
},
button
:
{
textTransform
:
"
none
"
,
...
...
themeDefinition.js
View file @
abbf1fbe
...
...
@@ -43,28 +43,22 @@ var GSCTheme = {
typography
:
{
fontFamily
:
[
'
"Helvetica Neue"
'
,
"
Arial
"
,
"
sans-serif
"
,
"
-apple-system
"
,
"
BlinkMacSystemFont
"
,
'
"Segoe UI"
'
,
'
"Apple Color Emoji"
'
,
'
"Segoe UI Emoji"
'
,
'
"Segoe UI Symbol"
'
].
join
(
"
,
"
),
h1
:
{
fontFamily
:
"
ProximaNova
"
,
fontWeight
:
600
fontFamily
:
"
ProximaNova
"
},
h2
:
{
fontFamily
:
"
ProximaNova
"
,
fontWeight
:
600
fontFamily
:
"
ProximaNova
"
},
h3
:
{
fontFamily
:
"
ProximaNova
"
,
fontWeight
:
600
fontFamily
:
"
ProximaNova
"
},
h4
:
{
fontFamily
:
"
ProximaNova
"
,
fontWeight
:
600
fontFamily
:
"
ProximaNova
"
},
h5
:
{
fontFamily
:
"
ProximaNova
"
,
fontWeight
:
600
fontFamily
:
"
ProximaNova
"
},
h6
:
{
fontFamily
:
"
ProximaNova
"
,
fontWeight
:
600
fontFamily
:
"
ProximaNova
"
},
button
:
{
textTransform
:
"
none
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment