-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into styleguide/blog-single-width
- Loading branch information
Showing
197 changed files
with
1,777 additions
and
689 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
@charset "utf-8"; | ||
|
||
.form-control { | ||
border-color: $input-border-color; | ||
height: auto; | ||
transition: | ||
color 0.3s, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<p><strong class="pr-3">Dark:</strong> <span class="p-3 d-inline-block bg-dark"><a href="#">Teaching & PhD</a></span></p> | ||
<p><strong class="pr-3">Danger:</strong> <span class="p-3 d-inline-block bg-danger"><a href="#">Teaching & PhD</a></span></p> | ||
<p><strong class="pr-3">Success:</strong> <span class="p-3 d-inline-block bg-success"><a href="#">Teaching & PhD</a></span></p> | ||
<p><strong class="pr-3">Info:</strong> <span class="p-3 d-inline-block bg-info"><a href="#">Teaching & PhD</a></span></p> | ||
<p><strong class="pr-3">Warning:</strong> <span class="p-3 d-inline-block bg-warning"><a href="#">Teaching & PhD</a></span></p> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
<a class="btn btn-primary" href="#">Primary button link</a> | ||
<a class="btn btn-secondary" href="#">Secondary button link</a> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
<p><strong class="pr-3">Vanilla link:</strong> <a href="http://bit.ly/2DLIPLo">Teaching & PhD</a></p> | ||
<p><strong class="pr-3">Pretty link:</strong> <a class="link-pretty" href="http://bit.ly/2DLIPLo">Teaching & PhD</a></p> | ||
<p class="mt-4"><strong class="pr-3">Dark link:</strong> <span class="p-3 bg-dark"><a class="text-white" href="http://bit.ly/2DLIPLo">Teaching & PhD</a></span></p> | ||
<p class="mt-4"><strong class="pr-3">Dark pretty link:</strong><span class="p-3 bg-dark"><a class="link-pretty" href="http://bit.ly/2DLIPLo">Teaching & PhD</a></span></p> | ||
<p><strong class="pr-3">Regular link:</strong> <a href="#">Teaching & PhD</a></p> | ||
<p><strong class="pr-3">Light background:</strong> <span class="p-3 d-inline-block bg-gray-100"><a href="#">Teaching & PhD</a></span></p> | ||
<p><strong class="pr-3">Dark background:</strong> <span class="p-3 d-inline-block bg-gray-600"><a class="text-white" href="#">Teaching & PhD</a></span></p> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
assets/components/atoms/nav-toggle-mobile/nav-toggle-mobile.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
<div class="btn btn-secondary nav-toggle-mobile d-xl-none"> | ||
<button class="btn btn-secondary nav-toggle-mobile d-xl-none"> | ||
<span class="label">Menu</span> | ||
<div class="hamburger"> | ||
<span></span> | ||
<span></span> | ||
<span></span> | ||
</div> | ||
</div> | ||
</button> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<div class="nav-user user-login mr-lg-2"> | ||
<a href="#" class="user-login-link"> | ||
{% include '@atoms/icon/icon.twig' with {'icon': 'user', icon_classes: 'feather'} %} | ||
<span class="label">Connexion</span> | ||
</a> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,133 @@ | ||
.user-dropdown .btn { | ||
display: flex; | ||
align-items: center; | ||
padding: $btn-padding-y-sm $btn-padding-x-sm; | ||
border: 0; | ||
|
||
.user-avatar { | ||
--avatar-size: 2.5rem; | ||
flex-basis: var(--avatar-size); | ||
width: var(--avatar-size); | ||
|
||
@include media-breakpoint-up(sm) { | ||
--avatar-size: 2.625rem; | ||
} | ||
|
||
@include media-breakpoint-up(md) { | ||
--avatar-size: 2.875rem; | ||
} | ||
} | ||
|
||
p { | ||
margin: 0 0.5rem 0 1rem; | ||
} | ||
} | ||
|
||
.header .nav-user { | ||
margin-left: auto; | ||
|
||
|
||
& + .nav-lang { | ||
margin-left: 0 !important; | ||
} | ||
} | ||
|
||
.nav-user.user-login { | ||
position: relative; | ||
padding-left: 1.5rem; | ||
|
||
.icon { | ||
position: absolute; | ||
top: 4px; | ||
left: 0; | ||
margin-right: 0.25rem; | ||
} | ||
} | ||
|
||
|
||
@include media-breakpoint-down(lg) { | ||
.header .nav-user { | ||
margin-left: 1rem; | ||
margin-right: 1rem; | ||
} | ||
} | ||
|
||
@include media-breakpoint-down(sm) { | ||
|
||
.header .nav-user-login { | ||
padding: 0; | ||
|
||
.user-login-link { | ||
padding: 0.5em; | ||
} | ||
|
||
.label { | ||
@include sr-only; | ||
} | ||
.icon { | ||
position: static; | ||
width: 1.25rem; | ||
height: 1.25rem; | ||
margin: 0; | ||
} | ||
} | ||
|
||
.header .nav-user { | ||
margin-left: 0.5rem; | ||
margin-right: 0.5rem; | ||
|
||
& + .nav-lang-short > ul { | ||
padding-left: 0 !important; | ||
} | ||
|
||
.btn { | ||
padding: $btn-padding-y-sm; | ||
} | ||
|
||
&:not(.show) { | ||
.btn { | ||
border-radius: 50%; | ||
|
||
&:after { | ||
content: none; | ||
} | ||
} | ||
.user-name { | ||
@include sr-only; | ||
} | ||
} | ||
|
||
&.show { | ||
position: fixed; | ||
top: 0.625rem; | ||
right: 0.75rem; | ||
left: 0.75rem; | ||
//width: calc(100vw - 1.8rem); | ||
margin: 0; | ||
background: white; | ||
z-index: 1199; | ||
|
||
.btn { | ||
width: 100%; | ||
padding-left: $btn-padding-y; | ||
padding-right: $btn-padding-y; | ||
border: 2px solid $gray-600; | ||
border-bottom: 0; | ||
border-radius: 2px 2px 0 0; | ||
|
||
&:after { | ||
margin-left: auto; | ||
} | ||
} | ||
|
||
.dropdown-menu { | ||
top: -2px !important; | ||
left: 0 !important; | ||
width: 100%; | ||
border: 2px solid $gray-600; | ||
border-top: 0; | ||
border-radius: 0 0 2px 2px; | ||
} | ||
} | ||
} | ||
} |
Oops, something went wrong.