Skip to content

BK-2410 Toolbar mouse over covers menu items #833

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.

Sign up for GitHub

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

Merged
ride90 merged 1 commit into from
Jan 8, 2018
Merged

BK-2410 Toolbar mouse over covers menu items #833

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 10 additions & 10 deletions lib/booktype/apps/edit/templates/edit/aloha_toolbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

<div class="btn-toolbar float-left">
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm action bookundo" id="button-undo" rel="tooltip" data-placement="bottom" data-original-title="{% trans "Undo" %}"><i class="fa fa-undo"></i></button>
<button type="button" class="btn btn-default btn-sm action bookundo" id="button-undo" rel="tooltip" data-placement="bottom" data-trigger="hover" data-original-title="{% trans "Undo" %}"><i class="fa fa-undo"></i></button>
</div>

<div class="btn-group headings">
<button class="btn btn-default btn-sm currentHeading" title="{% trans "Text Heading" %}">{% trans "Nothing" %}</button>
<button class="btn btn-default btn-sm dropdown-toggle changeHeading" data-toggle="dropdown" rel="tooltip" title="" data-original-title="{% trans "Change Style" %}" data-placement="bottom" ><span class="caret"></span></button>
<button class="btn btn-default btn-sm dropdown-toggle changeHeading" data-toggle="dropdown" rel="tooltip" title="" data-trigger="hover" data-original-title="{% trans "Change Style" %}" data-placement="bottom" ><span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a data-target="#" class="action changeHeading" data-tagname="p" data-placement="bottom">{% trans "Normal Text" %}</a></li>
<li class="disabled"><a data-target="#" class="disabled action changeHeading" data-tagname="h1" data-placement="bottom">{% trans "Chapter title" %}</a></li>
Expand All @@ -26,20 +26,20 @@
</div>

<div class="btn-group fonts">
<button class="btn btn-default btn-sm dropdown-toggle font" data-toggle="dropdown" rel="tooltip" data-original-title="{% trans "Font" %}" data-placement="bottom"><i class="fa fa-font"></i></button>
<button class="btn btn-default btn-sm dropdown-toggle font" data-toggle="dropdown" rel="tooltip" data-trigger="hover" data-original-title="{% trans "Font" %}" data-placement="bottom"><i class="fa fa-font"></i></button>
<ul class="dropdown-menu font-dropdown">
</ul>
</div>

<div class="btn-group fontsize">
<button class="btn btn-default btn-sm fontSize action changeFontsize" data-fontsize="" title="{% trans "Font size" %}"></button>
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" rel="tooltip" title="" data-original-title="{% trans "Change Font size" %}" data-placement="bottom" ><span class="caret"></span></button>
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" rel="tooltip" title="" data-trigger="hover" data-original-title="{% trans "Change Font size" %}" data-placement="bottom" ><span class="caret"></span></button>
<ul class="dropdown-menu fontsize-dropdown">
</ul>
</div>

<div class="btn-group color color-picker-item">
<button class="btn btn-default btn-sm no-border" rel="tooltip" data-placement="bottom" data-original-title="Color" data-toggle="dropdown"><i class="fa fa-tint"></i></button>
<button class="btn btn-default btn-sm no-border" rel="tooltip" data-placement="bottom" data-trigger="hover" data-original-title="Color" data-toggle="dropdown"><i class="fa fa-tint"></i></button>
<div class="dropdown-menu color-picker">
<div class="colorswatches margin">
<button class="bt-color" data-color="#000000" style="background-color: #000000"></button>
Expand Down Expand Up @@ -145,14 +145,14 @@
</div>

<div class="btn-group formatting">
<button id="expand" class="btn btn-default btn-sm action aloha-dialog bold" rel="tooltip" data-placement="bottom" data-original-title="{% trans "Bold" %}"><i class="fa fa-bold"></i></button>
<button class="btn btn-default btn-sm action aloha-dialog italic" rel="tooltip" data-placement="bottom" data-original-title="{% trans "Italic" %}"><i class="fa fa-italic"></i></button>
<button class="btn btn-default btn-sm action aloha-dialog underline" rel="tooltip" data-placement="bottom" data-original-title="{% trans "Underline" %}"><i class="fa fa-underline"></i></button>
<button class="btn btn-default btn-sm action blockquote" rel="tooltip" data-placement="bottom" data-original-title="{% trans "Quote" %}"><i class="fa fa-quote-left"></i></button>
<button id="expand" class="btn btn-default btn-sm action aloha-dialog bold" rel="tooltip" data-placement="bottom" data-trigger="hover" data-original-title="{% trans "Bold" %}"><i class="fa fa-bold"></i></button>
<button class="btn btn-default btn-sm action aloha-dialog italic" rel="tooltip" data-placement="bottom" data-trigger="hover" data-original-title="{% trans "Italic" %}"><i class="fa fa-italic"></i></button>
<button class="btn btn-default btn-sm action aloha-dialog underline" rel="tooltip" data-placement="bottom" data-trigger="hover" data-original-title="{% trans "Underline" %}"><i class="fa fa-underline"></i></button>
<button class="btn btn-default btn-sm action blockquote" rel="tooltip" data-placement="bottom" data-trigger="hover" data-original-title="{% trans "Quote" %}"><i class="fa fa-quote-left"></i></button>
</div>

<div class="btn-group">
<button class="btn btn-default btn-sm no-border dropdown-toggle table-dropdown" data-toggle="dropdown" rel="tooltip" data-original-title="{% trans "Table" %}" data-placement="bottom"><i class="fa fa-table"></i></button>
<button class="btn btn-default btn-sm no-border dropdown-toggle table-dropdown" data-toggle="dropdown" rel="tooltip" data-trigger="hover" data-original-title="{% trans "Table" %}" data-placement="bottom"><i class="fa fa-table"></i></button>
<ul class="dropdown-menu pull-left table-dropdown" role="menu">
<li role="presentation" class="dropdown-header">{% trans "Insert Table" %}</li>
<li role="presentation" class="dropdown-header dropdown-header-modify">{% trans "Modify Table" %}</li>
Expand Down