Skip to content

Commit bf8104e

Browse files
committed
BL-7198 Add Page B.Enterprise mods
* Add "BE" to template pages that require enterprise * make the page Preview a React component * get Material UI going in the add page dialog * get rid of as much Segoe UI as possible
1 parent 99f85e9 commit bf8104e

29 files changed

Lines changed: 847 additions & 1033 deletions

DistFiles/localization/en/Bloom.xlf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,6 +1605,11 @@
16051605
<source xml:lang="en">You cannot put anything in there while making an original book.</source>
16061606
<note>ID: EditTab.ReadOnlyInAuthorMode</note>
16071607
</trans-unit>
1608+
<trans-unit id="EditTab.RequiresEnterprise" sil:dynamic="true">
1609+
<source xml:lang="en">This feature requires a Bloom Enterprise subscription</source>
1610+
<note>ID: EditTab.RequiresEnterprise</note>
1611+
<note>Appears in notice (possibly obscuring other controls when they may not be used) because no Bloom Enterprise project has been selected.</note>
1612+
</trans-unit>
16081613
<trans-unit id="EditTab.SavingNotification" sil:dynamic="true">
16091614
<source xml:lang="en">Saving...</source>
16101615
<note>ID: EditTab.SavingNotification</note>
@@ -2041,11 +2046,6 @@
20412046
<source xml:lang="en">More...</source>
20422047
<note>ID: EditTab.Toolbox.More</note>
20432048
</trans-unit>
2044-
<trans-unit id="EditTab.Toolbox.RequiresEnterprise" sil:dynamic="true">
2045-
<source xml:lang="en">This feature requires Bloom Enterprise.</source>
2046-
<note>ID: EditTab.Toolbox.RequiresEnterprise</note>
2047-
<note>Appears in notice obscuring other controls when they may not be used because no Bloom Enterprise project has been selected.</note>
2048-
</trans-unit>
20492049
<trans-unit id="EditTab.Toolbox.Settings.Unlock" sil:dynamic="true">
20502050
<source xml:lang="en">Allow changes to this shellbook</source>
20512051
<note>ID: EditTab.Toolbox.Settings.Unlock</note>

