greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

start working on ghost-only buttons

pull/6163/head
Quincy Larson 2016-01-11 18:56:15 -06:00 committed by Berkeley Martinez
parent c36b8352d2
commit 8e71cdd4b8
2 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client/less/main.less
View File

@ -124,13 +124,6 @@ h1, h2, h3, h4, h5, h6, p, li {
box-shadow: 2px 4px 1px rgba(0, 0, 0, 0.3);
}
.btn, .shadow {
white-space: normal;
-webkit-box-shadow: 2px 4px 1px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 2px 4px 1px rgba(0, 0, 0, 0.3);
box-shadow: 2px 4px 1px rgba(0, 0, 0, 0.3);
}
.btn-nav {
margin-top: 10px;
}
@ -724,23 +717,9 @@ iframe.iphone {
min-height: 650px;
}
.btn-primary-ghost {
.btn {
background: transparent;
color: @brand-primary;
/* CSS Transition */
-webkit-transition: background .2s ease-in-out, border .2s ease-in-out;
-moz-transition: background .2s ease-in-out, border .2s ease-in-out;
-ms-transition: background .2s ease-in-out, border .2s ease-in-out;
-o-transition: background .2s ease-in-out, border .2s ease-in-out;
transition: background .2s ease-in-out, border .2s ease-in-out;
}
.btn-warning-ghost {
background: transparent;
color: @brand-warning;
/* CSS Transition */
color: #fff;
-webkit-transition: background .2s ease-in-out, border .2s ease-in-out;
-moz-transition: background .2s ease-in-out, border .2s ease-in-out;
-ms-transition: background .2s ease-in-out, border .2s ease-in-out;

10
server/views/account/show.jade
View File

@ -242,29 +242,29 @@ block content
h1.text-center Manage your account
hr
.col-xs-12
a.btn.btn-lg.btn-block.btn-warning.btn-link-social(href='/logout')
a.btn.btn-lg.btn-block.btn-primary.btn-primary-ghost.btn-link-social(href='/logout')
span.ion-android-exit
| Sign me out of Free Code Camp
.col-xs-12
a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='mailto:team@freecodecamp.com')
a.btn.btn-lg.btn-block.btn-primary.btn-primary-ghost.btn-link-social(href='mailto:team@freecodecamp.com')
span.ion-email
| Email us at team@freecodecamp.com
if (!user.isLocked)
.col-xs-12
a.btn.btn-lg.btn-block.btn-info.btn-link-social(href='/toggle-lockdown-mode')
a.btn.btn-lg.btn-block.btn-primary.btn-primary-ghost.btn-link-social(href='/toggle-lockdown-mode')
span.ion-locked
| Hide all my solutions from other people
br
| (this will disable your certificates)
else
.col-xs-12
a.btn.btn-lg.btn-block.btn-info.btn-link-social(href='/toggle-lockdown-mode')
a.btn.btn-lg.btn-block.btn-primary.btn-primary-ghost.btn-link-social(href='/toggle-lockdown-mode')
span.ion-unlocked
| Let other people see all my solutions
br
| (this will enable your certificates)
.col-xs-12
a.btn.btn-lg.btn-block.btn-success.btn-link-social(href='/commit')
a.btn.btn-lg.btn-block.btn-primary.btn-primary-ghost.btn-link-social(href='/commit')
span.ion-edit
| Edit my pledge
.col-xs-12