Skip to content

Commit

Permalink
Fixed style of modal in preview.
Browse files Browse the repository at this point in the history
  • Loading branch information
halfdan authored and ErisDS committed Oct 23, 2013
1 parent 5ba8959 commit fc019fe
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 23 deletions.
17 changes: 0 additions & 17 deletions core/client/assets/sass/layouts/editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -635,23 +635,6 @@ body.zen {
position: absolute;
bottom: 44px;
right: -3px;

li {
a {
padding: 10px 15px;

&:before {
font-size: 11px;
line-height: 1em;
}
}
}

.delete {
@include icon($i-trash) { position: relative; top: -2px; };

&:hover { background: $red; }
}
}

#entry-actions {
Expand Down
30 changes: 27 additions & 3 deletions core/client/assets/sass/modules/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,7 @@ nav {
border-top:$lightbrown 1px solid;
}

li { font-size:1.1em;

li {
a {
display:block;
padding:10px 15px;
Expand Down Expand Up @@ -834,6 +833,28 @@ nav {
Post Settings
========================================================================== */

.post-settings-menu {
text-transform: none;

li {
a {
padding: 10px 15px;

&:before {
font-size: 11px;
line-height: 1em;
margin-right: 1em;
}
}
}

.delete {
@include icon($i-trash) { position: relative; top: -2px; };

&:hover { background: $red; }
}
}

.post-setting {
min-width: 260px;
border-bottom: 1px solid #35393b;
Expand Down Expand Up @@ -1167,7 +1188,6 @@ main {
height: 40px;
padding: 12px 15px;
text-transform: uppercase;
font-size: 0.85em;
color: $brown;
//Transparent gradient to make bg fade out as it goes out the top.
@include linear-gradient(top, white 0%, white 25%, rgba(255,255,255,0.9) 100%, $fallback: transparent);
Expand Down Expand Up @@ -1202,6 +1222,10 @@ main {
}
}

span {
font-size: 0.85em;
}

a {
color: $brown;
&:hover { color: $darkgrey; }
Expand Down
4 changes: 2 additions & 2 deletions core/client/tpl/preview.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
<input class="post-setting-date" type="text" value="">
</div>
</li>
<li><a href="#" class="delete hidden">Delete</a></li>
<li><a href="#" class="delete hidden">Delete This Post</a></li>
</ul>
</section>
</header>
<section class="content-preview-content">
<div class="wrapper"><h1>{{{title}}}</h1>{{{html}}}</div>
</section>
</section>
2 changes: 1 addition & 1 deletion core/server/views/editor.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<section id="entry-controls">
<a class="entry-settings" href="#" data-toggle=".entry-settings-menu" title="Post Settings"><span class="hidden">Post Settings</span></a>
<ul class="entry-settings-menu menu-right overlay">
<ul class="post-settings-menu entry-settings-menu menu-right overlay">
<li class="post-setting">
<div class="post-setting-label">
<label for="url">URL</label>
Expand Down

0 comments on commit fc019fe

Please sign in to comment.