Commit c9d17b6f authored by nono's avatar nono
Browse files

Mise à jour depuis la dernière version sur github. Bcp de conflits

parents c01fc66b 476d8429
Pipeline #2814 failed with stages
in 0 seconds
{
"extends": "nodebb/lib"
}
\ No newline at end of file
*.css
!less/bootstrap-flipped.css
npm-debug.log
sftp-config.json
*.sublime-project
*.sublime-workspace
.idea
.vscode
node_modules/
\ No newline at end of file
{
// JSHint Default Configuration File (as on JSHint website)
// See http://jshint.com/docs/ for more details
"maxerr" : 50, // {int} Maximum error before stopping
// Enforcing
"bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
"camelcase" : false, // true: Identifiers must be in camelCase
"curly" : true, // true: Require {} for every new block or scope
"eqeqeq" : true, // true: Require triple equals (===) for comparison
"forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
"immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
"indent" : 4, // {int} Number of spaces to use for indentation
"latedef" : false, // true: Require variables/functions to be defined before being used
"newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
"noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
"noempty" : true, // true: Prohibit use of empty blocks
"nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
"plusplus" : false, // true: Prohibit use of `++` & `--`
"quotmark" : false, // Quotation mark consistency:
// false : do nothing (default)
// true : ensure whatever is used is consistent
// "single" : require single quotes
// "double" : require double quotes
"undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
"unused" : true, // true: Require all defined variables be used
"strict" : true, // true: Requires all functions run in ES5 Strict Mode
"trailing" : false, // true: Prohibit trailing whitespaces
"maxparams" : false, // {int} Max number of formal params allowed per function
"maxdepth" : false, // {int} Max depth of nested blocks (within functions)
"maxstatements" : false, // {int} Max number statements per function
"maxcomplexity" : false, // {int} Max cyclomatic complexity per function
"maxlen" : false, // {int} Max number of characters per line
// Relaxing
"asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
"boss" : false, // true: Tolerate assignments where comparisons would be expected
"debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
"eqnull" : false, // true: Tolerate use of `== null`
"es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
"esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
"moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
// (ex: `for each`, multiple try/catch, function expression…)
"evil" : false, // true: Tolerate use of `eval` and `new Function()`
"expr" : false, // true: Tolerate `ExpressionStatement` as Programs
"funcscope" : false, // true: Tolerate defining variables inside control statements"
"globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
"iterator" : false, // true: Tolerate using the `__iterator__` property
"lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
"laxbreak" : false, // true: Tolerate possibly unsafe line breakings
"laxcomma" : false, // true: Tolerate comma-first style coding
"loopfunc" : false, // true: Tolerate functions being defined in loops
"multistr" : false, // true: Tolerate multi-line strings
"proto" : false, // true: Tolerate using the `__proto__` property
"scripturl" : false, // true: Tolerate script-targeted URLs
"smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment
"shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
"sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
"supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
"validthis" : false, // true: Tolerate using this in a non-constructor function
// Environments
"browser" : true, // Web Browser (window, document, etc)
"couch" : false, // CouchDB
"devel" : true, // Development/debugging (alert, confirm, etc)
"dojo" : false, // Dojo Toolkit
"jquery" : true, // jQuery
"mootools" : false, // MooTools
"node" : true, // Node.js
"nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
"prototypejs" : false, // Prototype and Scriptaculous
"rhino" : false, // Rhino
"worker" : false, // Web Workers
"wsh" : false, // Windows Scripting Host
"yui" : false, // Yahoo User Interface
// Legacy
"nomen" : false, // true: Prohibit dangling `_` in variables
"onevar" : false, // true: Allow only one `var` statement per function
"passfail" : false, // true: Stop on first error
"white" : false, // true: Check against strict whitespace and indentation rules
// Custom Globals
"globals" : {} // additional predefined global variables
}
\ No newline at end of file
*.css
!less/bootstrap-flipped.css
npm-debug.log
sftp-config.json
*.sublime-project
*.sublime-workspace
......@@ -4,6 +4,8 @@ Persona is the new default theme for NodeBB as of v0.7.1
Thème NodeBB basé sur Personna, dont les appels vers Google ont été supprimés.
=======
## Addons
[Recent Cards](https://github.com/psychobunny/nodebb-plugin-recent-cards)
......@@ -13,5 +15,3 @@ Thème NodeBB basé sur Personna, dont les appels vers Google ont été supprim
![](https://d2gn4xht817m0g.cloudfront.net/p/product_screenshots/images/original/000/570/286/570286-db378dfd28256a8fabacc9129b3638dc678ac393.png?1439315393)
![](https://d2gn4xht817m0g.cloudfront.net/p/product_screenshots/images/original/000/570/287/570287-5875c63ce086d361b76d94e5bc7cc88a5fd34b8b.png?1439315419)
{
"mobile-menu-side": "Menüposition der mobilen Seiten umschalten",
"post-quick-reply": "Schnelle Antwort"
}
\ No newline at end of file
{
"mobile-menu-side": "Switch which side each mobile menu is on"
}
\ No newline at end of file
{
"mobile-menu-side": "Switch which side each mobile menu is on"
}
\ No newline at end of file
{
"mobile-menu-side": "هماهنگ کردن جهت منو های کناری با زبان دستگاه",
"post-quick-reply": "پاسخ سریع"
}
{
"mobile-menu-side": "Changer la position du menu en version mobiles"
}
{
"mobile-menu-side": "Mobilon a menü az ellentétes oldalon jelenjen meg",
"post-quick-reply": "Gyors válasz"
}
\ No newline at end of file
{
"mobile-menu-side": "Menu mobilne po prawej stronie"
}
{
"mobile-menu-side": "Alternar de que lado fica cada menu lateral em telemóvel"
}
\ No newline at end of file
{
"mobile-menu-side": "Mobil menünün bulunduğu tarafı değiştir",
"post-quick-reply": "Hızlı Cevap Gönder"
}
{
"mobile-menu-side": "移动端导航菜单切换到另一侧",
"post-quick-reply": "快速回复"
}
......@@ -168,7 +168,11 @@
@media (min-width: @screen-md-min) {
margin-top: 300px;
<<<<<<< HEAD
=======
>>>>>>> github/master
.cover, .container {
height: 300px;
......@@ -236,7 +240,11 @@
}
}
}
<<<<<<< HEAD
=======
>>>>>>> github/master
.show-success {
.form-control {
border-color: #5cb85c;
......@@ -247,14 +255,22 @@
-webkit-background-size: 1.25rem 1.25rem;
background-size: 1.25rem 1.25rem;
}
<<<<<<< HEAD
=======
>>>>>>> github/master
.form-feedback {
color: #5cb85c;
display: block;
margin-top: .25rem;
}
}
<<<<<<< HEAD
=======
>>>>>>> github/master
.show-danger {
.form-control {
border-color: #d9534f;
......@@ -265,7 +281,11 @@
-webkit-background-size: 1.25rem 1.25rem;
background-size: 1.25rem 1.25rem;
}
<<<<<<< HEAD
=======
>>>>>>> github/master
.form-feedback {
color: #d9534f;
display: block;
......@@ -273,8 +293,36 @@
}
}
<<<<<<< HEAD
[component="account/moderation-note/list"] .icon {
margin-right: 10px;
=======
[component="account/moderation-note/list"] {
.icon {
margin-right: 10px;
}
.content {
white-space: pre-line;
}
}
.categories {
[component="categories/category"] {
.depth-1 {
padding-left: 50px;
}
.depth-2 {
padding-left: 100px;
}
.depth-3 {
padding-left: 150px;
}
.depth-4 {
padding-left: 150px;
}
}
>>>>>>> github/master
}
}
......@@ -346,11 +394,66 @@
line-height: 46px;
margin: 0;
}
<<<<<<< HEAD
=======
>>>>>>> github/master
.modal-body .btn {
padding: 10px 5px;
font-size: 13px;
}
<<<<<<< HEAD
=======
label {
vertical-align: top;
line-height: 26px;
> input[type="radio"] {
display: none;
&:checked {
+ span:before {
border-radius: 50%;
border: 2px solid @brand-primary;
position: relative;
top: -4px;
left: -4px;
}
}
&[value="transparent"] {
&:checked + span:before {
padding-top: 2px;
padding-left: 2px;
}
+ span:before {
content: '\f05e';
font-family: FontAwesome;
color: @gray-lighter;
font-size: 28px;
}
}
}
span {
display: inline-block;
width: 24px;
height: 24px;
border-radius: 50%;
margin-right: .5em;
&:before {
content: '';
display: inline-block;
width: 32px;
height: 32px;
}
}
}
>>>>>>> github/master
}
.page-user-info {
......@@ -381,10 +484,13 @@
margin-bottom: 1rem;
}
<<<<<<< HEAD
.timestamp {
font-weight: bold;
}
=======
>>>>>>> github/master
.expiry {
font-size: 1.25rem;
font-style: italic;
......
......@@ -165,7 +165,11 @@
right: 0;
bottom: 0;
top: 0;
<<<<<<< HEAD
z-index: (@zindex-dropdown - 10);
=======
z-index: @zindex-dropdown;
>>>>>>> github/master
}
// Right aligned dropdowns
......
......@@ -11,8 +11,13 @@
@gray-darker: lighten(@gray-base, 13.5%); // #222
@gray-dark: lighten(@gray-base, 20%); // #333
@gray: lighten(@gray-base, 33.5%); // #555
<<<<<<< HEAD
@gray-light: lighten(@gray-base, 46.7%); // #777
@gray-lighter: lighten(@gray-base, 93.5%); // #eee
=======
@gray-light: #6c757d;
@gray-lighter: #eee;
>>>>>>> github/master
@brand-primary: darken(#428bca, 6.5%); // #337ab7
@brand-success: #5cb85c;
......@@ -42,7 +47,11 @@
//
//## Font, line-height, and color for body text, headings, and more.
<<<<<<< HEAD
@font-family-sans-serif: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
=======
@font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
>>>>>>> github/master
@font-family-serif: Georgia, "Times New Roman", Times, serif;
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
......
......@@ -4,7 +4,10 @@
> li {
<<<<<<< HEAD
padding-top: 10px;
=======
>>>>>>> github/master
padding-bottom: 10px;
@media (max-width: @screen-xs-max) {
......@@ -17,6 +20,11 @@
min-height: 53px;
.content {
<<<<<<< HEAD
=======
padding: 10px 15px;
>>>>>>> github/master
.icon {
font-size: 17px;
line-height: 17px;
......@@ -45,6 +53,7 @@
color: @gray-dark;
}
}
<<<<<<< HEAD
@media (max-width: @screen-sm-max) {
.user-img, .user-icon {
......@@ -55,6 +64,8 @@
margin-left: 40px;
}
}
=======
>>>>>>> github/master
}
@media (max-width: 500px) {
......@@ -66,12 +77,21 @@
.mobile-stat {
padding-left: 0px;
<<<<<<< HEAD
=======
padding-top: 10px;
font-size: 16px;
>>>>>>> github/master
}
.card {
border-left: 4px solid #ccc;
text-align: left;
<<<<<<< HEAD
margin-top: 2px;
=======
margin-top: 10px;
>>>>>>> github/master
overflow: hidden;
height: 53px;
font-size: 12px;
......@@ -109,8 +129,61 @@
}
.category-children {
<<<<<<< HEAD
.fa-stack {
font-size: 65%;
=======
.category-children-item {
margin-right: 10px;
margin-bottom: 1px;
}
.icon {
min-width: 23px;
min-height: 23px;
font-size: 10px;
line-height: 12px;
padding: 5px;
margin-right: 5px;
}
}
[component="topic/header"] > i[component="topic/pinned"] {
color: @brand-danger;
}
}
&.ui-sortable > li .content h2 {
> [component="topic/pinned"] {
&:after {
position: absolute;
top: 0.5rem;
left: calc(62px + 2rem);
width: 4rem;
height: 3rem;
background: rgba(0, 0, 0, 0.5);
color: rgba(255, 255, 255, 0.9);
font-family: "FontAwesome";
content: "\f07d \f255";
text-align: center;
font-size: 1.5rem;
padding-top: 0.66rem;
cursor: move;
opacity: 0;
-webkit-transition: opacity 100ms linear;
-moz-transition: opacity 100ms linear;
-ms-transition: opacity 100ms linear;
-o-transition: opacity 100ms linear;
transition: opacity 100ms linear;
}
}
&:hover {
> [component="topic/pinned"] {
&:after {
opacity: 1;
}
>>>>>>> github/master
}
}
}
......@@ -182,7 +255,11 @@
.stats {
font-size: 20px;
text-align: center;
<<<<<<< HEAD
margin-top: 7px;
=======
margin-top: 10px;
>>>>>>> github/master
line-height: 22px;
small {
......
......@@ -2,6 +2,10 @@
.topic-list {
margin-top: 10px;
<<<<<<< HEAD
=======
overflow: visible;
>>>>>>> github/master
}
> ul {
......@@ -14,7 +18,11 @@
}
h2 a {
<<<<<<< HEAD
color: @gray;
=======
color: @text-muted;
>>>>>>> github/master
}
}
......@@ -23,10 +31,15 @@
opacity: 0.30;
}
<<<<<<< HEAD
&.pinned {
[component="topic/pinned"] {
cursor: move;
}
=======
&.scheduled {
opacity: 0.7;
>>>>>>> github/master
}
.select {
......@@ -39,17 +52,30 @@
}
.fa-check {
<<<<<<< HEAD
padding: 14px;
=======
padding: 14.5px; /* 14.5*2 + 15 + 2px border = 46px */
>>>>>>> github/master
border-radius: 50%;
position: absolute;
font-size: 15px;
opacity: 0;
top: 0px;
left: 0px;
<<<<<<< HEAD
=======
border: 1px solid transparent;
background: white;
width: 100%;
height: 100%;
padding: 14px;
>>>>>>> github/master
&:before {
.pointer;
}
<<<<<<< HEAD
@media (max-width: @screen-sm-max) {
padding: 7px;
......@@ -61,25 +87,52 @@
}
.fa-check, .user-img, .user-icon {
=======
}
.avatar {
opacity: 1;
}
.fa-check, .avatar {
>>>>>>> github/master
.transition(.2s ease-in-out all);
}
float: left;
}
<<<<<<< HEAD
.avatar .select:hover {
.user-img, .user-icon {
=======
.avatar .select {
.fa-check {
border: 1px solid @brand-success;
color: @brand-success;
}
}
.avatar .select:hover {
.avatar {
>>>>>>> github/master
opacity: 0;
}
.fa-check {
<<<<<<< HEAD
border: 1px solid @brand-primary;
color: @brand-primary;
=======
border: 1px solid @brand-success;
color: @brand-success;
>>>>>>> github/master
opacity: 1;
}
}
&.selected {
<<<<<<< HEAD
.select .user-img, .select .user-icon {
opacity: 0;
}
......@@ -100,10 +153,36 @@
padding: 5px;
white-space: nowrap;
}
=======
.select .avatar {
opacity: 0;
}
.avatar .select {
.fa-check {
opacity: 1;
background-color: @brand-success;
border: 1px solid @brand-success;