Skip to content

New design #252

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

Merged
lorenzo merged 8 commits into from
Jun 10, 2015
Merged

New design #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
48b94d6
Merge pull request #248 from michha/patch-1
May 15, 2015
fa50d47
After 386'th line new design starts
midorikocak May 30, 2015
8c6f280
better semantic tags
midorikocak May 30, 2015
b1cb53a
muted scheme heading brand color correction
midorikocak May 30, 2015
7f8ab5a
corrects indentation problems
midorikocak May 30, 2015
60f35b5
removed personal comment
midorikocak Jun 9, 2015
f3ce8bc
indentation to soft tabs 4
midorikocak Jun 9, 2015
2968841
correct indentations
midorikocak Jun 9, 2015
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
40 changes: 19 additions & 21 deletions src/Template/Layout/default.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,24 @@ $cakeDescription = 'CakePHP: the rapid development php framework';
<?= $this->fetch('script') ?>
</head>
<body>
<header>
<div class="header-title">
<span><?= $this->fetch('title') ?></span>
</div>
<div class="header-help">
<span><a target="_blank" href="http://book.cakephp.org/3.0/">Documentation</a></span>
<span><a target="_blank" href="http://api.cakephp.org/3.0/">API</a></span>
</div>
</header>
<div id="container">

<div id="content">
<?= $this->Flash->render() ?>

<div class="row">
<?= $this->fetch('content') ?>
</div>
</div>
<footer>
</footer>
</div>
<nav class="top-bar expanded" data-topbar role="navigation">
Copy link
Copy Markdown
Contributor

@ionas ionas Jun 10, 2015

Choose a reason for hiding this comment

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

Are there ways to do away with the inline classes? (also see below)

<ul class="title-area large-3 medium-4 colmuns">
<li class="name">
<h1><a href=""><?= $this->fetch('title') ?></a></h1>
</li>
</ul>
<section class="top-bar-section">
<ul class="right">
<li><a target="_blank" href="http://book.cakephp.org/3.0/">Documentation</a></li>
<li><a target="_blank" href="http://api.cakephp.org/3.0/">API</a></li>
</ul>
</section>
</nav>
<?= $this->Flash->render() ?>
<section id="container">
<?= $this->fetch('content') ?>
</section>
<footer>
</footer>
</body>
</html>
170 changes: 170 additions & 0 deletions webroot/css/cake.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,3 +382,173 @@ pre {
color: red;
margin-right: 9px;
}

.top-bar.expanded .title-area {
background: #01545b;
}

.top-bar.expanded, .top-bar,.top-bar-section ul li,.top-bar-section li:not(.has-form) a:not(.button) {
background: #116d76;
}

.top-bar-section li:not(.has-form) a:not(.button):hover {
background-color: #308e97;
background: #308e97;
}

.side-nav li.heading {
color: #1798A5;
font-size: 0.875rem;
font-weight: bold;
text-transform: uppercase;
padding: 0.4375rem 0.875rem;
}

#actions-sidebar {
background: #fafafa;
}

.index table {
margin-top: 0rem;
border: 0;
}

table {
background: #fff;
margin-bottom: 1.25rem;
border: none;
table-layout: fixed;
width: 100%;
}

table thead {
background: none;
}

table tr {
border-bottom: 1px solid #ebebec;
}

table thead tr {
border-bottom: 1px solid #1798A5;
}

table tr th {
padding: 0.5625rem 0.625rem;
font-size: 0.875rem;
color: #1798A5;
text-align: left;
border-bottom: 2px solid #1798A5;
}

table tr:nth-of-type(even) {
background: none;
}

fieldset {
border: none;
padding: 1.25rem;
margin: 1.125rem 0;
}

fieldset legend {
border-bottom: 2px solid #1798A5;
width: 100%;
line-height: 2rem;
}

.form button[type="submit"] {
float: right;
text-transform: uppercase;
box-shadow: none;
}

.form button:hover, .form button:focus {
background: #BE840B;
box-shadow: none;
}

button {
background: #966600;
}

div.message {
border-style: solid;
border-width: 1px;
display: block;
font-weight: normal;
padding: 0.875rem 1.5rem 0.875rem 1.5rem;
transition: opacity 300ms ease-out 0s;
background-color: #a0d3e8;
border-color: #74bfdd;
color: #626262;
position: fixed;
top: 15px;
right: 15px;
z-index: 999;
}

div.message:before {
line-height: 0px;
font-size: 20px;
height: 12px;
width: 12px;
border-radius: 15px;
text-align: center;
vertical-align: middle;
display: inline-block;
position: relative;
left: -11px;
background-color: #FFF;
padding: 12px 14px 12px 10px;
content: "i";
color: #a0d3e8;
}

.vertical-table th {
padding: 0.5625rem 0.625rem;
font-size: 0.875rem;
color: #1798A5;
border: none;
text-align: left;
}

.vertical-table {
vertical-align: middle;
}

.vertical-table td {
text-align: right;
}

#content {
padding: 2rem;
}

#content h3 {
color: #be140b;
padding-bottom: 0.5rem;
margin-bottom: 20px;
}

#content h4 {
color: #be140b;
padding-bottom: 0.5rem;
margin-bottom: 20px;
border-bottom: 2px solid #be140b;
}

#content .related h4 {
color: #ebaa20;
padding-bottom: 0.5rem;
margin-top: 20px;
margin-bottom: 10px;
border-bottom: 0px;
}


@media only screen and (min-width: 40.063em) {
#actions-sidebar {
height: 100vh;
}
}