Skip to content

Commit

Permalink
Fixed issue #18491: Theme editor : List of fonts and colors should be…
Browse files Browse the repository at this point in the history 
… sorted alphabetically (#2820)

Co-authored-by: lapiudevgit <devgit@lapiu.biz>
  • Loading branch information
@gabrieljenik @lapiudevgit
gabrieljenik and lapiudevgit committed Jan 4, 2023
1 parent 1c2b830 commit 607adce
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 40 deletions.
49 changes: 27 additions & 22 deletions application/config/fonts.php
View file
Expand Up @@ -17,6 +17,8 @@
if (isset($_GET['isAjax'])) {
return array();
}

// When adding new fonts, please keep fonts ordered alphabetically
$coreFonts = array(

'fontawesome' => array(
Expand All @@ -30,16 +32,6 @@
),
),

'font-roboto' => array(
'title' => 'Roboto',
'type' => 'core',
'devBaseUrl' => 'assets/fonts/',
'basePath' => 'fonts',
'css' => array(
'roboto.css',
),
),

'font-icomoon' => array(
'title' => 'IcoMoon',
'type' => 'core',
Expand All @@ -50,13 +42,13 @@
),
),

'font-noto' => array(
'title' => 'Noto',
'font-lato' => array(
'title' => 'Lato',
'type' => 'core',
'devBaseUrl' => 'assets/fonts/',
'basePath' => 'fonts',
'css' => array(
'noto.css',
'lato.css',
),
),

Expand All @@ -70,26 +62,27 @@
),
),

'font-ubuntu' => array(
'title' => 'Ubuntu',
'font-noto' => array(
'title' => 'Noto',
'type' => 'core',
'devBaseUrl' => 'assets/fonts/',
'basePath' => 'fonts',
'css' => array(
'ubuntu.css',
'noto.css',
),
),

'font-lato' => array(
'title' => 'Lato',
'font-roboto' => array(
'title' => 'Roboto',
'type' => 'core',
'devBaseUrl' => 'assets/fonts/',
'basePath' => 'fonts',
'css' => array(
'lato.css',
'roboto.css',
),
),


// see: https://www.w3schools.com/cssref/css_websafe_fonts.asp
'font-websafe' => array(
'title' => 'Websafe',
Expand All @@ -111,6 +104,16 @@
),
),

'font-source-sans-pro' => array(
'title' => 'Source Sans Pro',
'type' => 'core',
'devBaseUrl' => 'assets/fonts/',
'basePath' => 'fonts',
'css' => array(
'source-sans-pro.css',
),
),

'font-raleway' => array(
'title' => 'Raleway',
'type' => 'core',
Expand All @@ -121,15 +124,17 @@
),
),

'font-source-sans-pro' => array(
'title' => 'Source Sans Pro',
'font-ubuntu' => array(
'title' => 'Ubuntu',
'type' => 'core',
'devBaseUrl' => 'assets/fonts/',
'basePath' => 'fonts',
'css' => array(
'source-sans-pro.css',
'ubuntu.css',
),
),


);

