Skip to content
Snippets Groups Projects
Commit 58e76d15 authored by Sebastien's avatar Sebastien
Browse files

Merge branch 'tuleap-134-unify-css' into 'main' 

Tuleap 134 unify css

See merge request !68
parents e07844f5 109b8153
No related branches found
No related tags found
1 merge request!68Tuleap 134 unify css
Pipeline #869 passed
Stage: test
Show whitespace changes
Inline Side-by-side
Showing
with 46 additions and 100 deletions
assets/app.js
+ 6
− 0
View file @ 58e76d15
......@@ -19,3 +19,9 @@ import './styles/app.scss';
// start the Stimulus application
import './bootstrap';
$(function() {
$('select.choice-auto-submit').on('change', function () {
$(this).parents('form').submit();
});
})
assets/styles/app.scss
+ 10
− 65
View file @ 58e76d15
......@@ -2,6 +2,7 @@
@import "~bootstrap/scss/bootstrap";
@import "~bootstrap/scss/variables";
@import "./layout/header";
@import "~bootstrap/scss/_mixins.scss";
body {
height:100%;
......@@ -27,54 +28,25 @@ form input[type=checkbox]{
border: 1px solid;
}
button[type=submit]{
border: none;
border-radius: 3px;
color: #FFF;
opacity: 1;
background: #3B8C7E;
}
.memorekall-logo {
height: 200px;
}
.btn-primary {
background: rgba(0,0,0,.1);
border: none;
border-radius: 3px;
opacity: 1;
}
#btn-orange {
background: #FA772E;
color: white;
border: none;
border-radius: 3px;
line-height: 1.5;
font-size: 1rem;
padding: .5rem 1rem;
text-align: center;
text-transform: uppercase;
box-shadow: 0 -2px 0 #f05b2b inset;
$orange-button-bt: #FA772E;
.btn-orange {
@include button-variant($orange-button-bt, $orange-button-bt, white, #f05b2b, #f05b2b);
}
#btn-orange:hover {
background: #f05b2b;
.btn-standard {
@include button-variant(#49AD9A, #49AD9A, white, #3B8C7E, #3B8C7E);
}
#user-block {
position: absolute;
right: 0;
text-align: right;
font-weight: 300;
color: rgba(255,255,255,.5);
font-size: 14px;
.btn-cancel {
@include button-variant(#5c636a, #5c636a, white, #4f5050, #4f5050);
}
#user-block-nom {
text-transform: capitalize;
font-weight: 500;
.gray-600 {
color:$gray-600;
}
.capsule-item {
......@@ -93,23 +65,6 @@ button[type=submit]{
color: rgba(255,255,255,.75);
}
.standard-button {
line-height: 40px;
padding: 0.5em 2em;
font-size: 16px;
font-weight: bold;
border: none;
color: #FFF !important;
border-radius: 3px;
background: #49AD9A;
box-shadow: 0 -2px 0 #3B8C7E inset;
flex-basis: auto;
}
.standard-button:hover {
background: #3B8C7E;
}
.row-title-box {
border-bottom: 2px solid rgba(0,0,0,.2);
margin-bottom: 60px;
......@@ -132,16 +87,6 @@ button[type=submit]{
margin-bottom: 0;
}
.button-cancel {
border: none;
border-radius: 3px;
background-color: #5c636a;
}
.button-cancel:hover {
background-color: #4f5050;
}
.row-title:hover {
color: rgba(255,255,255,.75);
}
......
assets/styles/helpers/_variables.scss
+ 6
− 2
View file @ 58e76d15
$text-color: #fff;
$rekall-bg-color: #3b8c7e;
// scss-docs-start theme-color-variables
$primary: #3b8c7e !default;
$primary: $rekall-bg-color !default;
// scss-docs-end theme-color-variables
// The contrast ratio to reach against white, to determine if color changes from "light" to "dark". Acceptable values for WCAG 2.0 are 3, 4.5 and 7.
......@@ -24,3 +25,6 @@ $input-btn-padding-y: .5rem !default;
$input-btn-padding-x: 1.0rem !default;
// scss-docs-end input-btn-variables
$input-color: #adb5bd;
$input-group-addon-bg: $body-bg;
\ No newline at end of file
src/Form/CreateCapsuleGroupsFormType.php
+ 1
− 1
View file @ 58e76d15
......@@ -33,7 +33,7 @@ class CreateCapsuleGroupsFormType extends AbstractType
'go_back',
ButtonType::class,
['label' => 'groups.create.go_back',
'attr' => ['class' => 'button-cancel']
'attr' => ['class' => 'btn-cancel']
]
);
}
......
src/Form/DeleteCapsuleFormType.php
+ 1
− 1
View file @ 58e76d15
......@@ -17,7 +17,7 @@ class DeleteCapsuleFormType extends AbstractType
'cancel',
ButtonType::class,
['label' => 'general.cancel_button',
'attr' => ['class' => 'button-cancel']
'attr' => ['class' => 'btn-cancel']
]
)
->add(
......
src/Form/DeleteGroupFormType.php
+ 1
− 1
View file @ 58e76d15
......@@ -18,7 +18,7 @@ class DeleteGroupFormType extends AbstractType
'cancel',
ButtonType::class,
['label' => 'general.cancel_button',
'attr' => ['class' => 'button-cancel']
'attr' => ['class' => 'btn-cancel']
]
)
->add(
......
src/Form/FilterByGroupFormType.php
+ 1
− 6
View file @ 58e76d15
......@@ -27,12 +27,7 @@ class FilterByGroupFormType extends AbstractType
'choice_value' => 'name',
'choice_name' => 'name',
'expanded' => false
])
->add(
'filter',
SubmitType::class,
['label' => 'groups.filter.button']
);
]);
}
public function configureOptions(OptionsResolver $resolver): void
......
src/Form/RemoveEditorFormType.php
+ 1
− 1
View file @ 58e76d15
......@@ -17,7 +17,7 @@ class RemoveEditorFormType extends AbstractType
'cancel',
ButtonType::class,
['label' => 'general.cancel_button',
'attr' => ['class' => 'button-cancel']
'attr' => ['class' => 'btn-cancel']
]
)
->add(
......
src/Form/RemoveGroupFormType.php
+ 1
− 1
View file @ 58e76d15
......@@ -18,7 +18,7 @@ class RemoveGroupFormType extends AbstractType
'cancel',
ButtonType::class,
['label' => 'general.cancel_button',
'attr' => ['class' => 'button-cancel']
'attr' => ['class' => 'btn-cancel']
]
)
->add(
......
templates/capsule/create.html.twig
+ 2
− 2
View file @ 58e76d15
......@@ -9,9 +9,9 @@
<div>
<div class="row w-100 gx-0">
<div class="row-title-box">
<h3 class="row-title">
<div class="row-title h3">
{{ 'capsule.create_capsule'|trans }}
</h3>
</div>
</div>
</div>
......
templates/capsule/groups/user_groups.html.twig
+ 1
− 3
View file @ 58e76d15
......@@ -54,11 +54,9 @@
</div>
<div class="d-flex align-items-center mt-3 mt-md-0">
<button type="submit" class="p-2">
<a href="/my_groups/create" class="list-unstyled text-decoration-none text-white">
<a href="/my_groups/create" class="btn btn-primary">
{{ 'groups.create.title'|trans }}
</a>
</button>
</div>
</div>
......
templates/capsule/index.html.twig
+ 7
− 7
View file @ 58e76d15
......@@ -15,17 +15,17 @@
{% if app.request.query.get('page')|default(1) == 1 %}
{% if current_user.getGroups()|length > 1 %}
<div class="mb-3 mb-sm-0">
{{ form_start(filterByGroupForm, {'attr': {novalidate: 'novalidate', 'class': 'd-flex flex-column flex-sm-row mb-0 align-items-center pt-3'}}) }}
{{ form_row(filterByGroupForm.name, {'attr': {'class': ''}}) }}
{{ form_row(filterByGroupForm.filter, {'attr': {'class': 'ms-2'}}) }}
{{ form_end(filterByGroupForm) }}
{{ form_start(filterByGroupForm, {'attr': {novalidate: 'novalidate', 'class': 'd-flex flex-row flex-nowrap'}}) }}
<div class="input-group">
{{ form_label(filterByGroupForm.name, 'groups.filter.label', { 'label_attr' : { 'class' : 'input-group-text mb-0'}}) }}
{{ form(filterByGroupForm.name, {'attr': {'class': 'choice-auto-submit' }}) }}
</div>
{{ form_end(filterByGroupForm) }}
{% endif %}
{% endif %}
<form class="d-flex mb-4 mb-lg-0">
<button id="btn-orange" formaction="/create">
<button class="btn btn-orange text-uppercase" formaction="/create">
+ {{ 'capsule.create_capsule'|trans }}
</button>
</form>
......@@ -109,7 +109,7 @@
{% endif %}
<a href="capsule/edit/{{ capsule.getLinkPath() }}" class="list-item text-nowrap lh-md">
<button class="standard-button p-2">
<button class="btn btn-primary btn-lg rounded-3 col-12">
{{ 'capsule.edit.link'|trans }}
</button>
</a>
......
templates/capsule/no_edition_access.html.twig
+ 1
− 1
View file @ 58e76d15
......@@ -23,7 +23,7 @@
<div class="d-flex justify-content-center align-items-center">
<form>
<button id="btn-primary" formaction="/capsule_list">
<button class="btn btn-primary" formaction="/capsule_list">
{{ 'general.go_back_to_home_page'|trans }}
</button>
</form>
......
templates/layout.html.twig
+ 3
− 5
View file @ 58e76d15
......@@ -25,11 +25,9 @@
</a>
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
<div id="user-block" class="d-flex flex-column">
<div id="user-block-nom">{{ app.user.firstName }} {{ app.user.lastName }}</div>
<a href="{{ path('show_profile') }}" class="text-decoration-none fs-5">
{{ 'user.profile.title'|trans }}
</a>
<div class="d-flex flex-column position-absolute end-0 align-content-end text-end fw-light gray-600">
<div class="fw-bold text-capitalize">{{ app.user.firstName }} {{ app.user.lastName }}</div>
<a href="{{ path('show_profile') }}" class="text-decoration-none fs-5">My profile</a>
<a href="{{ path('edit_user_groups') }}" class="text-decoration-none fs-5">
{{ 'groups.general.title'|trans }}
</a>
......
templates/user/profile.html.twig
+ 2
− 2
View file @ 58e76d15
......@@ -41,10 +41,10 @@
<div class="d-flex flex-column justify-content-center mt-2 mt-md-0">
<a href="/edit_profile" class="m-2 m-md-3 standard-button text-decoration-none text-center">
<a href="/edit_profile" class="m-2 m-md-3 btn btn-primary text-decoration-none text-center">
{{ 'user.profile.edit'|trans }}
</a>
<a href="/edit_password" class="m-2 m-md-3 standard-button text-decoration-none text-center">
<a href="/edit_password" class="m-2 m-md-3 btn btn-primary text-decoration-none text-center">
{{ 'user.password.edit'|trans }}
</a>
</div>
......
translations/messages.en.yaml
+ 1
− 1
View file @ 58e76d15
......@@ -189,5 +189,5 @@ groups:
title: Remove group
success: Group group_name removed successfully
filter:
button: Apply group filter
label: Filter by group
no_filter: Show all
\ No newline at end of file
translations/messages.fr.yaml
+ 1
− 1
View file @ 58e76d15
......@@ -188,5 +188,5 @@ groups:
title: Supprimer le groupe
success: Le groupe group_name a bien été supprimé
filter:
button: Filtrer par groupe
label: Filtrer par groupe
no_filter: Tout afficher
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment