Commit 73e1ac9c authored by Eugen Rochko's avatar Eugen Rochko Committed by Thomas Citharel

Fizzation

Fix connect timeout not being enforced (#9329)

* Fix connect timeout not being enforced

The loop was catching the timeout exception that should stop execution, so the next IP would no longer be within a timed block, which led to requests taking much longer than 10 seconds.

* Use timeout on each IP attempt, but limit to 2 attempts

* Fix code style issue

* Do not break Request#perform if no block given

* Update method stub in spec for Request

* Move timeout inside the begin/rescue block

* Use Resolv::DNS with timeout of 1 to get IP addresses

* Update Request spec to stub Resolv::DNS instead of Addrinfo

* Fix Resolve::DNS stubs in Request spec

Bump puma from 3.11.4 to 3.12.0 (#8883)

Bumps [puma](https://github.com/puma/puma) from 3.11.4 to 3.12.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.11.4...v3.12.0)
Signed-off-by: default avatardependabot[bot] <support@dependabot.com>

fizz

update frontpage
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

add new error page with a new picture

add piaf css

Add missing ombre

reset default lang to en

Add new directory

Upload new mastodon happy with smartphone

Upload new file

Add word on apps

Update fr.json

update framapiaf to 2.0
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Add toot.cafe theme

Add win95 and cybrespace themes

Add paris mon amour theme

base custom themes on original instead of mastodon for our nav fixes
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

typo
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

fix for win93 theme
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

fix input display for frama theme
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

fix dropdown
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

try to fix dropdown color
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

fixup !
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

fix about page
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

final fix for dropdown menu
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

fix for too clair for luc
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

column use full width
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

luc height fixes
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

fix framapiaf theme and make original theme available with full width columns
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

fixup
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

correction de syntaxe, le verbe échouer est intransitif (sauf pour une barque ou une baleine, dans des emplois vieillis), on n eput pas dire « connexion échouée » par exemple, mais « connexion en échec » ou « la connexion a échoué ». http://www.cnrtl.fr/lexicographie/%C3%A9chouer. Fin du message d ecommit le plus long de l'histoire de framagit.

Fix #10 and #8
Fix #11
Fix #9Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

update to git master
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

fizz loading indicator
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Update fr.yml - 2 coquilles

Lien framacloud, h2 trop petits, marge internav qui crée du scroll horizontal

Update Framapiaf to 2.3.2

This unfortunately removes the Framasoft logo on bottom left and replaces it with mastodon one, because it's now hardcoded in several places
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

CSS fixes for 2.4.0 release
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

CSS Fixes
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

CSS tweaks from nav
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Fix rebase
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Add back flex-grow on mastodon theme and add some missing theme name
translations
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Fix Framapiaf theme when focusing toots

Closes #21Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Update to 2.5.0 with new theme based on mastodon's light theme
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Fix fixed columns and profile
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

More fixes
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

More Fixes
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Fix
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Black is now #333
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Add public profiles fixes to other themes as well
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Fix gemfile merge issue
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Tweak default content security policy for framasoft
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Fixes for v2.6.1
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Updates to Cybre & Win 95 themes
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Fix request.rb
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Add 42px for introduction height for low resolutions
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Remplacement de twidere par mastalab

Mastalab devent Fedilab

Disable animated gif on error page
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Put nav at the right position and set csp correctly
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Change caroussel links URLs to framapiaf instead of nav
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Add fixes for bootstrap in nav

(in all themes)
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

More theme fixes

https://framapiaf.org/@danslerush/101855473650618460Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

make selector more precise
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Add (back ?) gif support for webpack

Needed for a pic in the Win95 theme
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Include directly bootstrap / jquery on the homepage

Also reword and add a few paragraphs on the homepage
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Hide Mastodon footer and use custom background color
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Move frama assets in <head>
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Fix polls text on dark theme
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>

Change mailto to allow using https://contact.framasoft.org correctly
Signed-off-by: Thomas Citharel's avatarThomas Citharel <tcit@tcit.fr>
parent 9bafe6f5
This diff is collapsed.
......@@ -70,9 +70,10 @@
"column_header.hide_settings": "Masquer les paramètres",
"column_header.moveLeft_settings": "Déplacer la colonne vers la gauche",
"column_header.moveRight_settings": "Déplacer la colonne vers la droite",
"column_header.pin": "Épingler",
"column_header.show_settings": "Afficher les paramètres",
"column_header.unpin": "Désépingler",
"column_header.pin": "Épingler",
"column_header.unpin": "Relâcher",
"column_subheading.navigation": "Navigation",
"column_subheading.settings": "Paramètres",
"community.column_settings.media_only": "Média uniquement",
"compose_form.direct_message_warning": "Ce pouet sera uniquement envoyé aux personnes mentionnées. Cependant, l’administration de votre instance et des instances réceptrices pourront inspecter ce message.",
......
@import 'framapiaf/variables';
@import 'application';
@import 'mastodon-light/diff';
@import 'framapiaf/fixes';
body {
background: #eee;
div.dropdown-menu {
display: block !important;
}
}
.ui {
background: #eee;
padding-bottom: 0;
.dropdown, .dropup {
position: absolute;
}
}
.column-header, .column-header__button, .column-header__back-button, .column-back-button {
background: #6A5687;
color: #fff;
border-radius: 5px 5px 0 0;
}
.column-header > .column-header__back-button {
color: #fff;
}
.compose-form__autosuggest-wrapper {
margin-bottom: -5px;
.autosuggest-textarea label {
display: block !important;
}
}
a.search-results__hashtag,
a.load-more,
a.mention {
text-decoration:none !important;
}
.drawer__tab, a.column-link:link {
text-decoration:none;
}
.status .status__display-name {
text-decoration:none;
margin-bottom:8px;
}
.compose-form__publish-button-wrapper button {
color: #fff;
text-shadow: 0 0 3px rgba(0,0,0,.7);
background-color: #6a5687;
border-color: #6a5687;
text-decoration: none!important;
}
.spoiler-input label, .search label {
display: block;
}
.app-holder {
height: calc(100% - 42px);
}
.modal-root__overlay {
background: rgba(0, 0, 0, 0.7);
}
.admin-wrapper {
.sidebar-wrapper, .content-wrapper {
background-color: #eee;
overflow: auto;
padding-bottom: 42px;
.sidebar > ul > li > a.selected {
background-color: #B3CC66;
}
.sidebar ul li {
a {
color: #666;
}
ul li a.selected {
color: #fff;
}
}
}
.simple_form span.hint {
color: #666;
}
}
.column {
flex-grow: 1;
}
.fa-star:before { content: "\f006"; }
.active .fa-star:before { content: "\f005"; }
.public-layout .public-account-header__bar .avatar {
padding-left: 0;
margin-left: 16px;
}
.column-header.active .column-header__icon {
color: #FFC529;
}
.reply-indicator {
background: #B49CD9;
}
.container.ombre {
h1 {
font-size: 36px;
}
p {
margin: 0 0 10px !important;
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 14px;
line-height: 1.42857143;
}
b {
font-weight: 700;
}
}
.simple_form {
input[type=text],
input[type=number],
input[type=email],
input[type=password],
textarea {
background: lighten($ui-base-color, 10%);
}
select {
background: lighten($ui-base-color, 10%) url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 12%))}'/></svg>") no-repeat right 8px center / auto 16px;
}
.check_boxes {
.checkbox {
label {
font-family: inherit;
font-size: 14px;
color: $primary-text-color;
display: block;
width: auto;
position: relative;
padding-top: 5px;
padding-left: 25px;
flex: 1 1 auto;
}
input[type=checkbox] {
position: absolute;
left: 0;
top: 5px;
margin: 0;
}
}
}
}
.checkbox input[type=checkbox] {
margin-left: 0 !important;
}
div.introduction {
height: calc(100% + 42px);
}
@import 'custom';
.column {
flex-grow: 0;
}
This diff is collapsed.
@import 'application';
/* Allow columns to grow wider as the screen gets
* wider, but don't ever let them get more than
* 400px (some people have a bunch of columns!) */
@media screen and (min-width: 1300px) {
.column {
flex-grow: 1 !important;
max-width: 400px;
}
.drawer {
width: 17%; /* Not part of the flex fun */
max-width: 400px;
min-width: 330px;
}
}
/* Cap the column height at 100vh (fixed an old
* bug someone encountered in safari, but which
* I've seen resurface from time to time) */
.column {
max-height:100vh;
}
/* Don't show outline around statuses if we're in
* mouse or touch mode (rather than keyboard) */
[data-whatinput="mouse"], [data-whatinput="touch"] {
.status__content:focus, .status:focus,
.status__wrapper:focus, .status__content__text:focus {
outline: none;
}
}
/* Show a little arrowey thing after the time in a
* status to signal that you can click it to see
* a detailed view */
.status time:after,
.detailed-status__datetime span:after {
font: normal normal normal 14px/1 FontAwesome;
content: "\00a0\00a0\f08e";
}
/* Don't display the elephant mascot (we have our
* own, thanks) */
.drawer__inner__mastodon {
display: none;
}
/* Let the compose area/drawer be short, but
* expand if necessary */
.drawer .drawer__inner {
overflow: visible;
height:inherit;
background-image: none;
}
.drawer__pager {
overflow-y:auto;
}
/* Use display: none instead of visibility:hidden
* to hide the suggested follows list on non-mobile */
@media screen and (min-width: 630px) {
.search-results .trends {
display:none;
}
}
@import 'fullwidth-media';
$ui-base-color: #181818; // darkest
$ui-highlight-color: #1ea21e; // vibrant
$ui-secondary-color: #E4F2E4; // lightest
$ui-primary-color: #E4F2E4; // lighter
$ui-primary-color-alt: #a0b49c; // darker, for external pages
$about-page-text: lighten($ui-base-color, 50%);
@import 'cybre-base';
@keyframes floating {
from {
transform: translate(0, 0);
}
65% {
transform: translate(0, 4px);
}
to {
transform: translate(0, -0);
}
}
body, body.about-body {
background: $ui-base-color url('../images/background-cybre.png');
}
body.about-body {
// basics.scss &.about-body
background: darken($ui-base-color, 8%) url('../images/background-cybre.png');
background-position-y: 200px;
background-position-x: center;
}
.about-body .mascot {
display: none;
}
.muted {
.status__content p, .status__content a {
color: lighten($ui-base-color, 35%);
}
.status__display-name strong {
color: lighten($ui-base-color, 35%);
}
}
.compose-form__buttons button.active:last-child {
color:$ui-secondary-color;
background-color: $ui-highlight-color;
border-radius:3px;
}
.screenshot-with-signup {
min-height:300px;
}
.container.hero .closed-registrations-message .clock {
font-size: 150%;
margin: 1em auto;
}
.column .static-content.getting-started {
background-image: url('../images/logo-cybre.png'), url('../images/background-cybre.png');
background-size:auto 50%, cover;
background-position: 50% 75%, center center;
background-repeat:no-repeat, no-repeat;
}
.columns-area {
background: $ui-base-color url('../images/background-cybre.png');
}
.actions .button.button-alternative {
background: $ui-highlight-color;
color: $ui-primary-color;
&:active,
&:focus,
&:hover {
background-color: lighten($ui-highlight-color, 4%);
}
}
@media screen and (max-width: 1280px) {
.landing-page .container.links {
top: -15px;
}
}
.landing-page.alternative .header {
background-image:url('../images/header-cybre-colour.jpg');
background-repeat: repeat-x;
background-size:contain;
height:45vh;
width: 100%;
position:absolute;
z-index: 1;
text-align:center;
display: unset!important;
}
.landing-page.alternative .header img {
margin: auto;
max-height:45vh;
}
.landing-page.alternative .grid {
position: relative;
z-index:2;
margin-top:15vh;
}
.landing-page.alternative .landing-page__hero img {
visibility: hidden;
max-height:170px;
}
.landing-page.alternative .landing-page__forms {
height:auto;
}
.landing-page.alternative .column-1 {
display:flex;
align-items:flex-end;
}
.landing-page.alternative .column {
max-height:initial;
}
.landing-page.alternative .row__mascot {
.floats {
position:absolute;
img {
width:100%;
height:100%;
}
transition: all 0.1s linear;
animation-name: floating;
animation-iteration-count: infinite;
animation-direction: alternate;
animation-timing-function: ease-in-out;
}
.float-1 {
width:50px;
height:50px;
bottom:60px;
left:110px;
animation-duration: 3s;
}
.float-2 {
width:130px;
height:130px;
left:85px;
bottom: -60px;
animation-duration: 3.5s;
animation-delay: 0.2s;
}
.float-3 {
width:100px;
height:100px;
right: 50;
top: -10px;
animation-duration: 4s;
animation-delay: 0.5s;
}
}
.activity-stream {
.status.light {
.status__header .status__meta .status__relative-time {
color: $ui-primary-color-alt;
}
.display-name span {
color: $ui-primary-color-alt;
}
.status__content {
a.status__content__spoiler-link {
background: $ui-primary-color-alt;
&:hover {
background: lighten($ui-primary-color-alt, 8%);
}
}
}
}
.detailed-status.light {
.detailed-status__display-name .display-name span {
color: $ui-primary-color-alt;
}
.status__content a.status__content__spoiler-link {
background: $ui-primary-color-alt;
&:hover {
background: lighten($ui-primary-color-alt, 8%);
}
}
.detailed-status__meta {
color: $ui-primary-color-alt;
}
}
.media-spoiler {
background: $ui-primary-color-alt;
&:hover {
background: darken($ui-primary-color-alt, 5%);
}
}
.pre-header {
color: $ui-primary-color-alt;
.status__display-name.muted strong {
color: $ui-primary-color-alt;
}
}
}
.embed .activity-stream .entry .detailed-status.light .button.button-secondary.logo-button {
color: $ui-primary-color-alt;
svg {
path:first-child {
fill: $ui-primary-color-alt;
}
}
&:active,
&:focus,
&:hover {
svg path:first-child {
fill: lighten($ui-primary-color-alt, 4%);
}
}
}
.emoji-mart-search {
background: $simple-background-color;
input {
color: $ui-primary-color-alt;
border: 1px solid $ui-primary-color-alt;
}
}
.emoji-mart-anchor {
color: $ui-primary-color-alt;
&:hover {
color: darken($ui-primary-color-alt, 8%);
}
}
.search-popout {
background: $ui-base-color;
color: $ui-primary-color;
h4 {
color: $ui-primary-color;
}
em {
color: $ui-highlight-color;
}
}
.account__header__fields dl {
margin-bottom: 0;
}
.column-header__wrapper {
h1.column-header {
margin: 0;
}
}
textarea.autosuggest-textarea__textarea,
input.search__input,
input.spoiler-input__input {
font-family: "mastodon-font-sans-serif",sans-serif;
font-weight: 400;
}
div.public-layout {
div.public-account-header {
div.public-account-header__bar {
&::before {
z-index: 0;
}
a.avatar {
z-index: 1;
}
}
}
}
body div.public-layout {
background: #eee;
}
// Dependent colors
$black: #333;
$white: #ffffff;
$classic-base-color: #6A5687;
$classic-primary-color: #B49CD9;
$classic-secondary-color: #EDE6F5;
$classic-highlight-color: #677835;
// Differences
$success-green: #677835;
$base-overlay-background: $white !default;
$valid-value-color: $success-green !default;
$ui-base-color: $classic-secondary-color !default;
$ui-base-lighter-color: #B49CD9;
$ui-primary-color: #8157C2;
$ui-secondary-color: $classic-base-color !default;
$ui-highlight-color: #677835;
$primary-text-color: $black !default;
$darker-text-color: $classic-base-color !default;
$dark-text-color: #444b5d;
$action-button-color: #606984;
$inverted-text-color: $black !default;
$lighter-text-color: $classic-base-color !default;
$light-text-color: #444b5d;
//Newly added colors
$account-background-color: $white !default;
//Invert darkened and lightened colors
@function darken($color, $amount) {
@return hsl(hue($color), saturation($color), lightness($color) + $amount);
}
@function lighten($color, $amount) {
@return hsl(hue($color), saturation($color), lightness($color) - $amount);
}
.detailed-status > .media-spoiler,
.status > .media-spoiler,
.status .video-player,