Commit 9fbf4bcd authored by sub's avatar sub

Merge branch 'master' of git.autistici.org:ai/website

parents b2caa66e d319df1e
......@@ -16,7 +16,7 @@ docker_build:
stage: build
script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.git.autistici.org
- docker build --build-arg ci_token=$CI_JOB_TOKEN --pull -t $IMAGE_TAG docker
- docker build --build-arg ci_token=$CI_JOB_TOKEN --pull -t $IMAGE_TAG .
- docker push $IMAGE_TAG
release:
......
......@@ -80,7 +80,7 @@ distribution, would be to use Docker. Build the image with:
and run it with:
$ docker run -P 8080
$ docker run -p 8080 --network host ai-website
it should then be visible at http://localhost:8080/.
......
......@@ -20,7 +20,7 @@ day-to-day relationships and projects.
The server only keeps the logs that are strictly necessary for debug operations,
and they do not hold any personal data connecting accounts on our servers to
actual identities.
actual identities. To read more about how we respect your data, read [this document](/who/your_data).
Dos and Donts for Specific services:
------------------------------------
......
......@@ -18,7 +18,8 @@ implicita) per la gestione di rapporti e progetti.
Il server conserva solo i log strettamente necessari a operazioni di debugging,
che comunque non sono associabili in alcun modo ai dati identificativi degli
utenti dei nostri servizi.
utenti dei nostri servizi. Per saperne di piu' su come gestiamo i tuoi dati,
puoi leggere [questo documento](/who/your_data)
Policy specifiche dei servizi:
------------------------------
......
body {
padding-top: 20px;
padding-bottom: 20px;
background: #eee;
background: #fefefe;
}
.ai-search-box {
......@@ -20,6 +20,10 @@ body {
border-radius: 0;
background: transparent;
border-bottom: 3px solid #333;
height: 55px;
}
.navbar-toggle .icon-bar{
background-color:red;
}
.navbar-ai a {
......@@ -32,7 +36,11 @@ body {
list-style-type: none;
position: relative;
padding: 0;
font-size: 1vw;
font-size: 1em;
}
.navbar-toggle {
background-color: #000;
background-image: none;
}
.navbar-ai .navbar-brand {
......@@ -47,7 +55,7 @@ body {
#main {
margin: 0;
width: 60%;
width: 70%;
margin: 0 auto;
}
......@@ -104,3 +112,74 @@ small.footer {
a:link{
text-decoration: underline;
}
.navbar-nav.navbar-right:last-child {
margin-top: -50px !important;
}
/*******************************************************************************************************
****************************++media query********************************************************/
@media screen and (max-width: 1036px){
body article.container{
width:100% !important;
}
}
/*noi li vogliamo come erano in navbar, senza stile per stare nel panino collapse*/
@media screen and (max-width: 767px){
.navbar-nav .open .dropdown-menu {
position: absolute!important;
/* top: 100%!important;
left: 0!important;
float: left!important;*/
min-width: 160px!important;
background-color:#fff;
border:solid 1px #666;
box-shadow: 0 6px 12px rgba(0,0,0,.175);
background-clip: padding-box;
}
.navbar-right .dropdown-menu {
/*left: auto!important;*/
right: 0!important;
top: 60px;
}
body li a.dropdown-toggle {
display: inline-block;
position: relative;
float: none;
padding: 15px;
}
.navbar-nav.navbar-right:last-child {
display: inline-flex;
width: auto;
float: right;
position: absolute;
top: 0px;
right: 65px;
margin-top: 0px !important;
}
/*login*/
ul.nav li a.login {
display: inline-block;
float: none;
padding: 15px;
}
.navbar-collapse {
overflow-y: auto;
background-color: #fff;
border: solid 1px #666;
text-align: center;
padding-left: 5em;
font-size:1em;
}
.navbar-collapse ul li a {
font-size: 1.3em;
}
.navbar-nav > li{
text-align: center;
}
}
\ No newline at end of file
......@@ -18,16 +18,17 @@
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav visible-lg-block">
<li><a href="/services">Services</a></li>
<li><a href="/who/policy">Policy</a></li>
<li><a href="/who/collective">History</a></li>
<li><a href="https://git.autistici.org/public">Code</a></li>
<!--li><a href="/services">Services</a></li-->
<li><a href="/get_help">Help</a></li>
<li><a href="https://cavallette.noblogs.org">Blog</a></li>
<li><a href="/archive">Archive</a></li>
<li><a href="/who/policy">Policy</a></li>
<li><a href="/about">About</a></li>
<li><a href="https://git.autistici.org/public">Dev</a></li>
<li><a href="https://cavallette.noblogs.org">News</a></li>
<!-- li><a href="/archive">Archive</a></li-->
<li><a href="/donate">Donate</a></li>
</ul>
</div><!--/.nav-collapse -->
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
......@@ -60,9 +61,8 @@
</ul>
</li>
<li><a href="https://accounts.autistici.org">Login</a></li>
</ul>
</div><!--/.nav-collapse -->
<li><a class="login" href="https://accounts.autistici.org"><strong>Login</strong></a></li>
</ul>
</div><!--/.container-fluid -->
</div>
......
......@@ -5,7 +5,8 @@
<meta name="author" content="Autistici/Inventati">
<meta name="keywords" content="privacy, anonymity, antifascism, antisexism, anticapitalism, antiracism, antimililtarism, grassroot, nsw-thpk-s-hm8vcy41gt4t-li-t-egmng7lajwc5x4jttimmdndf0ano3uc009rvmf1mgr0rdi3lh66g1cdjqmbngze2jdd28mp270x8hbiy2rcs29jl4z5rj72nzg9bn06">
<meta name="description" content="Autistici/Inventati provides internet support to activists and collectives coming from the world of grassroot and social movements">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="/static/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="/static/css/tufte.css">
<link rel="stylesheet" type="text/css" href="/static/css/ai.css">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment