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.

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

Jump to bottom

New tooltip replacing #6050 #8150

Closed
wants to merge 5 commits into from
Closed

New tooltip replacing #6050 #8150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
97c092b
New tooltip replacing #6050
infograf768 Oct 25, 2015
f02d908
Tests correction. Thanks Michael
infograf768 Oct 25, 2015
d7ddc75
completing htmlspecialchars
infograf768 Oct 26, 2015
142ce1e
using ENT_QUOTES
infograf768 Oct 26, 2015
796cea4
Implementing for Hathor, Beez and Protostar
infograf768 Oct 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
84 changes: 64 additions & 20 deletions administrator/templates/hathor/css/template.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3679,6 +3679,9 @@ table.adminlist .item-associations li a {
line-height: 1.4;
opacity: 0;
filter: alpha(opacity=0);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.tooltip.in {
opacity: 0.8;
Expand All @@ -3703,10 +3706,10 @@ table.adminlist .item-associations li a {
.tooltip-inner {
max-width: 200px;
padding: 8px;
color: #ffffff;
color: #111;
text-align: center;
text-decoration: none;
background-color: #000000;
background-color: #fff;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
Expand All @@ -3723,42 +3726,28 @@ table.adminlist .item-associations li a {
left: 50%;
margin-left: -5px;
border-width: 5px 5px 0;
border-top-color: #000000;
border-top-color: #aaa;
}
.tooltip.right .tooltip-arrow {
top: 50%;
left: 0;
margin-top: -5px;
border-width: 5px 5px 5px 0;
border-right-color: #000000;
border-right-color: #aaa;
}
.tooltip.left .tooltip-arrow {
top: 50%;
right: 0;
margin-top: -5px;
border-width: 5px 0 5px 5px;
border-left-color: #000000;
border-left-color: #aaa;
}
.tooltip.bottom .tooltip-arrow {
top: 0;
left: 50%;
margin-left: -5px;
border-width: 0 5px 5px;
border-bottom-color: #000000;
}
.tooltip {
max-width: 400px;
}
.tooltip-inner {
max-width: none;
text-align: left;
text-shadow: none;
}
th .tooltip-inner {
font-weight: normal;
}
.tooltip.hasimage {
opacity: 1;
border-bottom-color: #aaa;
}
fieldset.panelform .tooltip img {
float: none;
Expand Down Expand Up @@ -3786,3 +3775,58 @@ div.toggle-editor {
.muted {
color: #999;
}
.tooltip {
max-width: 400px;
opacity: 0;
filter: alpha(opacity=0);
-webkit-box-shadow: 0 0 5px rgba(0,0,0,0.3);
-moz-box-shadow: 0 0 5px rgba(0,0,0,0.3);
box-shadow: 0 0 5px rgba(0,0,0,0.3);
}
.tooltip.in {
opacity: 1;
filter: alpha(opacity=100);
}
.tooltip-inner {
max-width: none;
text-shadow: none;
text-align: left;
background-color: #fff;
padding: 6px 8px;
font-size: 13px;
border: 1px solid #aaa;
}
.tooltip-arrow {
margin-bottom: -5px;
}
.tooltip.top {
padding: 0 0;
}
.tooltip-inner .tooltip-title {
display: block;
margin: -6px -8px -12px;
padding: 6px 10px;
font-weight: bold;
background: #f5f5f5;
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
border-radius: 4px 4px 0 0;
}
.tooltip.top .tooltip-arrow {
border-top-color: #aaa;
}
.tooltip.right .tooltip-arrow {
border-right-color: #aaa;
}
.tooltip.left .tooltip-arrow {
border-left-color: #aaa;
}
.tooltip.bottom .tooltip-arrow {
border-bottom-color: #aaa;
}
th .tooltip-inner {
font-weight: normal;
}
.tooltip.hasimage {
opacity: 1;
}
7 changes: 4 additions & 3 deletions administrator/templates/hathor/less/hathor_variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,11 @@

// Tooltips and popovers
// -------------------------
@tooltipColor: @white;
@tooltipBackground: @black;
@tooltipColor: #111;
@tooltipBackground: #fff;
@tooltipArrowWidth: 5px;
@tooltipArrowColor: @tooltipBackground;
@tooltipArrowColor: #aaa;
@tableBackgroundHover: #f5f5f5;

@popoverBackground: @white;
@popoverArrowWidth: 10px;
Expand Down
72 changes: 58 additions & 14 deletions administrator/templates/hathor/less/template.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3486,20 +3486,6 @@ table.adminlist .item-associations li a {
// Bootstrap Tooltips (need to load last, something is overriding these styles in the CSS, debug later ;-) )
@import "../../../../media/jui/less/tooltip.less";

.tooltip {
max-width: 400px;
}
.tooltip-inner {
max-width: none;
text-align: left;
text-shadow: none;
}
th .tooltip-inner {
font-weight: normal;
}
.tooltip.hasimage {
opacity: 1;
}
fieldset.panelform .tooltip img {
float: none;
margin: 0;
Expand Down Expand Up @@ -3528,3 +3514,61 @@ div.toggle-editor {
.muted {
color: #999;
}

/* Tweaking of tooltips */
.tooltip {
max-width: 400px;
.opacity(0);
&.in { .opacity(100); }
.box-shadow(0 0 5px rgba(0,0,0,0.3));
}

.tooltip-inner {
max-width: none;
text-shadow: none;
text-align: left;
background-color: @tooltipBackground;
padding: 6px 8px;
font-size: @baseFontSize;
border: 1px solid #aaa;
}

.tooltip-arrow {
margin-bottom: -5px;
}

.tooltip.top {
padding: 0 0;
}

.tooltip-inner .tooltip-title {
display:block;
margin:-6px -8px -12px;
padding:6px 10px;
font-weight: bold;
background:@tableBackgroundHover;
.border-radius(@baseBorderRadius @baseBorderRadius 0 0);
}

.tooltip {
&.top .tooltip-arrow {
border-top-color: @tooltipArrowColor;
}
&.right .tooltip-arrow {
border-right-color: @tooltipArrowColor;
}
&.left .tooltip-arrow {
border-left-color: @tooltipArrowColor;
}
&.bottom .tooltip-arrow {
border-bottom-color: @tooltipArrowColor;
}
}

th .tooltip-inner {
font-weight: normal;
}

.tooltip.hasimage {
opacity: 1;
}
45 changes: 38 additions & 7 deletions administrator/templates/isis/css/template-rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3988,10 +3988,10 @@ input[type="submit"].btn.btn-mini {
.tooltip-inner {
max-width: 200px;
padding: 8px;
color: #fff;
color: #111;
text-align: center;
text-decoration: none;
background-color: #000;
background-color: #fff;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
Expand All @@ -4008,28 +4008,28 @@ input[type="submit"].btn.btn-mini {
left: 50%;
margin-left: -5px;
border-width: 5px 5px 0;
border-top-color: #000;
border-top-color: #ddd;
}
.tooltip.right .tooltip-arrow {
top: 50%;
left: 0;
margin-top: -5px;
border-width: 5px 5px 5px 0;
border-right-color: #000;
border-right-color: #ddd;
}
.tooltip.left .tooltip-arrow {
top: 50%;
right: 0;
margin-top: -5px;
border-width: 5px 0 5px 5px;
border-left-color: #000;
border-left-color: #ddd;
}
.tooltip.bottom .tooltip-arrow {
top: 0;
left: 50%;
margin-left: -5px;
border-width: 0 5px 5px;
border-bottom-color: #000;
border-bottom-color: #ddd;
}
.popover {
position: absolute;
Expand Down Expand Up @@ -7830,11 +7830,42 @@ td.nowrap.has-context {
}
.tooltip {
max-width: 400px;
max-width: 400px;
opacity: 0;
filter: alpha(opacity=0);
}
.tooltip.in {
opacity: 1;
filter: alpha(opacity=100);
}
.tooltip-inner {
max-width: none;
text-align: left;
text-shadow: none;
padding: 6px 8px;
font-size: 13px;
border: 2px solid #aaa;
}
.tooltip-inner .tooltip-title {
display: block;
margin: -6px -8px -12px;
padding: 6px 10px;
font-weight: bold;
background: #f5f5f5;
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
border-radius: 4px 4px 0 0;
}
.tooltip.top .tooltip-arrow {
border-top-color: #ddd;
}
.tooltip.right .tooltip-arrow {
border-right-color: #ddd;
}
.tooltip.left .tooltip-arrow {
border-left-color: #ddd;
}
.tooltip.bottom .tooltip-arrow {
border-bottom-color: #ddd;
}
th .tooltip-inner {
font-weight: normal;
Expand Down