Merge pull request #106 from maykinmedia/feature/105-django-common

Feature/105 django common

Author: TimdeBeer1

Dockerfile

@@ -88,6 +88,7 @@ COPY --from=backend-build /app/src/ /app/src/
 
 # copy frontend build statics
 COPY --from=frontend-build /app/src/openorganisatie/static /app/src/openorganisatie/static
+COPY --from=frontend-build /app/node_modules/@fortawesome/fontawesome-free/webfonts /app/node_modules/@fortawesome/fontawesome-free/webfonts
 
 # copy source code
 COPY ./src /app/src

package-lock.json

@@ -21,7 +21,8 @@
   "homepage": "https://maykinmedia.nl",
   "dependencies": {
     "microscope-sass": "latest",
-    "yargs": "^16.2.0"
+    "yargs": "^16.2.0",
+    "@fortawesome/fontawesome-free": "^7.0.0"
   },
   "devDependencies": {
     "@babel/core": "latest",
@@ -53,4 +54,4 @@
     "webpack-dev-server": "latest",
     "webpack-stream": "latest"
   }
-}
+}

package.json

@@ -20,6 +20,7 @@ django-scim2
 django-structlog
 django-reversion
 django-reversion-compare
+django-capture-tag
 
 # API libraries
 # djangorestframework

requirements/base.in

@@ -129,6 +129,8 @@ django-axes==8.0.0
     #   -r requirements/base.in
     #   maykin-common
     #   open-api-framework
+django-capture-tag==1.0
+    # via -r requirements/base.in
 django-cors-headers==4.7.0
     # via open-api-framework
 django-csp==4.0

requirements/base.txt

@@ -196,6 +196,10 @@ django-axes==8.0.0
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   open-api-framework
+django-capture-tag==1.0
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
 django-cors-headers==4.7.0
     # via
     #   -c requirements/base.txt

requirements/ci.txt

@@ -225,6 +225,10 @@ django-axes==8.0.0
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   open-api-framework
+django-capture-tag==1.0
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
 django-cors-headers==4.7.0
     # via
     #   -c requirements/ci.txt

requirements/dev.txt

@@ -106,6 +106,7 @@
     "reversion",
     "reversion_compare",
     "maykin_common",
+    "capture_tag",
     # Project applications.
     "openorganisatie.accounts",
     "openorganisatie.utils",

src/openorganisatie/conf/base.py

@@ -3,9 +3,7 @@ h2,
 h3,
 h4,
 h5 {
-    margin-top: 0;
-    margin-bottom: 0;
-    line-height: 1.2;
+    line-height: 1.5;
 }
 
 h1 {

src/openorganisatie/scss/_app.scss

@@ -23,23 +23,28 @@ $color-border: $color_secondary_dark;
 
 // css vars
 :root {
-    --color_primary: #{$color_primary};
-    --color_primary_dark: #{$color_primary_dark};
-
-    --color_secondary: #{$color_secondary};
-    --color_secondary_dark: #{$color_secondary_dark};
-    --color_secondary_light: #{$color_secondary_light};
-
-    --color_alert: #{$color_alert};
-    --color_alert_dark: #{$color_alert_dark};
-
-    --color-darkest: #{$color-darkest};
-    --color_dark: #{$color_dark};
-    --color_lightest: #{$color_lightest};
-    --color_muted: #{$color_muted};
-
-    --color_link: #{$color_link};
-    --color_link_hover: #{$color_link_hover};
-    --color-text: #{$color-text};
-    --color-border: #{$color-border};
+    // Link component
+    --link-color: #017092;
+    --link-color-hover: var(--link-color);
+    --link-color-muted: #6c757d;
+
+    // footer component
+    --footer-border-color: #dee2e6;
+
+    // tabs component
+    --tabs-border-color: #dee2e6;
+    --tabs-item-hover-border-color: #f3f3f3;
+
+    // Button component
+    --button-color: #ffffff;
+    --button-background-color: #04a5bb;
+    --button-hover-background-color: #017092;
+    --button-alert-background-color: #dc3545;
+    --button-alert-hover-background-color: #bd2130;
+}
+
+.content {
+    &#{&}--align-right {
+        text-align: right;
+    }
 }