Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
tenzinsamten committed Apr 24, 2024
2 parents a09a659 + d98e2d3 commit dd07ce7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions static/css/s2.css
Original file line number Diff line number Diff line change
Expand Up @@ -2312,6 +2312,10 @@ div.interfaceLinks-row a {
padding: 0;
}

span .asterisk{
color: red !important;
}

.readerPanel .readerNavTop h2 {
margin: 0;
font-weight: 400;
Expand Down
4 changes: 2 additions & 2 deletions static/js/AdminEditor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const options_for_form = {
// "Picture": {label: "Picture", field: "picture", placeholder: "Add a picture.", type: "picture"},
"English Caption": {label: "English Caption", field: "enImgCaption", placeholder: "Add a caption for topic picture"},
"Hebrew Caption": {label: "Hebrew Caption", field: "heImgCaption", placeholder: "Add a Hebrew caption for topic picture"},
"Title": {label: "Title *", field: "enTitle", placeholder: "Add a title."},
"Title": {label: "Title", field: "enTitle", placeholder: "Add a title."},
"Hebrew Title": {label: "Hebrew Title", field: "heTitle", placeholder: "Add a title."},
"English Description": {
label: "English Description",
Expand Down Expand Up @@ -184,7 +184,7 @@ const AdminEditor = ({title, data, close, catMenu, pictureUploader, updateData,
}

return <div className="section">
<label><InterfaceText>{label}</InterfaceText></label>
<label><InterfaceText>{label}</InterfaceText>{label==="Title" && <span className="asterisk"> *</span>}</label>
{obj}
</div>;
}
Expand Down
2 changes: 1 addition & 1 deletion static/js/TopicEditor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const TopicEditor = ({origData, onCreateSuccess, close, origWasCat}) => {
};
slugsToTitles = Object.assign(specialCases, slugsToTitles);
const catMenu = <div className="section">
<label><InterfaceText>Parent Topic *</InterfaceText></label>
<InterfaceText>Parent Topic</InterfaceText><span className="asterisk"> *</span>
<div className="categoryChooserMenu">
<select key="topicCats" id="topicCats" onChange={handleCatChange}>
{Object.keys(slugsToTitles).map(function (tempSlug, i) {
Expand Down

0 comments on commit dd07ce7

Please sign in to comment.