0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00

Button refactor

Refs #3101 & #916
This commit is contained in:
Paul Adam Davis 2014-07-14 18:34:24 +01:00
parent 1fead26579
commit b070d618c3
9 changed files with 46 additions and 37 deletions

View file

@ -464,7 +464,7 @@ body.zen {
right: -3px; right: -3px;
} }
button { .button-save {
min-height: 30px; min-height: 30px;
height: 30px; height: 30px;
line-height: 12px; line-height: 12px;
@ -473,15 +473,12 @@ body.zen {
border-top: rgba(255,255,255,0.4) 1px solid; border-top: rgba(255,255,255,0.4) 1px solid;
} }
.button-link {
border-top: none;
}
.options { .options {
width: 30px; width: 30px;
min-height: 30px; min-height: 30px;
height: 30px; height: 30px;
margin-top: 5px; margin-top: 5px;
border-top: rgba(255,255,255,0.4) 1px solid;
} }
.splitbutton-save, .splitbutton-save,

View file

@ -38,4 +38,10 @@
line-height: 16px; line-height: 16px;
} }
}
.modal-footer {
.reject-button-class {
@extend .button;
}
} }

View file

@ -18,7 +18,6 @@
@include transition; @include transition;
position: relative; position: relative;
top: 1px; top: 1px;
cursor: pointer;
&:hover, &:hover,
&.active { &.active {
@ -160,7 +159,8 @@
.delete { .delete {
display: block; display: block;
padding: 10px 15px; padding: 10px 15px;
cursor: pointer; width: 100%;
text-align: left;
@include icon($i-trash) { @include icon($i-trash) {
position: relative; position: relative;
top: -1px; top: -1px;

View file

@ -271,7 +271,6 @@
border-radius: 100%; border-radius: 100%;
overflow: hidden; overflow: hidden;
padding: 3px; padding: 3px;
// border: 5px solid #fff;
background: #fff; background: #fff;
z-index: 2; z-index: 2;
@ -304,6 +303,7 @@
.edit-user-image { .edit-user-image {
@include position(absolute, 3px 3px 3px 3px); @include position(absolute, 3px 3px 3px 3px);
border-radius: 100%; border-radius: 100%;
width: calc(100% - 6px);
background: rgba(0,0,0,0.5); background: rgba(0,0,0,0.5);
opacity: 0; opacity: 0;
color: #fff; color: #fff;

View file

@ -3,11 +3,24 @@
* *
* Table of Contents * Table of Contents
* *
* Button Reset
* Buttons * Buttons
* Split Buttons * Split Buttons
*/ */
/* ==========================================================================
Button Reset
========================================================================== */
button {
border: 0;
padding: 0;
background: transparent;
@include transition(all 0.15s ease-in-out);
}
/* ========================================================================== /* ==========================================================================
Buttons Buttons
========================================================================== */ ========================================================================== */
@ -18,8 +31,6 @@
display: inline-block; display: inline-block;
padding: 0.9em 1.37em; padding: 0.9em 1.37em;
cursor: pointer;
text-decoration: none; text-decoration: none;
color: #fff; color: #fff;
font-size: 11px; // Hack because Firefox sucks. font-size: 11px; // Hack because Firefox sucks.
@ -109,9 +120,9 @@
// This is the default button style // This is the default button style
.button, .button {
button, // button,
input[type="button"] { // input[type="button"] {
@extend %btn; @extend %btn;
color:#777; color:#777;
font-weight: normal; font-weight: normal;
@ -138,9 +149,9 @@ input[type="button"] {
} }
// Button for save/next/continue/confirm actions // Button for save/next/continue/confirm actions
.button-save, .button-save {
button[type="submit"], // button[type="submit"],
input[type="submit"] { // input[type="submit"] {
@extend %btn; @extend %btn;
background: $blue; background: $blue;
box-shadow: none; box-shadow: none;
@ -151,9 +162,9 @@ input[type="submit"] {
} }
// Button for actions which add stuff // Button for actions which add stuff
.button-add, .button-add {
button[type="submit"].button-add, // button[type="submit"].button-add,
input[type="submit"].button-add { // input[type="submit"].button-add {
@extend %btn; @extend %btn;
background: $green; background: $green;
&:hover, &:hover,
@ -163,9 +174,9 @@ input[type="submit"].button-add {
} }
// Button for deleting/removing stuff // Button for deleting/removing stuff
.button-delete, .button-delete {
button[type="reset"], // button[type="reset"],
input[type="reset"] { // input[type="reset"] {
@extend %btn; @extend %btn;
background: $red; background: $red;
box-shadow: none; box-shadow: none;

View file

@ -27,11 +27,6 @@
} // .dropdown } // .dropdown
a.dropdown,
button.dropdown {
cursor: pointer;
}
/* ========================================================================== /* ==========================================================================
Dropdown Show & Hide Dropdown Show & Hide

View file

@ -25,7 +25,7 @@
//Transparent gradient to make bg fade out as it goes out the top. //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); @include linear-gradient(top, white 0%, white 25%, rgba(255,255,255,0.9) 100%, $fallback: transparent);
button, // button,
.button { .button {
display: inline-block; display: inline-block;
font-size: 10px; font-size: 10px;
@ -60,7 +60,8 @@
font-size: 0.85em; font-size: 0.85em;
} }
a { a,
button {
color: $brown; color: $brown;
&:hover { &:hover {
color: $darkgrey; color: $darkgrey;

View file

@ -76,7 +76,6 @@
right: 9px; right: 9px;
}; };
color: rgba(255,255,255,0.6); color: rgba(255,255,255,0.6);
cursor: pointer;
&:hover { &:hover {
color: #fff; color: #fff;
} }

File diff suppressed because one or more lines are too long