Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-17 23:44:39 -05:00
Code Issues Activity

Merge pull request #5406 from JohnONolan/zropdowns

Browse source 
Refactor Zelda dropdown styles
This commit is contained in:
Hannah Wolfe 2015-06-09 11:24:48 +01:00
commit 3f9560f11f
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/client/app/styles/components/dropdowns.css
View file

@ -16,9 +16,9 @@
left: 0; left: 0;
float: left; float: left;
margin: 2px 0 0; margin: 2px 0 0;
padding: 5px 0; padding: 10px;
min-width: 220px; min-width: 220px;
border: color(var(--lightgrey) lightness(-15%)) 1px solid; border: #e1e1e1 1px solid;
background-color: #fff; background-color: #fff;
background-clip: padding-box; background-clip: padding-box;
border-radius: 4px; border-radius: 4px;
@ -38,28 +38,32 @@
.dropdown-menu .divider { .dropdown-menu .divider {
overflow: hidden; overflow: hidden;
margin: 4px 0; margin: 8px 0;
height: 1px; height: 1px;
background: color(var(--lightgrey) lightness(-5%)); background: color(#e1e1e1 lightness(+5%));
} }
.dropdown-menu > li > a, .dropdown-menu > li > a,
.dropdown-menu > li > button { .dropdown-menu > li > button {
display: flex; display: flex;
align-items: center;
clear: both; clear: both;
padding: 3px 20px; padding: 6px 10px;
width: 100%; width: 100%;
color: #333; border-radius: 3px;
color: color(var(--darkgrey) lightness(+20%));
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 1.9em; font-size: 1.3rem;
line-height: 1em;
font-weight: normal; font-weight: normal;
transition: none; transition: none;
} }
.dropdown-menu i { .dropdown-menu i {
margin-right: 0.5rem; margin-right: 10px;
font-size: 0.9em; font-size: 14px;
line-height: 1em;
} }
@ -71,8 +75,8 @@
.dropdown-menu > li > a:focus, .dropdown-menu > li > a:focus,
.dropdown-menu > li > button:hover, .dropdown-menu > li > button:hover,
.dropdown-menu > li > button:focus { .dropdown-menu > li > button:focus {
background: var(--blue); background: color(var(--blue) alpha(-85%));
color: #fff; color: var(--darkgrey);
text-decoration: none; text-decoration: none;
} }

1
core/client/app/styles/layouts/users.css
View file

@ -229,5 +229,6 @@ a.user-list-item {
} }
.invite-new-user .btn-green { .invite-new-user .btn-green {
margin: 0;
width: 100%; width: 100%;
} }

3
core/client/app/templates/components/gh-nav-menu.hbs
View file

@ -8,10 +8,9 @@
{{/gh-dropdown-button}} {{/gh-dropdown-button}}
{{#gh-dropdown tagName="div" classNames="dropdown" name="user-menu" closeOnClick="true"}} {{#gh-dropdown tagName="div" classNames="dropdown" name="user-menu" closeOnClick="true"}}
<ul class="dropdown-menu dropdown-triangle-top js-user-menu-dropdown-menu" role="menu" style="right:-50%;left:auto;margin-right:40px"> <ul class="dropdown-menu dropdown-triangle-top js-user-menu-dropdown-menu" role="menu" style="right:-50%;left:auto;margin-right:40px">
<li role="presentation">{{#link-to "about" classNames="gh-nav-menu-about dropdown-item js-nav-item" role="menuitem" tabindex="-1"}}<i class="icon-gh"></i> About Ghost{{/link-to}}</li> <li role="presentation">{{#link-to "about" classNames="gh-nav-menu-about dropdown-item js-nav-item" role="menuitem" tabindex="-1"}}<i class="icon-shop"></i> About Ghost{{/link-to}}</li>
<li class="divider"></li> <li class="divider"></li>
<li role="presentation">{{#link-to "settings.users.user" session.user.slug classNames="dropdown-item user-menu-profile js-nav-item" role="menuitem" tabindex="-1"}}<i class="icon-user"></i> Your Profile{{/link-to}}</li> <li role="presentation">{{#link-to "settings.users.user" session.user.slug classNames="dropdown-item user-menu-profile js-nav-item" role="menuitem" tabindex="-1"}}<i class="icon-user"></i> Your Profile{{/link-to}}</li>
<li class="divider"></li>
<li role="presentation">{{#link-to "signout" classNames="dropdown-item user-menu-signout" role="menuitem" tabindex="-1"}}<i class="icon-signout"></i> Sign Out{{/link-to}}</li> <li role="presentation">{{#link-to "signout" classNames="dropdown-item user-menu-signout" role="menuitem" tabindex="-1"}}<i class="icon-signout"></i> Sign Out{{/link-to}}</li>
</ul> </ul>
{{/gh-dropdown}} {{/gh-dropdown}}

2
core/client/app/templates/settings/tags/settings-menu.hbs
View file

@ -35,7 +35,7 @@
</ul> </ul>
{{#unless activeTag.isNew}} {{#unless activeTag.isNew}}
<button type="button" class="btn btn-link btn-sm tag-delete-button icon-trash" {{action "openModal" "delete-tag" activeTag}}>Delete Tag</button> <button type="button" class="btn btn-link btn-sm tag-delete-button" {{action "openModal" "delete-tag" activeTag}}><i class="icon-trash"></i> Delete Tag</button>
{{/unless}} {{/unless}}
</form> </form>
</div> </div>