diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..c9d37bd --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,31 @@ +stages: +- build + +Build CSS: + stage: build + tags: + - Docker + image: "python:latest" + + variables: + PIPENV_VENV_IN_PROJECT: 1 + + script: + - apt-get update + - apt-get -y upgrade + - apt-get install -y nodejs npm + + - pip3 install pipenv + + - pipenv --three update + - pipenv install django + - pipenv install django-bulma + + - echo "KHAGANAT_SECRET_KEY= build" > .env + + - pipenv run ./manage.py bulma install + - pipenv run ./manage.py bulma build + + artifacts: + paths: + - static_extra/bulma/css/* diff --git a/khaganat/static/khaganat/css/khaganat.css b/khaganat/static/khaganat/css/khaganat.css deleted file mode 100644 index 9da8373..0000000 --- a/khaganat/static/khaganat/css/khaganat.css +++ /dev/null @@ -1,12 +0,0 @@ -#page_body { - background-image: url("/static/khaganat/images/bg7.jpg"); -} - -#messagesContainer { - margin-bottom: 20px; -} - -.content-bloc { - padding: 20px; - background-color: white; -} diff --git a/static_extra/bulma/sass/style.sass b/static_extra/bulma/sass/style.sass index 963e65d..216dc6b 100644 --- a/static_extra/bulma/sass/style.sass +++ b/static_extra/bulma/sass/style.sass @@ -87,10 +87,10 @@ html.has-navbar-fixed-top, body.has-navbar-fixed-top color: white .navbar.is-light .navbar-brand - margin-left: 5% + display: none .navbar.is-light .navbar-brand img - height: 0 + display: none .navbar.is-light .navbar-brand > a.navbar-item:hover, .navbar.is-light .navbar-brand > a.navbar-item.is-active, .navbar.is-light .navbar-brand .navbar-link:hover, @@ -119,10 +119,6 @@ html.has-navbar-fixed-top, body.has-navbar-fixed-top background-color: $link-hover color: white - .navbar.is-light .navbar-end - margin-right: 5% - margin-left: 0% - .navbar.is-light .navbar-item.is-logo position: absolute left: 50% @@ -149,6 +145,9 @@ html.has-navbar-fixed-top, body.has-navbar-fixed-top max-height: 2rem height: 2rem +.navbar.is-light .navbar-item.is-logo:hover + background-color: white + //navbar pour les mobiles .navbar-dropdown a.navbar-item:hover background-color: $primary @@ -159,9 +158,9 @@ html.has-navbar-fixed-top, body.has-navbar-fixed-top font-weight: bold @media screen and (max-width: 1087px) - .navbar-item.is-logo img - height: 0 - + .navbar-item.is-logo + display: none + //bouton de la navbar .button.is-light background-color: $background