Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions css/apps/files_sharing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,15 @@
h2 {
font-size: 20px;
margin: unset;

strong {
font-weight: 600;
}
}

.sharingPopup__header {
font-weight: 600;
margin-bottom: 16px !important;
}
}

Expand Down
4 changes: 2 additions & 2 deletions css/apps/photos.scss
Original file line number Diff line number Diff line change
Expand Up @@ -746,14 +746,14 @@

&:hover:not(:disabled) {
.close-icon {
filter: var(--nmc-color-icon)
filter: var(--nmc-color-icon);
}

background-color: initial;
}

.close-icon {
background-image: var(--icon-close-dark);
background-image: var(--icon-close-x-dark);
background-position: center;
background-repeat: no-repeat;
height: 100%;
Expand Down
91 changes: 91 additions & 0 deletions css/apps/sharing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,97 @@ body .icon-upload-to-cloud, body .icon-upload-to-cloud-dark {
}
}
}
}

#body-user, #body-public, #body-settings {
.sharingPopup__content, .sharingTab__content, .sharingTabDetailsView {
.button-vue--vue-primary {
background-color: var(--nmc-ods-blue-primary);
border-radius: var(--telekom-radius-pill);
color: var(--telekom-color-text-and-icon-standard)
}

// Container for "Create new link" button
#addlink_button {
background-color: var(--nmc-ods-blue-primary);
border-radius: var(--telekom-radius-pill);
border-width: 0;
}

// Parent div of the "Create new link" button
div:has(> #addlink_button) {
display: flex;
justify-content: flex-end;
}

// Quick share options dropdown button
.share-select button.trigger-text {
color: #2E466A;
font-weight: 400;

.eye-circle-outline-icon {
width: 16px;
height: 16px;
display: inline-block;
background-image: var(--icon-visibility-on-dark);
background-repeat: no-repeat;
background-position: center;
background-size: contain;
filter: invert(20%) sepia(19%) saturate(1540%) hue-rotate(182deg) brightness(95%) contrast(88%);

svg {
display: none !important;
}
}

.calendar-month-icon {
width: 16px;
height: 16px;
display: inline-block;
background-image: var(--icon-calendar-dark);
background-repeat: no-repeat;
background-position: center;
background-size: contain;
filter: invert(20%) sepia(19%) saturate(1540%) hue-rotate(182deg) brightness(95%) contrast(88%);

svg {
display: none !important;
}
}
}

// Border for sharing entry items
.sharing-entry.sharing-entry__link.sharing-entry--share {
border-bottom: 1px solid #B6B6B6;
padding: 0.5rem 0;
}

// Remove margin-bottom from "Link to Copy" heading
.sharing-link-list-caption {
margin-bottom: 0;
}

.button-vue--vue-secondary {
&#addlink_button {
background-color: var(--nmc-ods-blue-primary);
border-radius: var(--telekom-radius-pill);
border-width: 0;
}

&.button-vue--icon-only {
border-radius: 50%;
width: 40px;
height: 40px;
min-width: 40px;
min-height: 40px;
border: 1px solid var(--telekom-color-ui-black);

.icon-delete {
background-image: var(--icon-close-x-dark);
}
}
}
}

.sharing-entry {
gap: .5rem;
Expand Down
1 change: 1 addition & 0 deletions css/components/ncselect.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

.vs__dropdown-toggle {
border-width: 1px;
border-radius: 12px;
}

.vs__actions {
Expand Down
13 changes: 6 additions & 7 deletions img/actions/clipboard.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions img/actions/visibility-on.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion img/content/calendar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions src/icons.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const colors = {

const COLOR_VALUE_RE = '(?:#[0-9a-f]{3,6}|black|white)'

const colorSvg = function (svg = '', color = '000') {
const colorSvg = function(svg = '', color = '000') {
if (!/^[0-9a-f]{3,6}$/i.test(color)) {
console.warn(color, 'does not match the required format')
color = '000'
Expand All @@ -38,13 +38,13 @@ const colorSvg = function (svg = '', color = '000') {
// replace fill/stroke attributes (hex + named colors)
svg = svg.replace(
new RegExp(`(fill|stroke)="(${COLOR_VALUE_RE})"`, 'gmi'),
(_, attr) => `${attr}="#${color}"`
(_, attr) => `${attr}="#${color}"`,
)

// replace inline styles
svg = svg.replace(
new RegExp(`(fill|stroke):(${COLOR_VALUE_RE})`, 'gmi'),
(_, attr) => `${attr}:#${color}`
(_, attr) => `${attr}:#${color}`,
)

return svg
Expand Down Expand Up @@ -183,6 +183,7 @@ const icons = {
import: path.join(__dirname, '../img', 'actions', 'import.svg'),
'folder-overlay-lock': path.join(__dirname, '../img', 'actions', 'lock.svg'),
'folder-overlay-share': path.join(__dirname, '../img', 'actions', 'share.svg'),
'visibility-on': path.join(__dirname, '../img', 'actions', 'visibility-on.svg'),
}

const iconsColor = {
Expand Down
Loading