Commit 6ef7c9ae authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells

Regression fixes (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Id31eebf3d4b066091bce3e1c7398f9848bc75095
parent 3c46c68d
......@@ -62,8 +62,8 @@ function getadminfiles() {
function displaymenuitems(itemlist) {
var rows = map(formatrow,itemlist);
var form = FORM({'id':'form','method':'post','enctype':'multipart/form-data',
'encoding':'multipart/form-data'},
TABLE({'class':'nohead table table-striped'},TBODY(null,[thead,rows,addform()])));
'encoding':'multipart/form-data', 'name':'linksandresourcesform'},
TABLE({'class':'nohead table table-striped'},THEAD(null,[thead]), TBODY(null,[rows,addform()])));
replaceChildNodes($('menuitemlist'),form);
}
......@@ -72,17 +72,18 @@ function formatrow (item) {
// item has id, type, name, link, linkedto
var type = eval(item.type);
var linkedto = A({'href':item.linkedto},item.linktext);
var edit = INPUT({'type':'button','class':'button','value':{$getstring['edit']}});
var edit = BUTTON({'type':'button','class':'button btn btn-default btn-sm'}, SPAN({'class':'icon icon-lg icon-pencil prs'}), {$getstring['edit']});
connect(edit, 'onclick', function () { edititem(item); });
var del = INPUT({'type':'button','class':'button','value':{$getstring['delete']}});
var del = BUTTON({'type':'button','class':'button btn btn-default btn-sm'}, SPAN({'class':'icon icon-lg icon-times text-danger prs'}), {$getstring['delete']});
connect(del, 'onclick', function () { delitem(item.id); });
var buttonGroup = SPAN({'class':'btn-group'}, edit, del);
var cells = map(
partial(TD,null),
[
type,
item.name,
linkedto,
[edit,del,contextualHelpIcon(null, null, 'core', 'admin', null, 'adminmenuedit')]
[buttonGroup,contextualHelpIcon('linksandresourcesform', null, 'core', 'admin', null, 'adminmenuedit')]
]
);
return TR({'id':'menuitem_'+item.id},cells);
......@@ -100,12 +101,12 @@ function addform(type) {
function editform(item) {
// item has id, type, name, link, linkedto
// The form has two radio buttons to select the type, external link or admin file
var elink = INPUT({'type':'radio','class':'radio','name':'type'+item.id,'id':'type_'+item.id+'_externallink','value':'externallink'});
var afile = INPUT({'type':'radio','class':'radio','name':'type'+item.id,'id':'type_'+item.id+'_sitefile','value':'sitefile'});
var elink = INPUT({'type':'radio','class':'radio with-label','name':'type'+item.id,'id':'type_'+item.id+'_externallink','value':'externallink'});
var afile = INPUT({'type':'radio','class':'radio with-label','name':'type'+item.id,'id':'type_'+item.id+'_sitefile','value':'sitefile'});
// Either a save, a cancel button, or both.
var savecancel = [];
var save = INPUT({'type':'button','class':'button'});
var save = BUTTON({'type':'button','class':'button btn btn-default btn-sm'}, SPAN({'class':'icon icon-plus-circle icon-lg text-success'}));
connect(save, 'onclick', function () { saveitem(item.id); });
// The link field will be a text box or a select in the case of an admin file.
......@@ -130,7 +131,7 @@ function editform(item) {
// The save button says 'update' and there's a cancel button.
var rowtype = 'edit';
setNodeAttribute(save,'value',{$getstring['update']});
var cancel = INPUT({'type':'button','class':'button','value':{$getstring['cancel']}});
var cancel = BUTTON({'type':'button','class':'button btn-sm btn btn-link'}, {$getstring['cancel']});
connect(cancel, 'onclick', closeopenedits);
savecancel = [save,cancel];
connect(elink, 'onclick', function () { changeeditform(item,'externallink'); });
......@@ -138,7 +139,7 @@ function editform(item) {
}
// A text field for the name
var name = SPAN(null,LABEL({'for':'name'+item.id,'class':'accessible-hidden'},$namelabel),INPUT({'type':'text','class':'text','id':'name'+item.id,'value':item.name}));
var name = SPAN(null,LABEL({'for':'name'+item.id,'class':'sr-only'},$namelabel),INPUT({'type':'text','class':'text form-control input-sm','id':'name'+item.id,'value':item.name}));
if (item.type == 'sitefile') {
if (adminfiles == null) {
......@@ -149,7 +150,7 @@ function editform(item) {
else {
// Select the currently selected file.
linkedtoselect = SELECT({'id':'linkedto'+item.id});
linkedto = SPAN(null,LABEL({'for':'linkedto'+item.id,'class':'accessible-hidden'},$linkedtolabel), linkedtoselect);
linkedto = SPAN(null,LABEL({'for':'linkedto'+item.id,'class':'sr-only'},$linkedtolabel), linkedtoselect);
for (var i = 0; i < adminfiles.length; i++) {
if (item.file == adminfiles[i].id) {
appendChildNodes(linkedtoselect, OPTION({'value':adminfiles[i].id, 'selected':true}, adminfiles[i].name));
......@@ -162,12 +163,12 @@ function editform(item) {
setNodeAttribute(afile,'checked',true);
}
else { // type = externallist
linkedto = SPAN(null,LABEL({'for':'linkedto'+item.id,'class':'accessible-hidden'},$linkedtolabel),
INPUT({'type':'text','class':'text','id':'linkedto'+item.id,'value':item.linkedto}));
linkedto = SPAN(null,LABEL({'for':'linkedto'+item.id,'class':'sr-only'},$linkedtolabel),
INPUT({'type':'text','class':'text form-control input-sm','id':'linkedto'+item.id,'value':item.linkedto}));
setNodeAttribute(elink,'checked',true);
}
var radios = [DIV(null, LABEL({'for':'type_'+item.id+'_externallink'},elink,{$getstring['externallink']}), contextualHelpIcon(null, null, 'core', 'admin', null, 'adminexternallink')),
DIV(null, LABEL({'for':'type_'+item.id+'_sitefile'},afile,{$getstring['sitefile']}), contextualHelpIcon(null, null, 'core', 'admin', null, 'adminsitefile'))];
var radios = [DIV({'class' : 'radio'}, elink, LABEL({'for':'type_'+item.id+'_externallink'}, {$getstring['externallink']}), contextualHelpIcon('linksandresourcesform', 'elink', 'core', 'admin', null, 'adminexternallink')),
DIV({'class' : 'radio'}, afile, LABEL({'for':'type_'+item.id+'_sitefile'}, {$getstring['sitefile']}),contextualHelpIcon('linksandresourcesform', 'afile', 'core', 'admin', null, 'adminsitefile'))];
var row = TR({'id':'row'+item.id, 'class':rowtype},
map(partial(TD,null),[radios,name,linkedto,savecancel]));
return row;
......
......@@ -122,8 +122,7 @@ $elements = array();
$elements['membership'] = array(
'type' => 'html',
'title' => get_string('Membership', 'group'),
'value' => '',
'value' => '<h4 class="mb0">' . get_string('Membership', 'group') . '</h4>',
);
$cancreatecontrolled = $USER->get('admin') || $USER->get('staff')
......@@ -210,8 +209,7 @@ $elements['suggestfriends'] = array(
$elements['pages'] = array(
'type' => 'html',
'title' => get_string('views'),
'value' => '',
'value' => '<h4 class="mb0">' . get_string('views') . '</h4>',
);
$elements['editroles'] = array(
......@@ -265,8 +263,7 @@ $ignorepublic = !$publicallowed || (isset($publicparam) && $publicparam === 0);
if ($cancreatecontrolled || !$ignorepublic) {
$elements['visibility'] = array(
'type' => 'html',
'title' => get_string('Visibility'),
'value' => '',
'value' => '<h4 class="mb0">' .get_string('Visibility') . '</h4>',
);
}
......@@ -324,15 +321,14 @@ $elements['groupparticipationreports'] = array(
$elements['editability'] = array(
'type' => 'html',
'title' => get_string('editability', 'group'),
'value' => '',
'value' => '<h4 class="mb0">' . get_string('editability', 'group') . '</h4>',
);
$currentdate = getdate();
$elements['editwindowstart'] = array (
'type' => 'date',
'class' => 'five-across',
'class' => 'five-across hide-label',
'title' => get_string('windowstart', 'group'),
'defaultvalue' => $group_data->editwindowstart,
'description' => get_string('windowstartdesc', 'group'),
......@@ -343,7 +339,7 @@ $elements['editwindowstart'] = array (
$elements['editwindowend'] = array (
'type' => 'date',
'class' => 'five-across',
'class' => 'five-across hide-label',
'title' => get_string('windowend', 'group'),
'defaultvalue' => $group_data->editwindowend,
'description' => get_string('windowenddesc', 'group'),
......@@ -354,8 +350,7 @@ $elements['editwindowend'] = array (
$elements['general'] = array(
'type' => 'html',
'title' => get_string('general'),
'value' => '',
'value' => '<h4 class="mb0">' . get_string('general') . '</h4>',
);
if (get_config('allowgroupcategories')
......@@ -535,72 +530,72 @@ function editgroup_submit(Pieform $form, $values) {
}
$js = '
$j(function() {
$j("#editgroup_controlled").click(function() {
jQuery(function($) {
$("#editgroup_controlled").click(function() {
if (this.checked) {
$j("#editgroup_request").removeAttr("disabled");
$j("#editgroup_open").removeAttr("checked");
if (!$j("#editgroup_request").attr("checked")) {
$j("#editgroup_suggestfriends").removeAttr("checked");
$j("#editgroup_suggestfriends").attr("disabled", true);
$("#editgroup_request").removeAttr("disabled");
$("#editgroup_open").removeAttr("checked");
if (!$("#editgroup_request").attr("checked")) {
$("#editgroup_suggestfriends").removeAttr("checked");
$("#editgroup_suggestfriends").attr("disabled", true);
}
}
});
$j("#editgroup_open").click(function() {
$("#editgroup_open").click(function() {
if (this.checked) {
$j("#editgroup_controlled").removeAttr("checked");
$j("#editgroup_request").removeAttr("checked");
$j("#editgroup_request").attr("disabled", true);
$j("#editgroup_suggestfriends").removeAttr("disabled");
$("#editgroup_controlled").removeAttr("checked");
$("#editgroup_request").removeAttr("checked");
$("#editgroup_request").attr("disabled", true);
$("#editgroup_suggestfriends").removeAttr("disabled");
}
else {
$j("#editgroup_request").removeAttr("disabled");
if (!$j("#editgroup_request").attr("checked")) {
$j("#editgroup_suggestfriends").removeAttr("checked");
$j("#editgroup_suggestfriends").attr("disabled", true);
$("#editgroup_request").removeAttr("disabled");
if (!$("#editgroup_request").attr("checked")) {
$("#editgroup_suggestfriends").removeAttr("checked");
$("#editgroup_suggestfriends").attr("disabled", true);
}
}
});
$j("#editgroup_request").click(function() {
$("#editgroup_request").click(function() {
if (this.checked) {
$j("#editgroup_suggestfriends").removeAttr("disabled");
$("#editgroup_suggestfriends").removeAttr("disabled");
}
else {
if (!$j("#editgroup_open").attr("checked")) {
$j("#editgroup_suggestfriends").removeAttr("checked");
$j("#editgroup_suggestfriends").attr("disabled", true);
if (!$("#editgroup_open").attr("checked")) {
$("#editgroup_suggestfriends").removeAttr("checked");
$("#editgroup_suggestfriends").attr("disabled", true);
}
}
});
$j("#editgroup_invitefriends").click(function() {
$("#editgroup_invitefriends").click(function() {
if (this.checked) {
if ($j("#editgroup_request").attr("checked") || $j("#editgroup_open").attr("checked")) {
$j("#editgroup_suggestfriends").removeAttr("disabled");
if ($("#editgroup_request").attr("checked") || $("#editgroup_open").attr("checked")) {
$("#editgroup_suggestfriends").removeAttr("disabled");
}
$j("#editgroup_suggestfriends").removeAttr("checked");
$("#editgroup_suggestfriends").removeAttr("checked");
}
});
$j("#editgroup_suggestfriends").click(function() {
$("#editgroup_suggestfriends").click(function() {
if (this.checked) {
$j("#editgroup_invitefriends").removeAttr("checked");
$("#editgroup_invitefriends").removeAttr("checked");
}
});
$j("#editgroup_hidemembersfrommembers").click(function() {
$("#editgroup_hidemembersfrommembers").click(function() {
if (this.checked) {
$j("#editgroup_hidemembers").attr("checked", true);
$j("#editgroup_hidemembers").attr("disabled", true);
$("#editgroup_hidemembers").attr("checked", true);
$("#editgroup_hidemembers").attr("disabled", true);
}
else {
$j("#editgroup_hidemembers").removeAttr("disabled");
$("#editgroup_hidemembers").removeAttr("disabled");
}
});
$j("#editgroup_submittableto").click(function() {
$("#editgroup_submittableto").click(function() {
if (this.checked) {
$j("#editgroup_allowarchives").attr("disabled", false);
$("#editgroup_allowarchives").attr("disabled", false);
}
else {
$j("#editgroup_allowarchives").removeAttr("checked");
$j("#editgroup_allowarchives").attr("disabled", true);
$("#editgroup_allowarchives").removeAttr("checked");
$("#editgroup_allowarchives").attr("disabled", true);
}
});
});
......
......@@ -118,7 +118,7 @@ $searchform = pieform(array(
),
'sortoption' => array(
'type' => 'select',
'class' => 'sortoption input-small mrl',
'class' => 'sortoption input-small',
'title' => get_string('sortedby'),
'multiple' => false,
'size' => 1,
......
......@@ -457,8 +457,8 @@ badIE = false;
function contextualHelpIcon(formName, helpName, pluginType, pluginName, page, section) {
var link = A(
{'href': null},
IMG({'alt': get_string('Help'), 'src': get_themeurl('images/help.png')})
{'href': '#'},
SPAN({'alt': get_string('Help'), 'class': 'icon icon-info-circle'})
);
connect(link, 'onclick', function (e) {
e.stop();
......@@ -518,7 +518,7 @@ function contextualHelp(formName, helpName, pluginType, pluginName, page, sectio
'class': 'contextualHelp hidden',
'role' : 'dialog'
},
IMG({'src': config.theme['images/loading.gif']})
SPAN({'class': 'icon icon-spinner icon-pulse'})
);
var parent = ref.parentNode;
var inserted = false;
......
......@@ -78,7 +78,7 @@ EOF;
// Year
$value = pieform_element_date_get_timeperiod_value('year', $element['minyear'], $element['maxyear'], $element, $form);
$year = '<label for="' . $name . '_year" class="accessible-hidden sr-only">' . get_string('year') . '</label>';
$year .= '<select name="' . $name . '_year" id="' . $name . '_year"'
$year .= '<span class="picker"><select class="form-control select" name="' . $name . '_year" id="' . $name . '_year"'
. (!$required && !$dateisset ? ' disabled="disabled"' : '')
. ' tabindex="' . Pieform::hsc($element['tabindex']) . '"';
if (isset($element['description'])) {
......@@ -88,12 +88,12 @@ EOF;
for ($i = $element['minyear']; $i <= $element['maxyear']; $i++) {
$year .= "\t<option value=\"$i\"" . (($value == $i) ? ' selected="selected"' : '') . ">$i</option>\n";
}
$year .= "</select>\n";
$year .= "</select></span>\n";
// Month
$value = pieform_element_date_get_timeperiod_value('month', 1, 12, $element, $form);
$month = '<label for="' . $name . '_month" class="accessible-hidden sr-only">' . get_string('month') . '</label>';
$month .= '<select name="' . $name . '_month" id="' . $name . '_month"'
$month .= '<span class="picker"><select class="form-control select" name="' . $name . '_month" id="' . $name . '_month"'
. (!$required && !$dateisset ? ' disabled="disabled"' : '')
. ' tabindex="' . Pieform::hsc($element['tabindex']) . '"';
if (isset($element['description'])) {
......@@ -104,12 +104,12 @@ EOF;
for ($i = 1; $i <= 12; $i++) {
$month .= "\t<option value=\"$i\"" . (($value == $i) ? ' selected="selected"' : '') . '>' . $monthnames[$i-1] . "</option>\n";
}
$month .= "</select>\n";
$month .= "</select></span>\n";
// Day
$value = pieform_element_date_get_timeperiod_value('day', 1, 31, $element, $form);
$day = '<label for="' . $name . '_day" class="accessible-hidden sr-only">' . get_string('day') . '</label>';
$day .= '<select name="' . $name . '_day" id="' . $name . '_day"'
$day .= '<span class="picker"><select class="form-control select" name="' . $name . '_day" id="' . $name . '_day"'
. (!$required && !$dateisset ? ' disabled="disabled"' : '')
. ' tabindex="' . Pieform::hsc($element['tabindex']) . '"';
if (isset($element['description'])) {
......@@ -119,12 +119,12 @@ EOF;
for ($i = 1; $i <= 31; $i++) {
$day .= "\t<option value=\"$i\"" . (($value == $i) ? ' selected="selected"' : '') . ">$i</option>\n";
}
$day .= '</select>';
$day .= '</select></span>';
if ($showtime) {
// Hour
$value = pieform_element_date_get_timeperiod_value('hour', 0, 23, $element, $form);
$hour = '<select name="' . $name . '_hour" id="' . $name . '_hour"'
$hour = '<span class="picker"><select class="form-control select" name="' . $name . '_hour" id="' . $name . '_hour"'
. (!$required && !$dateisset ? ' disabled="disabled"' : '')
. ' tabindex="' . Pieform::hsc($element['tabindex']) . '"';
if (isset($element['description'])) {
......@@ -134,11 +134,11 @@ EOF;
for ($i = 0; $i <= 23; $i++) {
$hour .= "\t<option value=\"$i\"" . (($value == $i) ? ' selected="selected"' : '') . ">" . sprintf('%02d', $i) . "</option>\n";
}
$hour .= '</select>';
$hour .= '</select></span>';
// Minute
$value = pieform_element_date_get_timeperiod_value('minute', 0, 59, $element, $form);
$minute = '<select name="' . $name . '_minute" id="' . $name . '_minute"'
$minute = '<span class="picker mlxs"><select class="form-control select" name="' . $name . '_minute" id="' . $name . '_minute"'
. (!$required && !$dateisset ? ' disabled="disabled"' : '')
. ' tabindex="' . Pieform::hsc($element['tabindex']) . '"';
if (isset($element['description'])) {
......@@ -148,7 +148,7 @@ EOF;
for ($i = 0; $i <= 59; $i++) {
$minute .= "\t<option value=\"$i\"" . (($value == $i) ? ' selected="selected"' : '') . ">" . sprintf('%02d', $i) . "</option>\n";
}
$minute .= '</select>';
$minute .= '</select></span>';
$at = ' ' . $form->i18n('element', 'date', 'at', $element) . ' ';
$result .= $year . $month . $day . $at . $hour . $minute;
......
......@@ -74,7 +74,7 @@ function pieform_element_expiry(Pieform $form, $element) {/*{{{*/
}
$numberinput .= (isset($element['error']) ? ' class="error"' : '') . ">\n";
$uselect = '<label for="' . $formname . '_' . $name . '_units" class="accessible-hidden sr-only">' . get_string('units', 'mahara') . '</label>';
$uselect .= '<select class="form-control" onchange="' . $name . '_change()" ';
$uselect .= '<span class="picker"><select class="form-control select" onchange="' . $name . '_change()" ';
$uselect .= 'name="' . $name . '_units" id="' . $formname . '_' . $name . '_units"' . ' tabindex="' . Pieform::hsc($element['tabindex']) . '"';
if (isset($element['description'])) {
$uselect .= ' aria-describedby="' . $form->element_descriptors($element) . '"';
......@@ -89,7 +89,7 @@ function pieform_element_expiry(Pieform $form, $element) {/*{{{*/
$uselect .= "\t<option value=\"$u\"" . (($values['units'] == $u) ? ' selected="selected"' : '') . '>'
. $form->i18n('element', 'expiry', $u, $element) . "</option>\n";
}
$uselect .= "</select>\n";
$uselect .= "</select></span>\n";
// Make sure the input is disabled if "no end date" is selected
$script = <<<EOJS
......
......@@ -3727,27 +3727,34 @@ class View {
)
)
),
'orderby' => array(
'type' => 'select',
'class' => 'input-small mrxl',
'title' => get_string('sortby'),
'options' => array('atoz' => get_string('defaultsort', 'view'),
'latestcreated' => get_string('latestcreated', 'view'),
'latestmodified' => get_string('latestmodified', 'view'),
'latestviewed' => get_string('latestviewed', 'view'),
'mostvisited' => get_string('mostvisited', 'view'),
'mostcomments' => get_string('mostcomments', 'view'),
),
'defaultvalue' => $orderby,
),
'setlimit' => array(
'type' => 'hidden',
'value' => $setlimit
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-primary mtm',
'value' => get_string('search')
'orderbygroup' => array (
'type' => 'fieldset',
'class' => 'input-group',
'elements' => array(
'orderby' => array(
'type' => 'select',
'class' => 'input-small',
'title' => get_string('sortby'),
'options' => array('atoz' => get_string('defaultsort', 'view'),
'latestcreated' => get_string('latestcreated', 'view'),
'latestmodified' => get_string('latestmodified', 'view'),
'latestviewed' => get_string('latestviewed', 'view'),
'mostvisited' => get_string('mostvisited', 'view'),
'mostcomments' => get_string('mostcomments', 'view'),
),
'defaultvalue' => $orderby,
),
'submit' => array(
'type' => 'button',
'usebuttonclass' => true,
'class' => 'btn btn-primary input-group-btn no-label',
'value' => get_string('search')
)
)
)
)
);
......
......@@ -21,11 +21,11 @@ $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
$brand-default: #ECECEC;
$brand-primary: #333;
$brand-primary: #a4056a;
$brand-success: #449D44 !default;
$brand-info: #5bc0de !default;
$brand-warning: #f0ad4e !default;
$brand-danger: #d9534f !default;
$brand-danger: #F04F50 !default;
//== Form states and alerts
//
......@@ -43,8 +43,8 @@ $state-warning-text: #8a6d3b !default;
$state-warning-bg: #fcf8e3 !default;
$state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%) !default;
$state-danger-text: #a94442 !default;
$state-danger-bg: #f2dede !default;
$state-danger-text: $brand-danger !default;
$state-danger-bg: lighten($brand-danger, 30%) !default;
$state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) !default;
......@@ -177,7 +177,7 @@ $table-border-color: #ddd !default;
$btn-font-weight: normal !default;
$btn-default-color: #333 !default;
$btn-default-bg: #EEEEEE !default;
$btn-default-bg: #F9F9F9 !default;
$btn-default-border: #ccc !default;
$btn-primary-color: #fff !default;
......@@ -413,14 +413,14 @@ $navbar-default-toggle-border-color: #ddd !default;
// Inverted navbar
// Reset inverted navbar basics
$navbar-inverse-color: #fff !default;
$navbar-inverse-bg: #333 !default;
$navbar-inverse-bg: #ddd !default;
$navbar-inverse-border: darken($navbar-inverse-bg, 5%) !default;
// Inverted navbar links
$navbar-inverse-link-color: #fff !default;
$navbar-inverse-link-color: $text-color !default;
$navbar-inverse-link-hover-color: rgba($navbar-inverse-link-color, 0.8) !default;
$navbar-inverse-link-hover-bg: rgba(darken($navbar-inverse-bg, 7%), 0.5) !default;
$navbar-inverse-link-active-color: $link-color !default;
$navbar-inverse-link-active-color: #a4056a !default;
$navbar-inverse-link-active-bg: #fff !default;
$navbar-inverse-link-disabled-color: #444 !default;
$navbar-inverse-link-disabled-bg: transparent !default;
......@@ -873,7 +873,7 @@ $blockquote-small-color: $gray-light !default;
//** Blockquote font size
$blockquote-font-size: ($font-size-base * 1.25) !default;
//** Blockquote border color
$blockquote-border-color: $mahara-green-bright !default;
$blockquote-border-color: $brand-primary !default;
//** Page header border color
$page-header-border-color: $btn-default-border !default;
//** Width of horizontal description list titles
......
// Custom component variables (non-bootstrap components)
//Arrow compoanent variables
$arrow-color: lighten(desaturate($brand-primary, 22%), 73%);
$arrow-text-color: $text-color;
$arrow-link-color: $link-color;
$arrow-color: $brand-primary;
$arrow-text-color: #fff;
$arrow-link-color: #fff;
$arrow-link-hover-color: $text-color;
$arrow-link-active-color: $text-color;
$arrow-link-active-color: $brand-primary;
// color for the secondary title in sections (cf. groups)
$section-heading-color: #999;
This diff is collapsed.
......@@ -211,7 +211,7 @@ td.btn-group {
margin-left: -7px;
}
}
.icon {
.block-icon {
vertical-align: middle;
margin-left:-2px;
font-size: 14px;
......
......@@ -15,6 +15,12 @@ span.help {
opacity:1;
}
}
.table & {
margin-top:-6px;
.icon {
font-size: 0.9em;
}
}
}
.contextualHelp {
......@@ -52,8 +58,15 @@ span.help {
background-color: $popover-title-bg;
border-bottom: 1px solid darken($popover-title-bg, 5%);
border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0;
}
}
// Needed to be more specific
table.table td .contextualHelp h3{
margin: 0 -14px 20px;
font-size: $font-size-base;
}
.form-select-filter .contextualHelp {
// top: 0 !important; //fixes a bug where the contextualhelp displays outside the top of the page. Overrides inline styles
......
......@@ -2,6 +2,10 @@
.dropdown-group {
position: relative;
.form-inline & {
margin-top: -3px;
}
&.form-group {
margin-left: 15px;
}
......@@ -28,14 +32,12 @@
.picker {
height: $input-height-base;
overflow: hidden;
width: 210px;
width: 230px;
}
.dropdown-connect {
height: $input-height-base;
position: relative;
margin-top: 24px;
float: left;
z-index: 1;
......@@ -55,7 +57,7 @@
z-index: 2;
}
select {
-webkit-appearance: none;
@include appearance(none);
background: transparent;
height: $input-height-base;
left: 0;
......@@ -76,12 +78,13 @@
}
.pieform {
.pieform,
.dropdown {
.picker {
position: relative;
background: #fff;
display: inline-block;
width: 230px;