Commit 6ca94973 authored by FulcrandG's avatar FulcrandG
Browse files

Merge branch '300-create-classes-to-manage-r2devops-ci' into latest

parents 5506edac 9021e572

.gitlab-ci.yml

+5 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ job_structure: 
  variables:

    PIPENV_PIPFILE: tools/job_structure/Pipfile

    JOB_LOGFILE: "job_structure.log"

    PYTHONPATH: "./:$PYTHONPATH"

  before_script:

    - pip install --ignore-installed distlib pipenv

    - pipenv install
@@ -61,6 +62,7 @@ job_customs: 
  variables:

    PIPENV_PIPFILE: tools/job_customs/Pipfile

    JOB_LOGFILE: "job_customs.log"

    PYTHONPATH: "./:$PYTHONPATH"

  before_script:

    - pip install --ignore-installed distlib pipenv

    - pipenv install
@@ -82,6 +84,7 @@ job_image_scan: 
    PIPENV_PIPFILE: tools/job_image/Pipfile

    JOB_LOGFILE: "job_image.log"

    OUTPUT_DIR: "scan_output"

    PYTHONPATH: "./:$PYTHONPATH"



    TRIVY_EXIT_ON_SEVERITY: ""

    TRIVY_SEVERITY: "LOW,MEDIUM,HIGH,CRITICAL"
@@ -158,6 +161,7 @@ job_labels: 
  variables:

    PIPENV_PIPFILE: tools/job_labels/Pipfile

    JOB_LOGFILE: "job_labels.log"

    PYTHONPATH: "./:$PYTHONPATH"

  before_script:

    - pip install --ignore-installed distlib pipenv

    - pipenv install
@@ -176,6 +180,7 @@ job_labels: 
mkdocs:

  variables:

    PIPENV_PIPFILE: tools/builder/Pipfile

    PYTHONPATH: "./:$PYTHONPATH"

  before_script:

    - pip install pipenv && pipenv install

    - pipenv run python tools/builder/builder.py

docs/css/extra.css

+4 −5
Original line number Diff line number Diff line
@@ -215,11 +215,6 @@ 
    border-color: var(--md-primary-bg-color);

}



.z-index-1000{

  z-index: 1000;

}





.border-radius-10{

  border-radius: 10px !important;

}
@@ -286,3 +281,7 @@ a.banner-link:hover { 
.labels_zone{

  font-size:0.6rem;

}



.md-header {

    z-index: 3;

}

docs/css/juxtapose/juxtapose.css

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ div.jx-handle { 
	height: 100%;

	width: 40px;

	cursor: col-resize;

	z-index: 15;

	z-index: 2;

	margin-left: -20px;

}
@@ -163,7 +163,7 @@ div.jx-image { 


div.jx-image img {

	height: 100%;

	z-index: 3;

	z-index: 1;

	position: absolute;



	max-height: none;
@@ -225,7 +225,7 @@ div.jx-image div.jx-label { 
	background-color: #000; /* IE 8 */

	background-color: rgba(0,0,0,.7);

	color: white;

	z-index: 10;

	z-index: 2;

	white-space: nowrap;

	line-height: 18px;

	vertical-align: middle;
@@ -293,7 +293,7 @@ a.jx-knightlab { 
	position: absolute;

	right: 0;

	text-decoration: none;

	z-index: 10;

	z-index: 2;

}



a.jx-knightlab div.knightlab-logo {

overrides/home.html

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
            </a>

          </div>

        </div>

        <div class="tx-hero__image z-index-1000 juxtapose-container">

        <div class="tx-hero__image juxtapose-container">

          <div id="juxtapose"></div>

        </div>

      </div>

tools/__init__.py

0 → 100644
+0 −0

Empty file added.