Merge branch 'nextcloud_css_from_api' into 'master'

Nextcloud CSS from api

See merge request isard/isard-apps!11
Simó Albert i Beltran 2021-05-31 18:35:51 +00:00
commit 9a7202cf98
2 changed files with 5 additions and 198 deletions

View File

@ -1,196 +0,0 @@
#body-user, #body-settings, #body-public {
font-family: 'Montserrat', sans-serif;
color: #262626;
}
#body-user #app-dashboard>h2, #body-settings #app-dashboard>h2, #body-public #app-dashboard>h2 {
color: #262626;
}
#body-user header#header, #body-settings header#header, #body-public header#header {
background-color: white !important;
height: 74px ;
box-shadow: 0 2px 4px #00000014;
border-bottom: 1px solid #262626;
background-image: inherit;
}
#theming-preview-logo, #header #nextcloud {
padding-left: 10px;
}
#header #unified-search svg {
fill: #262626;
width: 35px;
height: 35px;
}
#header .notifications .notifications-button img.svg {
background-color: #262626;
padding: 5px;
border-radius: 18px;
height: 23px;
width: 23px;
margin-left: 10px;
}
#header #contactsmenu {
display: flex;
align-items: center;
}
#header #contactsmenu .icon-contacts {
background-color: #262626;
padding: 5px;
border-radius: 18px;
height: 23px;
width: 23px;
opacity: 1;
margin-left: 10px;
}
#header #settings #expand .avatardiv {
height: 35px;
width: 35px;
}
#header #settings #expand .avatardiv img {
height: 35px;
width: 35px;
margin-left: 10px;
}
#header #unified-search a.header-menu__trigger {
opacity: 1;
}
#header #unified-search a.header-menu__trigger .magnify-icon {
width: 35px;
height: 35px;
}
#body-user div#content, #body-settings div#content, #body-public div#content {
padding-top: 75px;
}
#body-user div#content div#app-dashboard, #body-settings div#content div#app-dashboard, #body-public div#content div#app-dashboard {
background-image: none !important;
background-color: #F0F0F0!important;
}
#body-user div#app-navigation, #body-settings div#app-navigation, #body-public div#app-navigation {
top: 75px;
height: calc(100% - 75px);
color: #262626 !important;
}
#header .header-menu__wrapper[data-v-a58f012a] {
top: 65px;
}
#header #navbar-menu-apps #menu-apps-btn #dropdownMenuAppsButton {
cursor: pointer;
border: none;
background-color: inherit;
padding: 4px;
}
#header div#navbar-menu-apps {
display: flex;
align-items: center;
}
#header #navbar-menu-apps #menu-apps-btn {
margin-right: 20px;
cursor: pointer;
position: relative;
}
#header #navbar-menu-apps #menu-apps-btn #dropdownMenuAppsButton {
cursor: pointer;
border: none;
background-color: inherit;
padding: 4px;
}
#header #navbar-menu-apps .dropdown-menu {
display: none;
position: absolute;
border: 1px solid rgba(0,0,0,.15);
border-radius: 5px;
box-shadow: rgb(0 0 0 / 20%) 0 3px 8px;
margin-top: 15px;
padding: 10px;
max-height: 500px;
overflow-y: scroll;
z-index: 2000;
background-color: white;
top: 33px;
right: -14px;
left: auto;
}
#header #navbar-menu-apps .dropdown-menu ul {
list-style: none;
display: grid;
flex-wrap: wrap;
padding: 15px 2px 0 0;
margin-bottom: 0;
grid-template-columns: 82px 82px 82px;
grid-gap: 12px 2px;
}
#header #navbar-menu-apps .dropdown-menu ul#app-admin {
border-bottom: 1px solid #D9D9D9;
padding-bottom: 4px;
margin-bottom: 6px;
}
#header #navbar-menu-apps .dropdown-menu ul#app-external {
border-top: 1px solid #D9D9D9;
padding-top: 20px;
margin-top: 8px;
}
#header #navbar-menu-apps .dropdown-menu ul li.app a.app-link {
display: flex;
flex-direction: column;
align-items: center;
justify-content: start;
text-align: center;
color: #262626;
text-decoration: none;
}
#header #navbar-menu-apps .dropdown-menu ul li.app a.app-link .icon {
width: 40px;
height: 40px;
background-color: #d5045c;
border-radius: .25rem;
margin-right: 0;
display: flex;
align-items: center;
justify-content: center;
}
#header #navbar-menu-apps .dropdown-menu ul li.app a.app-link .text {
text-align: center;
margin-top: 4px;
height: 26px;
font-size: 13px;
line-height: 15px;
overflow-wrap: anywhere;
}
#header #navbar-menu-apps .dropdown-menu ul li.app a.app-link .icon i {
color: #fff;
font-size: 19px;
}
div#content-vue {
padding-top: 75px;
}

View File

@ -1,3 +1,6 @@
<?php
$api_url = "https://" . preg_replace('/^nextcloud\./', 'api.', $_SERVER['HTTP_HOST'])
?>
<!DOCTYPE html> <!DOCTYPE html>
<html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" data-locale="<?php p($_['locale']); ?>" > <html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" data-locale="<?php p($_['locale']); ?>" >
<head data-user="<?php p($_['user_uid']); ?>" data-user-displayname="<?php p($_['user_displayname']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>"> <head data-user="<?php p($_['user_uid']); ?>" data-user-displayname="<?php p($_['user_displayname']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
@ -24,8 +27,8 @@
<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>"> <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">
<link rel="manifest" href="<?php print_unescaped(image_path($_['appid'], 'manifest.json')); ?>"> <link rel="manifest" href="<?php print_unescaped(image_path($_['appid'], 'manifest.json')); ?>">
<script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script> <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://<?php p(preg_replace('/^nextcloud\./', 'api.', $_SERVER['HTTP_HOST'])) ?>/css/font-awesome-4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="<?php p($api_url) ?>/css/font-awesome-4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="/themes/digitaldemocratic/core/css/dd.css"> <link rel="stylesheet" href="<?php p($api_url) ?>/css/dd.css">
<script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="/themes/digitaldemocratic/core/js/navbar.js"></script> <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="/themes/digitaldemocratic/core/js/navbar.js"></script>
<?php emit_css_loading_tags($_); ?> <?php emit_css_loading_tags($_); ?>
<?php emit_script_loading_tags($_); ?> <?php emit_script_loading_tags($_); ?>