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

Publisher related fixes #4287

Merged
merged 10 commits into from
Jul 5, 2023
Merged

Publisher related fixes #4287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
68be9f9
[SDESK-6779] and [SDESK-6786]
fritzSF Jan 10, 2023
abca1ae
Merge branch 'develop' of github.com:superdesk/superdesk-client-core …
fritzSF Jan 10, 2023
8ce5276
Merge branch 'develop' of github.com:superdesk/superdesk-client-core …
fritzSF Feb 2, 2023
961b29c
Merge branch 'develop' of github.com:superdesk/superdesk-client-core …
fritzSF Jun 13, 2023
1bdba75
Publisher related fixes
fritzSF Jul 4, 2023
5b5165e
merge with develop
fritzSF Jul 4, 2023
013e490
Merge branch 'develop' into develop
fritzSF Jul 5, 2023
4043f06
small CSS fix
fritzSF Jul 5, 2023
c4e3cfc
package-lock.json fix
fritzSF Jul 5, 2023
2a4470d
Removed Publisher from config
fritzSF Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
202 changes: 101 additions & 101 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"sass-loader": "6.0.6",
"shortid": "2.2.8",
"style-loader": "0.20.2",
"superdesk-ui-framework": "^3.0.39",
"superdesk-ui-framework": "^3.0.40",
"ts-loader": "3.5.0",
"tslint": "5.11.0",
"typescript": "~4.9.5",
Expand Down
14 changes: 10 additions & 4 deletions scripts/apps/authoring/styles/authoring.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,15 @@ $authoring-toolbar-spacing: 10px;
font-size: 13px;
margin-top: -2px;
text-transform: lowercase;
select {
border: 1px solid var(--color-input-border);
border-radius: var(--b-radius--x-small);
background-color: var(--sd-item__main-Bg);
color: var(--color-text);
height: 20px !important;
font-size: 12px !important;
padding: 0 2px !important;
}
}
}

Expand Down Expand Up @@ -954,11 +963,8 @@ $authoring-toolbar-spacing: 10px;
align-items: center;
padding: 5px;
margin-bottom: 1px;
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 0 var(--sd-colour-line--light);
z-index: 1;


background-color: $white;
i.backlink {
flex-grow: 0;
display: inline-flex;
Expand Down
12 changes: 0 additions & 12 deletions styles/sass/layouts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,6 @@ body {
height:100%;
}

// Links
// -----

a, .link {
color: $linkColor;
text-decoration: none;
}
a:hover, .link:hover {
color: $linkColorHover;
text-decoration: underline;
}

@page {
margin-left: 0;
margin-right: 0;
Expand Down
5 changes: 3 additions & 2 deletions styles/sass/sf-additional.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1674,19 +1674,20 @@
position: relative;
text-align: center;
font-style: italic;
color: var(--color-text-light);
&:before {
content: "_________";
position: absolute;
top: -6px;
color: #d0d0d0;
color: var(--sd-colour-line--medium);
left: 50%;
margin-left: -75px;
}
&:after {
content: "_________";
position: absolute;
top: -6px;
color: #d0d0d0;
color: var(--sd-colour-line--medium);;
left: 50%;
margin-left: 15px;
}
Expand Down
Loading
Loading