Skip to content

Commit

Permalink
Change menu layout and primary fonts
Browse files Browse the repository at this point in the history
  • Loading branch information
amakarudze committed May 21, 2024
1 parent 012f560 commit ae7b855
Show file tree
Hide file tree
Showing 90 changed files with 3,986 additions and 2,462 deletions.
6,019 changes: 3,657 additions & 2,362 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"homepage": "https://github.com/DjangoGirls/djangogirls#readme",
"devDependencies": {
"bootstrap": "^3.3.6",
"bootstrap": "^5.3.3",
"del": "^6.0.0",
"fancy-log": "^1.3.3",
"gulp": "^4.0.2",
Expand Down
1 change: 1 addition & 0 deletions static/source/css/bootstrap.min.css.map

Large diffs are not rendered by default.

226 changes: 220 additions & 6 deletions static/source/css/global.styl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sans_font = Roboto
serif_font = 'Lora'
sans_font = 'Ergonomique'
serif_font = 'KGDropsofJupiter'
gray = #4A4A4A
orange = #F7921D

Expand All @@ -18,7 +18,7 @@ html, body
height: 100%

body
font: 18px serif_font
font: 18px sans_font
color: black
line-height: 29px
font-weight: 300
Expand Down Expand Up @@ -81,6 +81,9 @@ form
padding: 1px 5px
border-radius(3px)

.card
border-color: orange

/*
--------------------------
- Bootstrap new styles
Expand Down Expand Up @@ -179,7 +182,7 @@ form
text-decoration: none
text-transform: uppercase
font-weight: 500
font-size: 15px
font-size: 18px
padding: 24px 0

&:hover
Expand Down Expand Up @@ -219,15 +222,15 @@ form
font-size: 48px
color: white
line-height: 55px
font-style: italic
margin-bottom: 20px
letter-spacing: 3px

p
font-family: serif_font
font-size: 20px
color: #E7E7E7
line-height: 30px
font-style: italic
letter-spacing: 3px


/*
Expand Down Expand Up @@ -1146,3 +1149,214 @@ footer
font-style: italic

@import "common"

/*
---------------
Custom Fonts
---------------
*/
@font-face
font-family: 'KGDropsofJupiter';
src: url('../fonts/KGDropsofJupiter.ttf');
src: local('KGDropsofJupiter'), local('KGDropsofJupiter'),
url('../fonts/KGDropsofJupiter.ttf') format('truetype');
font-weight: 300;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Light.eot');
src: local('Ergonomique Light'), local('Ergonomique-Light'),
url('../fonts/Ergonomique-Light.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Light.woff2') format('woff2'),
url('../fonts/Ergonomique-Light.woff') format('woff'),
url('../fonts/Ergonomique-Light.ttf') format('truetype');
font-weight: 300;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-ExtraLight.eot');
src: local('Ergonomique ExtraLight'), local('Ergonomique-ExtraLight'),
url('../fonts/Ergonomique-ExtraLight.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-ExtraLight.woff2') format('woff2'),
url('../fonts/Ergonomique-ExtraLight.woff') format('woff'),
url('../fonts/Ergonomique-ExtraLight.ttf') format('truetype');
font-weight: 200;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Bold.eot');
src: local('Ergonomique Bold'), local('Ergonomique-Bold'),
url('../fonts/Ergonomique-Bold.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Bold.woff2') format('woff2'),
url('../fonts/Ergonomique-Bold.woff') format('woff'),
url('../fonts/Ergonomique-Bold.ttf') format('truetype');
font-weight: bold;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Black.eot');
src: local('Ergonomique Black'), local('Ergonomique-Black'),
url('../fonts/Ergonomique-Black.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Black.woff2') format('woff2'),
url('../fonts/Ergonomique-Black.woff') format('woff'),
url('../fonts/Ergonomique-Black.ttf') format('truetype');
font-weight: 800;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-ThinItalic.eot');
src: local('Ergonomique Thin Italic'), local('Ergonomique-ThinItalic'),
url('../fonts/Ergonomique-ThinItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-ThinItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-ThinItalic.woff') format('woff'),
url('../fonts/Ergonomique-ThinItalic.ttf') format('truetype');
font-weight: 100;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Thin.eot');
src: local('Ergonomique Thin'), local('Ergonomique-Thin'),
url('../fonts/Ergonomique-Thin.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Thin.woff2') format('woff2'),
url('../fonts/Ergonomique-Thin.woff') format('woff'),
url('../fonts/Ergonomique-Thin.ttf') format('truetype');
font-weight: 100;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-LightItalic.eot');
src: local('Ergonomique Light Italic'), local('Ergonomique-LightItalic'),
url('../fonts/Ergonomique-LightItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-LightItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-LightItalic.woff') format('woff'),
url('../fonts/Ergonomique-LightItalic.ttf') format('truetype');
font-weight: 300;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Medium.eot');
src: local('Ergonomique Medium'), local('Ergonomique-Medium'),
url('../fonts/Ergonomique-Medium.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Medium.woff2') format('woff2'),
url('../fonts/Ergonomique-Medium.woff') format('woff'),
url('../fonts/Ergonomique-Medium.ttf') format('truetype');
font-weight: 500;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-MediumItalic.eot');
src: local('Ergonomique Medium Italic'), local('Ergonomique-MediumItalic'),
url('../fonts/Ergonomique-MediumItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-MediumItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-MediumItalic.woff') format('woff'),
url('../fonts/Ergonomique-MediumItalic.ttf') format('truetype');
font-weight: 500;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-SemiboldItalic.eot');
src: local('Ergonomique Semibold Italic'), local('Ergonomique-SemiboldItalic'),
url('../fonts/Ergonomique-SemiboldItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-SemiboldItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-SemiboldItalic.woff') format('woff'),
url('../fonts/Ergonomique-SemiboldItalic.ttf') format('truetype');
font-weight: 600;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-BoldItalic.eot');
src: local('Ergonomique Bold Italic'), local('Ergonomique-BoldItalic'),
url('../fonts/Ergonomique-BoldItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-BoldItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-BoldItalic.woff') format('woff'),
url('../fonts/Ergonomique-BoldItalic.ttf') format('truetype');
font-weight: bold;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Semibold.eot');
src: local('Ergonomique Semibold'), local('Ergonomique-Semibold'),
url('../fonts/Ergonomique-Semibold.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Semibold.woff2') format('woff2'),
url('../fonts/Ergonomique-Semibold.woff') format('woff'),
url('../fonts/Ergonomique-Semibold.ttf') format('truetype');
font-weight: 600;
font-style: normal;

@font-face
font-family: 'Ergonomique Ultra';
src: url('../fonts/Ergonomique-Ultra.eot');
src: local('Ergonomique Ultra'), local('Ergonomique-Ultra'),
url('../fonts/Ergonomique-Ultra.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Ultra.woff2') format('woff2'),
url('../fonts/Ergonomique-Ultra.woff') format('woff'),
url('../fonts/Ergonomique-Ultra.ttf') format('truetype');
font-weight: 900;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-BlackItalic.eot');
src: local('Ergonomique Black Italic'), local('Ergonomique-BlackItalic'),
url('../fonts/Ergonomique-BlackItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-BlackItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-BlackItalic.woff') format('woff'),
url('../fonts/Ergonomique-BlackItalic.ttf') format('truetype');
font-weight: 800;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Italic.eot');
src: local('Ergonomique Italic'), local('Ergonomique-Italic'),
url('../fonts/Ergonomique-Italic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Italic.woff2') format('woff2'),
url('../fonts/Ergonomique-Italic.woff') format('woff'),
url('../fonts/Ergonomique-Italic.ttf') format('truetype');
font-weight: normal;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-ExtraLightItalic.eot');
src: local('Ergonomique ExtraLight Italic'), local('Ergonomique-ExtraLightItalic'),
url('../fonts/Ergonomique-ExtraLightItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-ExtraLightItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-ExtraLightItalic.woff') format('woff'),
url('../fonts/Ergonomique-ExtraLightItalic.ttf') format('truetype');
font-weight: 200;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Regular.eot');
src: local('Ergonomique Regular'), local('Ergonomique-Regular'),
url('../fonts/Ergonomique-Regular.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Regular.woff2') format('woff2'),
url('../fonts/Ergonomique-Regular.woff') format('woff'),
url('../fonts/Ergonomique-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;

@font-face
font-family: 'Ergonomique Ultra';
src: url('../fonts/Ergonomique-UltraItalic.eot');
src: local('Ergonomique Ultra Italic'), local('Ergonomique-UltraItalic'),
url('../fonts/Ergonomique-UltraItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-UltraItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-UltraItalic.woff') format('woff'),
url('../fonts/Ergonomique-UltraItalic.ttf') format('truetype');
font-weight: 900;
font-style: italic;
Binary file added static/source/fonts/Ergonomique-Black.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Black.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Black.woff
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Black.woff2
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-BlackItalic.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-BlackItalic.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-BlackItalic.woff
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-BlackItalic.woff2
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Bold.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Bold.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Bold.woff
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Bold.woff2
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-BoldItalic.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-BoldItalic.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-BoldItalic.woff
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-BoldItalic.woff2
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-ExtraLight.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-ExtraLight.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Italic.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Italic.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Italic.woff
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Italic.woff2
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Light.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Light.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Light.woff
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Light.woff2
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-LightItalic.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-LightItalic.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-LightItalic.woff
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-LightItalic.woff2
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Medium.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Medium.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Medium.woff
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Medium.woff2
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-MediumItalic.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-MediumItalic.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-MediumItalic.woff
Binary file not shown.
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Regular.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Regular.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Regular.woff
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Regular.woff2
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Semibold.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Semibold.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Semibold.woff
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Semibold.woff2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Thin.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Thin.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Thin.woff
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Thin.woff2
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-ThinItalic.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-ThinItalic.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-ThinItalic.woff
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-ThinItalic.woff2
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Ultra.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Ultra.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Ultra.woff
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-Ultra.woff2
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-UltraItalic.eot
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-UltraItalic.ttf
Binary file not shown.
Binary file added static/source/fonts/Ergonomique-UltraItalic.woff
Binary file not shown.
Binary file not shown.
Binary file added static/source/fonts/KGDropsofJupiter.ttf
Binary file not shown.
Binary file added static/source/fonts/ergonomique-italic.otf
Binary file not shown.
Binary file modified static/source/img/global/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/source/img/logo-bigger.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/source/img/logo-black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/source/img/logo-negative.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/source/img/logo-orange.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/source/img/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions static/source/vendor/js/bootstrap.bundle.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions static/source/vendor/js/bootstrap.bundle.min.js.map

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions static/source/vendor/js/bootstrap.min.js

This file was deleted.

2 changes: 1 addition & 1 deletion templates/core/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="black-canvas">
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="col-md-12">
<h1>{% trans "We inspire women to fall in love with programming." %}</h1>
<p>
{% trans "Django Girls organize free Python and Django workshops, create open sourced online tutorials and curate amazing first experiences with technology." %}
Expand Down
Loading

0 comments on commit ae7b855

Please sign in to comment.