Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introducing external js color picker plugin #369

Merged
merged 6 commits into from
Jul 17, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions default/web_tt2/css.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -2481,6 +2481,26 @@ span.fa-stack i.fa-plus-circle {
color:[% color_15 %];
}

[%# jQuery minicolors ~%]
[%# Reassign metrics by Foundation, and apply monospace font. ~%]
.minicolors-theme-default .minicolors-input {
height: 2.4375rem;
padding-left: 2.5rem; /* LTR */
font-family: monospace, serif;
}
[dir=rtl] .minicolors-theme-default .minicolors-input {
padding-left: 1px;
padding-right: 2.5rem;
}
.minicolors-theme-default .minicolors-swatch {
top: 0.5rem;
left: 0.5rem; /* LTR */
height: 1.5rem;
width: 1.5rem;
}
[dir=rtl] .minicolors-theme-default .minicolors-swatch {
right: 0.5rem;
}

[%~# 419px %]
@media screen and (min-width: 0px) and (max-width: 26.125em) {
Expand Down
4 changes: 4 additions & 0 deletions default/web_tt2/head_javascript.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,15 @@ var lang = '[% lang %]';
<script src="[% static_content_url %]/js/jquery.js?v3.2.1"></script>
<script src="[% static_content_url %]/js/jquery-migrate.js?v1.4.1"></script>
<script src="[% static_content_url %]/js/jquery-ui/jquery-ui.js?v1.12.1"></script>
[%# jqPlot ~%]
<script src="[% static_content_url %]/js/jqplot/jquery.jqplot.min.js?v1.0.8"></script>
<script src="[% static_content_url %]/js/jqplot/jqplot.categoryAxisRenderer.min.js?v1.0.8"></script>
<script src="[% static_content_url %]/js/jqplot/jqplot.barRenderer.min.js?v1.0.8"></script>
<script src="[% static_content_url %]/js/jqplot/jqplot.canvasAxisTickRenderer.min.js?v1.0.8"></script>
<script src="[% static_content_url %]/js/jqplot/jqplot.canvasTextRenderer.min.js?v1.0.8"></script>
[%# Color picker ~%]
<script src="[% static_content_url %]/js/jquery-minicolors/jquery.minicolors.min.js?v2.3.1"></script>
[%# Sympa ~%]
<script src="[% static_content_url %]/js/sympa.js?v[% version %]"></script>

[%# Foundation and other ui adaptation ~%]
Expand Down
6 changes: 4 additions & 2 deletions default/web_tt2/head_ui.tt2
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<!-- head_ui.tt2 -->
[%# Jquery-ui ~%]
<link rel="stylesheet" href="[% static_content_url %]/js/jquery-ui/jquery-ui.css?v1.12.1" />
[%# Jqplot ~%]
[%# JqPlot ~%]
<link rel="stylesheet" href="[% static_content_url %]/js/jqplot/jquery.jqplot.css?v1.0.8" />
[%# Font css ~%]
[%# Color picker ~%]
<link rel="stylesheet" href="[% static_content_url %]/js/jquery-minicolors/jquery.minicolors.css?v2.3.1">
[%# Font CSS ~%]
<link rel="stylesheet" href="[% static_content_url %]/fonts/font-awesome/css/font-awesome.css?v4.3.0" />
<link rel="stylesheet" href="[% static_content_url %]/fonts/foundation-icons/foundation-icons.css?v3.0" />
[%# Foundation ~%]
Expand Down
Loading