// get user fonts configuration from /upload/fonts directory
Expand Down
24 changes: 13 additions & 11 deletions themes/survey/fruity/config.xml
View file
Expand Up @@ -85,20 +85,21 @@
<bodybackgroundcolor type="colorpicker" category="Colors" width="4" title="Background color" options="on|off" optionlabels="Yes|No">#ffffff</bodybackgroundcolor>
<fontcolor type="colorpicker" category="Colors" width="4" title="Font color" options="on|off" optionlabels="Yes|No">#444444</fontcolor>
<questionbackgroundcolor type="colorpicker" category="Colors" width="4" title="Question background color" options="on|off" optionlabels="Yes|No">#ffffff</questionbackgroundcolor>
<!-- When adding new items, please keep them ordered alphabetically -->
<checkicon type="icon" category="Colors" width="4" title="Check icon">f00c
<dropdownoptions>
<option value="f061"> <i class="fa fa-arrow-right"></i> Arrow right </option>
<option value="f069"> <i class="fa fa-asterisk"></i> Asterisk </option>
<option value="f00c"> <i class="fa fa-check"></i> Check </option>
<option value="f058"> <i class="fa fa-check-circle"></i> Check circle </option>
<option value="f14a"> <i class="fa fa-check-square"></i> Check square </option>
<option value="f138"> <i class="fa fa-chevron-circle-right"></i> Chevron circle right </option>
<option value="f111"> <i class="fa fa-circle"></i> Circle </option>
<option value="f067"> <i class="fa fa-plus"></i> Plus </option>
<option value="f1d0"> <i class="fa fa-resistance"></i> Resistance </option>
<option value="f0c8"> <i class="fa fa-square"></i> Square </option>
<option value="f005"> <i class="fa fa-star"></i> Star </option>
<option value="f00d"> <i class="fa fa-times"></i> Times </option>
<option value="f069"> <i class="fa fa-asterisk"></i> Asterisk </option>
<option value="f061"> <i class="fa fa-arrow-right"></i> Arrow right </option>
<option value="f138"> <i class="fa fa-chevron-circle-right"></i> Chevron circle right </option>
<option value="f1d0"> <i class="fa fa-resistance"></i> Resistance </option>
</dropdownoptions>
</checkicon>
<!-- images -->
Expand Down Expand Up @@ -657,21 +658,22 @@
</dropdownoptions>
</radioanimation>
<radioanimationduration type="duration" category="Animations" width="2" title="Duration" parent="animateradio">500</radioanimationduration>
<!-- fonts -->
<!-- fonts -->
<!-- When adding new items, please keep them ordered alphabetically -->
<font type="dropdown" category="Fonts" width="12" title="Fonts" parent="font">noto
<dropdownoptions>
<optgroup label="User browser">
<option class="font-georgia " value="georgia" data-font-package="websafe" >Georgia</option>
<option class="font-palatino " value="palatino" data-font-package="websafe" >Palatino Linotype</option>
<option class="font-times_new_roman " value="times_new_roman" data-font-package="websafe" >Times New Roman</option>
<option class="font-arial " value="arial" data-font-package="websafe" >Arial</option>
<option class="font-arial_black " value="arial_black" data-font-package="websafe" >Arial Black</option>
<option class="font-comic_sans " value="comic_sans" data-font-package="websafe" >Comic Sans</option>
<option class="font-impact " value="impact" data-font-package="websafe" >Impact</option>
<option class="font-lucida_sans " value="lucida_sans" data-font-package="websafe" >Lucida Sans</option>
<option class="font-trebuchet " value="trebuchet" data-font-package="websafe" >Trebuchet</option>
<option class="font-courier " value="courier" data-font-package="websafe" >Courier New</option>
<option class="font-georgia " value="georgia" data-font-package="websafe" >Georgia</option>
<option class="font-impact " value="impact" data-font-package="websafe" >Impact</option>
<option class="font-lucida_console " value="lucida_console" data-font-package="websafe" >Lucida Console</option>
<option class="font-lucida_sans " value="lucida_sans" data-font-package="websafe" >Lucida Sans</option>
<option class="font-palatino " value="palatino" data-font-package="websafe" >Palatino Linotype</option>
<option class="font-times_new_roman " value="times_new_roman" data-font-package="websafe" >Times New Roman</option>
<option class="font-trebuchet " value="trebuchet" data-font-package="websafe" >Trebuchet</option>
</optgroup>
</dropdownoptions>
</font>
Expand Down
15 changes: 8 additions & 7 deletions themes/survey/vanilla/config.xml
View file
Expand Up @@ -68,20 +68,21 @@
<brandlogo type="buttons" category="Images" width="4" title="Logo" options="on|off" optionlabels="Yes|No">on</brandlogo>
<brandlogofile type="dropdown" category="Images" width="6" title="Logo file" parent="brandlogo">./files/logo.png</brandlogofile>
<!-- fonts -->
<!-- When adding new items, please keep fonts ordered alphabetically -->
<font type="dropdown" category="Fonts" width="12" title="Fonts" parent="font">noto
<dropdownoptions>
<optgroup label="User browser">
<option class="font-georgia " value="georgia" data-font-package="websafe" >Georgia</option>
<option class="font-palatino " value="palatino" data-font-package="websafe" >Palatino Linotype</option>
<option class="font-times_new_roman " value="times_new_roman" data-font-package="websafe" >Times New Roman</option>
<optgroup label="User browser">
<option class="font-arial " value="arial" data-font-package="websafe" >Arial</option>
<option class="font-arial_black " value="arial_black" data-font-package="websafe" >Arial Black</option>
<option class="font-comic_sans " value="comic_sans" data-font-package="websafe" >Comic Sans</option>
<option class="font-impact " value="impact" data-font-package="websafe" >Impact</option>
<option class="font-lucida_sans " value="lucida_sans" data-font-package="websafe" >Lucida Sans</option>
<option class="font-trebuchet " value="trebuchet" data-font-package="websafe" >Trebuchet</option>
<option class="font-courier " value="courier" data-font-package="websafe" >Courier New</option>
<option class="font-georgia " value="georgia" data-font-package="websafe" >Georgia</option>
<option class="font-impact " value="impact" data-font-package="websafe" >Impact</option>
<option class="font-lucida_console " value="lucida_console" data-font-package="websafe" >Lucida Console</option>
<option class="font-lucida_sans " value="lucida_sans" data-font-package="websafe" >Lucida Sans</option>
<option class="font-palatino " value="palatino" data-font-package="websafe" >Palatino Linotype</option>
<option class="font-times_new_roman " value="times_new_roman" data-font-package="websafe" >Times New Roman</option>
<option class="font-trebuchet " value="trebuchet" data-font-package="websafe" >Trebuchet</option>
</optgroup>
</dropdownoptions>
</font>
Expand Down

0 comments on commit 607adce

Please sign in to comment.