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

5.x - Update Milligram to 1.4.1, adjust stylings and fix problem with DB connection test #915

Merged
merged 4 commits into from
Oct 8, 2022
Merged

5.x - Update Milligram to 1.4.1, adjust stylings and fix problem with DB connection test #915

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d4e2d4
Update Milligram to 1.4.1 and adjust stylings
LordSimal Oct 2, 2022
998ee43
remove normalize.min.css because its part of milligram.min.css
LordSimal Oct 2, 2022
8a1f7ca
adjust styling for pagination
LordSimal Oct 6, 2022
62bea5e
add Raleway license
LordSimal Oct 6, 2022
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: 4 additions & 5 deletions templates/Pages/home.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@
$error = null;
$connected = false;
try {
$connection = ConnectionManager::get($name);
$connected = $connection->getDriver()->connect();
ConnectionManager::get($name)->getDriver()->connect();
// No exception means success
$connected = true;
} catch (Exception $connectionError) {
$error = $connectionError->getMessage();
if (method_exists($connectionError, 'getAttributes')) {
Expand Down Expand Up @@ -59,9 +60,7 @@
</title>
<?= $this->Html->meta('icon') ?>

<link href="https://fonts.googleapis.com/css?family=Raleway:400,700" rel="stylesheet">

<?= $this->Html->css(['normalize.min', 'milligram.min', 'cake', 'home']) ?>
<?= $this->Html->css(['milligram.min', 'fonts', 'cake', 'home']) ?>

<?= $this->fetch('meta') ?>
<?= $this->fetch('css') ?>
Expand Down
4 changes: 1 addition & 3 deletions templates/layout/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@
</title>
<?= $this->Html->meta('icon') ?>

<link href="https://fonts.googleapis.com/css?family=Raleway:400,700" rel="stylesheet">

<?= $this->Html->css(['normalize.min', 'milligram.min', 'cake']) ?>
<?= $this->Html->css(['milligram.min', 'fonts', 'cake']) ?>

<?= $this->fetch('meta') ?>
<?= $this->fetch('css') ?>
Expand Down
4 changes: 1 addition & 3 deletions templates/layout/error.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
</title>
<?= $this->Html->meta('icon') ?>

<link href="https://fonts.googleapis.com/css?family=Raleway:400,700" rel="stylesheet">

<?= $this->Html->css(['normalize.min', 'milligram.min', 'cake']) ?>
<?= $this->Html->css(['milligram.min', 'fonts', 'cake']) ?>

<?= $this->fetch('meta') ?>
<?= $this->fetch('css') ?>
Expand Down
172 changes: 125 additions & 47 deletions webroot/css/cake.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,46 @@
/* Miligram overrides */
/* Milligram overrides */
:root {
/* The following are official CakePHP colors */
--color-cakephp-red: #d33c43;
--color-cakephp-gray: #404041;
--color-cakephp-blue: #2f85ae;
--color-cakephp-lightblue: #34bdd7;

/* These are additional colors */
--color-lightgray: #606c76;
--color-white: #fff;

--color-main-bg: #f5f7fa;
--color-links: var(--color-cakephp-blue);
--color-links-active: #2a6496;
--color-headings: #363637;

--color-message-success-bg: #e3fcec;
--color-message-success-text: #1f9d55;
--color-message-success-border: #51d88a;

--color-message-warning-bg: #fffabc;
--color-message-warning-text: #8d7b00;
--color-message-warning-border: #d3b800;

--color-message-error-bg: #fcebea;
--color-message-error-text: #cc1f1a;
--color-message-error-border: #ef5753;

--color-message-info-bg: #eff8ff;
--color-message-info-text: #2779bd;
--color-message-info-border: #6cb2eb;
}

.button, button, input[type='button'], input[type='reset'], input[type='submit'] {
background-color: var(--color-cakephp-red);
border-color: var(--color-cakephp-red);
}

body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
background: var(--color-main-bg);
}

.top-nav-links,
Expand All @@ -12,35 +51,33 @@ h1, h2, h3, h4, h5, h6 {

h1, h2, h3, h4, h5, h6 {
font-weight: 400;
color: #363637;
color: var(--color-headings);
}

a {
color:#2f85ae;
-webkit-transition:all 0.2s linear;
transition:all 0.2s linear;
color: var(--color-links);
transition: color 0.2s linear;
}

a:hover,
a:focus,
a:active {
color:#2a6496;
-webkit-transition:all 0.2s easeout;
transition:all 0.2s ease-out;
a:active {
color: var(--color-links-active);
transition: color 0.2s ease-out;
}

.side-nav a,
.top-nav-links a,
th a,
.actions a {
color: #606c76;
color: var(--color-lightgray);
}

.side-nav a:hover,
.side-nav a:focus,
.actions a:hover,
.actions a:focus {
color:#2f85ae;
color: var(--color-links-active);
}

/* Utility */
Expand All @@ -52,17 +89,17 @@ th a,
}

/* Main */
body {
background: #f5f7fa;
}
.content {
padding: 2rem;
background: #ffffff;
background: var(--color-white);
border-radius: 0.4rem;
/* Thanks Stripe */
box-shadow: 0 7px 14px 0 rgba(60, 66, 87, 0.1),
0 3px 6px 0 rgba(0, 0, 0, 0.07);
}
.content form {
margin: 0;
}
.actions a {
font-weight: bold;
padding: 0 0.4rem;
Expand All @@ -78,14 +115,14 @@ th {
justify-content: space-between;
max-width: 112rem;
padding: 2rem;
margin: 0 auto 2rem;
margin: 0 auto;
}
.top-nav-title a {
font-size: 2.4rem;
color: #d33c43;
color: var(--color-cakephp-red);
}
.top-nav-title span {
color: #404041;
color: var(--color-cakephp-gray);
}
.top-nav-links a {
margin: 0 0.5rem;
Expand All @@ -94,7 +131,6 @@ th {
.top-nav-links a {
font-weight: bold;
}

.side-nav-item {
display: block;
padding: 0.5rem 0;
Expand All @@ -110,77 +146,114 @@ th {

/* Flash messages */
.message {
padding: 1rem;

background: #eff8ff;
color: #2779bd;

border-color: #6cb2eb;
padding: .5rem 1rem;
background: var(--color-message-info-bg);
color: var(--color-message-info-text);
border-color: var(--color-message-info-border);
border-width: 1px;
border-style: solid;
border-radius: 4px;
margin-bottom: 2rem;
margin-bottom: 1rem;
cursor: pointer;
}
.message.hidden {
display: none;
}
.message.success {
background: #e3fcec;
color: #1f9d55;
border-color: #51d88a;
background: var(--color-message-success-bg);
color: var(--color-message-success-text);
border-color: var(--color-message-success-border);
}
.message.warning {
background: #fffabc;
color: #8d7b00;
border-color: #d3b800;
background: var(--color-message-warning-bg);
color: var(--color-message-warning-text);
border-color: var(--color-message-warning-border);
}
.message.error {
background: #fcebea;
color: #cc1f1a;
border-color: #ef5753;
background: var(--color-message-error-bg);
color: var(--color-message-error-text);
border-color: var(--color-message-error-border);
}

/* Forms */
.input.radio,
.input.checkbox {
.input.checkbox,
.input.multicheckbox {
margin-bottom: 2.0rem;
}
.input.radio input,
.input.checkbox input {
.input.checkbox input,
.input.multicheckbox input {
margin: 0;
}
.input.radio label,
.input.checkbox label {
.input.checkbox label,
.input.multicheckbox label {
margin: 0;
display: flex;
align-items: center;
}
.input.radio label > input,
.input.checkbox label > input {
.input.checkbox label > input,
.input.multicheckbox label > input {
margin-right: 1.0rem;
}
.input.radio label:first-of-type {
margin-bottom: 2.0rem;
input[type='color'] {
max-width: 4rem;
padding: 0.3rem .5rem 0.3rem;
}

/* Paginator */
.paginator {
text-align: right;
}
.paginator p {
margin-bottom: 0;
}
.pagination {
display: flex;
justify-content: center;
list-style: none;
margin: 0 0 1rem 0;
padding: 0;
margin: 0 0 1rem;
}
.pagination li {
margin: 0 0.5rem;
display: inline-block;
margin: 0.25em;
text-align: center;
}
.pagination a {
border: 2px solid var(--color-cakephp-blue);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels heavy to me. Do we need a border at all on these they are just links after all.

Copy link
Contributor Author

@LordSimal LordSimal Oct 6, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was just a personal style adjustments because I like the bordered pagination links with the hover effect more. But I will remove that styling if you don't like it.

border-radius: 5px;
color: var(--color-cakephp-blue);
display: inline-block;
font-size: 1.25rem;
line-height: 3rem;
min-width: 3rem;
padding: 0;
position: relative;
text-decoration: none;
transition: background .3s,color .3s;
}
.pagination li.active a,
.pagination a:hover {
background: var(--color-cakephp-blue);
color: var(--color-white)
}
.prev.disabled a,
.next.disabled a {
.disabled a {
border-color: var(--color-white);
cursor: not-allowed;
color: #606c76;
color: var(--color-lightgray);
}
.first a,
.prev a,
.next a,
.last a {
padding: 0 .75rem;
}
.disabled a:hover {
background: initial;
color: initial;
}
.asc:after {
content: " \2193";
Expand All @@ -189,7 +262,7 @@ th {
content: " \2191";
}

/* Error */
/* Error in non debug mode */
.error-container {
align-items: center;
display: flex;
Expand All @@ -199,6 +272,11 @@ th {
}

@media screen and (max-width: 640px) {
/* Fix milligram not having a responsive column system */
.row .column[class*='column-'] {
flex: 0 0 100%;
max-width: 100%
}
.top-nav {
margin: 0 auto;
}
Expand Down
Loading