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

Various beta14 design fixes #10691

Merged
merged 5 commits into from
Aug 15, 2018
Merged

Various beta14 design fixes #10691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f014d31
Undo button fix in theming
skjnldsv Aug 15, 2018
5e867d6
Fix footer and public min-height
skjnldsv Aug 15, 2018
a95dc4d
Ellipsis long username/mails in share view
skjnldsv Aug 15, 2018
3d169ae
Typo
skjnldsv Aug 15, 2018
0e23193
Added feedback on autocomplete ui
skjnldsv Aug 15, 2018
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
6 changes: 5 additions & 1 deletion apps/files_sharing/css/sharetabview.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
margin-left: auto;
display: flex;
align-items: center;
white-space: nowrap;
// can edit label
> .shareOption > label {
padding: 13px;
Expand Down Expand Up @@ -196,12 +197,15 @@
}
.username {
padding: 0 8px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}

.ui-autocomplete {
/* limit dropdown height to 4 1/2 entries */
max-height: 200px;
max-height: calc(36px * 4.5);;
overflow-y: auto;
overflow-x: hidden;
z-index: 1550 !important;
Expand Down
2 changes: 2 additions & 0 deletions apps/theming/css/settings-admin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
vertical-align: top;
display: inline-block;
visibility: hidden;
height: 32px;
width: 32px;
}
form.uploadButton {
width: 411px;
Expand Down
17 changes: 14 additions & 3 deletions core/css/jquery-ui-fixes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
.ui-menu-item a {
&.ui-state-focus, &.ui-state-active {
font-weight: inherit;
box-shadow: inset 4px 0 var(--color-primary);
}
}
}
Expand All @@ -184,15 +185,25 @@

&.ui-corner-all {
border-radius: 0;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
border-bottom-left-radius: var(--border-radius);
border-bottom-right-radius: var(--border-radius);
}

.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
.ui-state-hover, .ui-widget-content .ui-state-hover,
.ui-widget-header .ui-state-hover,
.ui-state-focus,
.ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus {
border: 1px solid transparent;
background: inherit;
color: var(--color-primary-element);
}

.ui-menu-item {
a {
border-radius: 0 !important;
}
}
}

.ui-button.primary {
Expand Down
25 changes: 23 additions & 2 deletions core/css/public.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
$footer-height: 60px;

#body-public {
.header-right {

Expand Down Expand Up @@ -36,8 +38,9 @@
}

#content {
height: initial;
min-height: calc(100vh - 160px);
// 100% - footer
min-height: calc(100% - #{$footer-height});

}

/** don't apply content header padding on the base layout */
Expand All @@ -64,4 +67,22 @@
form input[type='checkbox']+label {
text-align: center;
}

/* public footer */
footer {
position: relative;
display: flex;
align-items: center;
justify-content: center;
height: $footer-height;
p {
color: var(--color-text-lighter);
a {
color: var(--color-text-lighter);
font-weight: 600;
padding: 13px;
margin: -13px;
}
}
}
}
19 changes: 0 additions & 19 deletions core/css/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,25 +1049,6 @@ div.crumb {
}
}

/* public footer */

#body-public footer {
position: relative;
text-align: center;
.info {
color: var(--color-text-lighter);
text-align: center;
margin: 0 auto;
padding: 20px 0;
a {
color: var(--color-text-lighter);
font-weight: 600;
padding: 13px;
margin: -13px;
}
}
}

/* LEGACY FIX only - do not use fieldsets for settings */

fieldset {
Expand Down
2 changes: 1 addition & 1 deletion core/templates/layout.public.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
</div>
<?php if(isset($template) && $template->getFooterVisible()) { ?>
<footer>
<p class="info"><?php print_unescaped($theme->getLongFooter()); ?></p>
<p><?php print_unescaped($theme->getLongFooter()); ?></p>
</footer>
<?php } ?>

Expand Down