Skip to content

Commit da5127a

Browse files
serikjensenChris Hart
authored andcommitted
Custom help menu name should allow 30 characters
Fixes CNVS-32728 Test Plan: - Navigate to the custom help link settings in Account Settings and perform the following in all supported browsers (especially Safari and Firefox) - Enter a help menu name that exceeds 30 characters - An error message should appear by the text input explaining that the help menu name is too long - Enter a long help menu name (around 25-30 characters) - The text in the global nav should wrap to the next line and should not overflow out of the global nav or be cut off Change-Id: I124a0be22d07ac57777faa3c4f7aace62ef92c17 Reviewed-on: https://gerrit.instructure.com/93602 Tested-by: Jenkins Reviewed-by: Chris Hart <chart@instructure.com> QA-Review: Pierce Arner <pierce@instructure.com> Product-Review: Chris Hart <chart@instructure.com>
1 parent 4a15ee5 commit da5127a

2 files changed

Lines changed: 11 additions & 15 deletions

File tree

app/stylesheets/base/_ic_app_header.scss

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ $ic-tooltip-arrow-size: 0.375rem;
3232
width: $ic-header-primary-width - 30;
3333
z-index: 100;
3434
background-color: $ic-brand-global-nav-bgd;
35-
36-
body.primary-nav-expanded & {
37-
width: $ic-header-primary-width;
38-
}
3935
}
4036

4137
.ic-app-header__main-navigation {
@@ -233,16 +229,9 @@ button.ic-app-header__menu-list-link {
233229
line-height: 1.8rem;
234230
margin-top: -0.9rem;
235231
@include fontSize($ic-font-size--xsmall);
236-
white-space: nowrap;
237232
border-radius: $ic-border-radius / 2;
238-
239-
body:not(.primary-nav-expanded) & {
240-
color: $ic-color-light;
241-
}
242-
243-
body.primary-nav-expanded & {
244-
color: $ic-brand-global-nav-menu-item__text-color;
245-
}
233+
color: $ic-color-light;
234+
white-space: nowrap;
246235

247236
// this class is added after a 1s delay because the
248237
// transitions look weird when the nav is being closed
@@ -331,7 +320,9 @@ button.ic-app-header__menu-list-link {
331320

332321
// stuff that changes when the nav is expanded
333322
body.primary-nav-expanded {
334-
.ic-app-header__primary {
323+
324+
.ic-app-header {
325+
width: $ic-header-primary-width;
335326
overflow-y: auto;
336327
-ms-overflow-style: none; // IE11 and below was throwing on scrollbars no matter if needed or not
337328
}
@@ -382,6 +373,11 @@ body.primary-nav-expanded {
382373
margin: $ic-sp/4 0 0;
383374
padding: 0;
384375
background: transparent;
376+
color: $ic-brand-global-nav-menu-item__text-color;
377+
white-space: normal;
378+
word-break: break-all;
379+
padding-left: 0.25rem;
380+
padding-right: 0.25rem;
385381

386382
&::after {
387383
display: none;

public/javascripts/account_settings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ define([
8181
required: ['help_link_name'],
8282
property_validations: {
8383
'help_link_name': function(value){
84-
if (value && value.length > 12) { return I18n.t("help_menu_name_too_long", "Help menu name is too long")}
84+
if (value && value.length > 30) { return I18n.t("help_menu_name_too_long", "Help menu name is too long")}
8585
}
8686
}
8787
}

0 commit comments

Comments
 (0)