Merge branch 'master' of ssh://git.khaganat.net:3543/Tycho/khaganat-web

This commit is contained in:
Rodolphe Breard 2019-09-21 12:29:59 +02:00
commit fc5ed99a5e
3 changed files with 39 additions and 21 deletions

31
.gitlab-ci.yml Normal file
View file

@ -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/*

View file

@ -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;
}

View file

@ -87,10 +87,10 @@ html.has-navbar-fixed-top, body.has-navbar-fixed-top
color: white color: white
.navbar.is-light .navbar-brand .navbar.is-light .navbar-brand
margin-left: 5% display: none
.navbar.is-light .navbar-brand img .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 > a.navbar-item:hover, .navbar.is-light .navbar-brand > a.navbar-item.is-active,
.navbar.is-light .navbar-brand .navbar-link:hover, .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 background-color: $link-hover
color: white color: white
.navbar.is-light .navbar-end
margin-right: 5%
margin-left: 0%
.navbar.is-light .navbar-item.is-logo .navbar.is-light .navbar-item.is-logo
position: absolute position: absolute
left: 50% left: 50%
@ -149,6 +145,9 @@ html.has-navbar-fixed-top, body.has-navbar-fixed-top
max-height: 2rem max-height: 2rem
height: 2rem height: 2rem
.navbar.is-light .navbar-item.is-logo:hover
background-color: white
//navbar pour les mobiles //navbar pour les mobiles
.navbar-dropdown a.navbar-item:hover .navbar-dropdown a.navbar-item:hover
background-color: $primary background-color: $primary
@ -159,8 +158,8 @@ html.has-navbar-fixed-top, body.has-navbar-fixed-top
font-weight: bold font-weight: bold
@media screen and (max-width: 1087px) @media screen and (max-width: 1087px)
.navbar-item.is-logo img .navbar-item.is-logo
height: 0 display: none
//bouton de la navbar //bouton de la navbar
.button.is-light .button.is-light