Skip to content

Commit 34576eb

Browse files
committed
Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x
2 parents 56ac8ca + 72aa760 commit 34576eb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+93
-290
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
3+
* For licensing, see LICENSE.md or http://ckeditor.com/license
4+
*/
5+
6+
.cke_colordialog_colorcell {
7+
width: 12px; /* All cells have equal width which depends on parent width (in this case table parent). Width works more like max-width. */
8+
height: 14px;
9+
padding: 1px; /* Padding is replaced by border for focused cells. Prevents 'jumping' when adding borders. */
10+
}
11+
12+
.cke_colordialog_colorcell.cke_colordialog_focused_light,
13+
.cke_colordialog_colorcell.cke_colordialog_focused_dark {
14+
padding: 0; /* Shrink cell to allow 1px border indicating focus. */
15+
border: 1px dotted #000;
16+
}
17+
18+
.cke_colordialog_colorcell.cke_colordialog_focused_dark {
19+
border-color: #FFF;
20+
}

app/Resources/public/assets/ckeditor/plugins/uicolor/dialogs/uicolor.js

Lines changed: 13 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/Resources/public/assets/ckeditor/plugins/uicolor/lang/af.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
33
For licensing, see LICENSE.md or http://ckeditor.com/license
44
*/
5-
CKEDITOR.plugins.setLang("uicolor","af",{title:"UI kleur keuse",preview:"Voorskou",config:"Voeg hierdie in jou config.js lêr in",predefined:"Voordefinieerte kleur keuses"});
5+
CKEDITOR.plugins.setLang("uicolor","af",{title:"UI kleur keuse",options:"Color Options",highlight:"Highlight",selected:"Selected Color",predefined:"Voordefinieerte kleur keuses",config:"Voeg hierdie in jou config.js lêr in"});

app/Resources/public/assets/ckeditor/plugins/uicolor/lang/ar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
33
For licensing, see LICENSE.md or http://ckeditor.com/license
44
*/
5-
CKEDITOR.plugins.setLang("uicolor","ar",{title:"منتقي الألوان",preview:"معاينة مباشرة",config:"قص السطر إلى الملف config.js",predefined:"مجموعات ألوان معرفة مسبقا"});
5+
CKEDITOR.plugins.setLang("uicolor","ar",{title:"منتقي الألوان",options:"Color Options",highlight:"Highlight",selected:"Selected Color",predefined:"مجموعات ألوان معرفة مسبقا",config:"قص السطر إلى الملف config.js"});

app/Resources/public/assets/ckeditor/plugins/uicolor/lang/az.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
33
For licensing, see LICENSE.md or http://ckeditor.com/license
44
*/
5-
CKEDITOR.plugins.setLang("uicolor","az",{title:"Panellərin rəng seçimi",preview:"İnteraktiv baxış",config:"Bu sətri sizin config.js faylına əlavə edin",predefined:"Öncədən təyin edilmiş rənglərin yığımları"});
5+
CKEDITOR.plugins.setLang("uicolor","az",{title:"Panellərin rəng seçimi",options:"Color Options",highlight:"Highlight",selected:"Selected Color",predefined:"Öncədən təyin edilmiş rənglərin yığımları",config:"Bu sətri sizin config.js faylına əlavə edin"});

app/Resources/public/assets/ckeditor/plugins/uicolor/lang/bg.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
33
For licensing, see LICENSE.md or http://ckeditor.com/license
44
*/
5-
CKEDITOR.plugins.setLang("uicolor","bg",{title:"ПИ избор на цвят",preview:"Преглед",config:"Вмъкнете този низ във Вашия config.js fajl",predefined:"Предефинирани цветови палитри"});
5+
CKEDITOR.plugins.setLang("uicolor","bg",{title:"ПИ избор на цвят",options:"Color Options",highlight:"Highlight",selected:"Selected Color",predefined:"Предефинирани цветови палитри",config:"Вмъкнете този низ във Вашия config.js fajl"});

app/Resources/public/assets/ckeditor/plugins/uicolor/lang/ca.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
33
For licensing, see LICENSE.md or http://ckeditor.com/license
44
*/
5-
CKEDITOR.plugins.setLang("uicolor","ca",{title:"UI Color Picker",preview:"Vista prèvia",config:"Enganxa aquest text dins el fitxer config.js",predefined:"Conjunts de colors predefinits"});
5+
CKEDITOR.plugins.setLang("uicolor","ca",{title:"UI Color Picker",options:"Color Options",highlight:"Highlight",selected:"Selected Color",predefined:"Conjunts de colors predefinits",config:"Enganxa aquest text dins el fitxer config.js"});

app/Resources/public/assets/ckeditor/plugins/uicolor/lang/cs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
33
For licensing, see LICENSE.md or http://ckeditor.com/license
44
*/
5-
CKEDITOR.plugins.setLang("uicolor","cs",{title:"Výběr barvy rozhraní",preview:"Živý náhled",config:"Vložte tento řetězec do vašeho souboru config.js",predefined:"Přednastavené sady barev"});
5+
CKEDITOR.plugins.setLang("uicolor","cs",{title:"Výběr barvy rozhraní",options:"Color Options",highlight:"Highlight",selected:"Selected Color",predefined:"Přednastavené sady barev",config:"Vložte tento řetězec do vašeho souboru config.js"});

app/Resources/public/assets/ckeditor/plugins/uicolor/lang/cy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
33
For licensing, see LICENSE.md or http://ckeditor.com/license
44
*/
5-
CKEDITOR.plugins.setLang("uicolor","cy",{title:"Dewisydd Lliwiau'r UI",preview:"Rhagolwg Byw",config:"Gludwch y llinyn hwn i'ch ffeil config.js",predefined:"Setiau lliw wedi'u cyn-ddiffinio"});
5+
CKEDITOR.plugins.setLang("uicolor","cy",{title:"Dewisydd Lliwiau'r UI",options:"Color Options",highlight:"Highlight",selected:"Selected Color",predefined:"Setiau lliw wedi'u cyn-ddiffinio",config:"Gludwch y llinyn hwn i'ch ffeil config.js"});

app/Resources/public/assets/ckeditor/plugins/uicolor/lang/da.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
33
For licensing, see LICENSE.md or http://ckeditor.com/license
44
*/
5-
CKEDITOR.plugins.setLang("uicolor","da",{title:"Brugerflade på farvevælger",preview:"Vis liveeksempel",config:"Indsæt denne streng i din config.js fil",predefined:"Prædefinerede farveskemaer"});
5+
CKEDITOR.plugins.setLang("uicolor","da",{title:"Brugerflade på farvevælger",options:"Color Options",highlight:"Highlight",selected:"Selected Color",predefined:"Prædefinerede farveskemaer",config:"Indsæt denne streng i din config.js fil"});

0 commit comments

Comments
 (0)