src/BloomBrowserUI/bloomMaterialUITheme.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ const theme = createMuiTheme({
2424
warning: { main: "#F3AA18" }
2525
},
2626
typography: {
27-
fontSize: 12
27+
fontSize: 12,
28+
fontFamily: ["NotoSans", "Roboto", "sans-serif"]
2829
},
2930
props: {
3031
MuiLink: {

src/BloomBrowserUI/bloomUI.less

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,3 +140,15 @@ input[type="checkbox"]:indeterminate::after {
140140
-ms-user-select: text; // Edge/Internet Explorer
141141
user-select: text; // Chrome
142142
}
143+
144+
// Moved from toolbox.less to here so it can be used by templatePagePreview
145+
.enterprise-only-flag::after {
146+
content: "BE";
147+
cursor: default;
148+
color: @bloom-purple;
149+
margin-left: 4px;
150+
vertical-align: super;
151+
font-style: italic;
152+
font-weight: bold;
153+
font-size: smaller;
154+
}

src/BloomBrowserUI/bookEdit/StyleEditor/StyleEditor.less

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55

66
@styleSelectWidth: 190px;
77
#format-toolbar {
8-
* {
9-
font-family: "Segoe UI", Arial, sans-serif;
10-
}
118
h2 {
129
font-size: 10pt;
1310
}

src/BloomBrowserUI/bookEdit/css/bloomDialog.less

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@import (reference) "../../bookLayout/basePage";
2+
@import "../../bloomWebFonts.less";
23
// Common styles to be applied to htm-js-css dialogs in Bloom
34
@backgroundColorWhite: rgb(255, 255, 255);
45
@backgroundColorLight: rgb(240, 240, 240);
@@ -130,25 +131,27 @@
130131
.bloomDialogContainer .control-section {
131132
margin: 0 0 12px 0;
132133
}
133-
.bloomDialogContainer button,
134-
.bloomDialogContainer input {
135-
background: linear-gradient(@backgroundColorLight, @backgroundColorDark);
136-
}
134+
// Interferes with Material UI background-color
135+
// .bloomDialogContainer button,
136+
// .bloomDialogContainer input {
137+
// background: linear-gradient(@backgroundColorLight, @backgroundColorDark);
138+
// }
137139
.bloomDialogContainer button {
138140
.bdRounded;
139141
border: 1px solid @buttonBorder;
140142
box-shadow: 1px 2px 7px @buttonShadow;
141143
}
142-
.bloomDialogContainer button:hover,
143-
.bloomDialogContainer input:hover,
144-
.bloomDialogContainer select:hover,
145-
.bloomDialogContainer .select2-container--default:hover,
146-
.bloomDialogContainer .select2-container--focus {
147-
background: linear-gradient(
148-
@backgroundColorHoverLight,
149-
@backgroundColorHoverDark
150-
);
151-
}
144+
// Interferes with Material UI background-color
145+
// .bloomDialogContainer button:hover,
146+
// .bloomDialogContainer input:hover,
147+
// .bloomDialogContainer select:hover,
148+
// .bloomDialogContainer .select2-container--default:hover,
149+
// .bloomDialogContainer .select2-container--focus {
150+
// background: linear-gradient(
151+
// @backgroundColorHoverLight,
152+
// @backgroundColorHoverDark
153+
// );
154+
// }
152155
.bloomDialogContainer button[disabled] {
153156
border: 1px solid @disabledText;
154157
background: @backgroundColorLight;
@@ -170,7 +173,7 @@
170173
z-index: @dialogZindex;
171174
position: absolute;
172175
line-height: 1.8;
173-
font-family: Segoe UI, Open Sans, Arial, sans-serif;
176+
font-family: @UIFontStack;
174177
}
175178
.bloomDialogContainer .bloomDialogTitleBar {
176179
background-color: @backgroundColorTitleBar;
@@ -185,7 +188,6 @@
185188
.bloomDialogContainer .bloomDialogMainPage {
186189
background: @backgroundColorWhite;
187190
margin-left: 1em;
188-
font-family: Segoe UI, Open Sans, Arial, sans-serif;
189191
font-size: 10pt;
190192
}
191193

src/BloomBrowserUI/bookEdit/css/editMode.less

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ div.bloom-imageContainer {
7777
left: 5mm;
7878
top: @PageLabelVerticalDisplacement;
7979
float: left;
80-
font-family: "Segoe UI", "Open Sans", Arial, sans-serif;
8180
&[contenteditable="true"] {
8281
color: @ControlColor;
8382
padding: 0 2px;
@@ -499,7 +498,6 @@ div.bloom-editable.Heading2-style {
499498
/*Same grey color as pageLabel*/
500499
color: rgba(0, 0, 0, 0.2);
501500
font-size: small;
502-
font-family: Arial, sans-serif; /* Arial matches .qtip-content */
503501
font-style: normal;
504502
font-weight: normal;
505503
line-height: 1; //else it will draw up in the box somewhere if the font is large

src/BloomBrowserUI/bookEdit/css/editPaneGlobal.less

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
@import "../../bloomWebFonts.less";
2-
3-
/* Unless otherwise noted, these rules have been moved from editMode.css
1+
/* Unless otherwise noted, these rules have been moved from editMode.css
42
BODY is not within the scoped css DIV */
53

64
body {
@@ -18,11 +16,6 @@ To handling the mis-match.*/
1816
z-index: 20000;
1917
}
2018

21-
/* Qtip won't work if these rules are inside the scoped DIV */
22-
.qtip-content {
23-
font-family: @UIFontStack; // for xmatter field definition bubbles
24-
}
25-
2619
div.ui-tooltip-title {
2720
text-align: justify;
2821
margin-left: -9px;

src/BloomBrowserUI/bookEdit/css/origami.less

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
// origamiEditing.less. The initial goal of splitting them up was to avoid
77
// getting the origami editing behaviors while reading in BloomReader.
88
@import (inline) "../../lib/split-pane/split-pane.css";
9-
@import (reference) "../../bloomUI.less";
9+
@import "../../bloomUI.less";
1010

1111
@flowerPetalGrey: #7e7e7e; // shouldn't this just be @bloom-gray?
1212
@inactiveColor: @bloom-buff;
13-
@font: "Segoe UI", "Open Sans", Arial, sans-serif;
1413

1514
.origami-ui {
1615
visibility: hidden;
17-
font-family: @font;
16+
font-family: @UIFontStack;
1817
}
1918
.origami-layout-mode .origami-ui {
2019
visibility: visible;

src/BloomBrowserUI/bookEdit/css/origamiEditing.less

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
@DarkSwitch: @bloom-panelBackground;
1111
@ActiveSwitchColor: @ControlColor;
1212

13-
@font: "Segoe UI", "Open Sans", Arial, sans-serif;
14-
1513
@ToggleRightOffset: 19px;
1614
@ToggleVerticalOffset: -30px;
1715
@TogglePartsRadius: 8px;
@@ -101,7 +99,6 @@
10199
top: @ToggleVerticalOffset;
102100
line-height: 1em;
103101
color: @DisabledColor;
104-
font-family: @font;
105102
div {
106103
color: @ActiveSwitchColor;
107104
}

src/BloomBrowserUI/bookEdit/pageThumbnailList/pageThumbnailList.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ body > #menuIconHolder {
238238
}
239239

240240
#toast-container {
241-
font-family: "Segoe UI", "sans-serif";
241+
font-family: @UIFontStack;
242242
font-size: 9pt;
243243
}
244244

0 commit comments

Comments
 (0)