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
80 changes: 56 additions & 24 deletions css/apps/files.scss
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,16 @@ table.files-filestable {


#app-content-vue {

// Override favorite marker stroke color
.favorite-marker-icon svg {
color: var(--color-favorite) !important;

path{
stroke: var(--color-favorite) !important;
}
}

.files-list__header {
margin-block: 0.8rem;
margin-inline: 2.5rem;
Expand Down Expand Up @@ -630,12 +640,12 @@ table.files-filestable {

&.folder-icon,
&.folder-open-icon {
width: 45px;
height: 36px;
width: 150px;
height: 120px;

svg {
width: 45px;
height: 36px;
width: 150px;
height: 120px;
color: var(--nmc-ods-blue-active);

path {
Expand Down Expand Up @@ -719,6 +729,7 @@ table.files-filestable {
}
}


img {
overflow: hidden;
width: var(--icon-preview-size) !important;
Expand Down Expand Up @@ -1033,52 +1044,70 @@ table.files-filestable {
display: flex;
align-items: center;
justify-content: center;
transition: all 0.15s ease-in-out;

.button-vue__icon {
background-image: var(--icon-shared-dark);
background-size: 16px 16px;
width: 16px;
height: 16px;
transition: filter 0.15s ease-in-out;
}

&.button-vue--icon-and-text {
border-color: var(--nmc-ods-blue-primary);
background-color: var(--nmc-ods-blue-primary);
.button-vue__text {
transition: color 0.15s ease-in-out;
}

&:hover {
// Active/existing share state - when file is shared
&.active,
&[aria-pressed="true"],
&.button-vue--icon-and-text {
border: none;
background-color: var(--nmc-ods-blue-active);
background-color: var(--nmc-ods-blue-primary) !important;

.button-vue__icon {
filter: brightness(0);
}

.button-vue__text {
color: var(--nmc-color-text-and-icon-black);
}

[data-themes*=dark] & {
background-color: var(--nmc-ods-blue-hover);
.button-vue__icon {
filter: brightness(0);
}
}
}

&:active {
&.button-vue--icon-and-text {
border-color: var(--nmc-ods-blue-primary);
background-color: var(--nmc-ods-blue-primary);
}

&:hover {
border: none;
background-color: var(--nmc-ods-blue-pressed);
background-color: var(--nmc-ods-blue-active);

.button-vue__icon {
filter: brightness(0);
}

[data-themes*=dark] & {
.button-vue__icon {
filter: brightness(0);
}
background-color: var(--nmc-ods-blue-hover);
}
}

// Active/existing share state
&.active,
&[aria-pressed="true"] {
// When shared, maintain blue on hover with lighter shade
&.active:hover,
&[aria-pressed="true"]:hover,
&.button-vue--icon-and-text:hover {
background-color: var(--nmc-ods-blue-hover) !important;
}

&:active {
border: none;
background-color: var(--nmc-ods-blue-primary);
background-color: var(--nmc-ods-blue-pressed);

.button-vue__icon {
filter: brightness(0);
Expand All @@ -1093,17 +1122,20 @@ table.files-filestable {

&:focus,
&:focus-visible {
border: none;
background-color: var(--nmc-ods-blue-primary);
outline: 2px solid var(--color-main-text);
outline-offset: 2px;

.button-vue__icon {
filter: brightness(0);
// Only apply blue bg on focus if not already shared
&:not(.active):not([aria-pressed="true"]):not(.button-vue--icon-and-text) {
border: none;
background-color: var(--nmc-ods-blue-primary);

.button-vue__icon {
filter: brightness(0);
}
}

[data-themes*=dark] & {

.button-vue__icon {
filter: brightness(0);
}
Expand Down
4 changes: 4 additions & 0 deletions css/apps/sharing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,10 @@ body .icon-upload-to-cloud, body .icon-upload-to-cloud-dark {
}
}

.sharingPopup__or {
background-color:var(--color-main-background) !important;
}

.sharingPopup__success {
padding: 1rem;

Expand Down
11 changes: 11 additions & 0 deletions css/components/ncselect.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
height: 2rem !important;
margin: 6px 2px !important;
min-height: 2rem !important;
background: var(--nmc-ods-blue-primary) !important;

.option {
font-size: 14px;
Expand All @@ -30,6 +31,16 @@
display: none;
}
}

&__lineone {
color: var(--nmc-color-text-and-icon-black) !important;
}
}

.vs__deselect {
svg {
fill: var(--nmc-color-text-and-icon-black) !important;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion css/nmcdefault.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
--color-border-success: var(--color-element-success);
--color-text-error: var(--color-element-error);
--color-text-success: var(--color-element-success);
--color-favorite: var(--colours-basic-background);
--color-favorite: #FFD43B;

--color-loading-light: var(--mode-shades-neutral-shades-300);
--color-loading-dark: var(--mode-shades-neutral-shades-700);
Expand Down
Loading