ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Code Issues Releases Wiki Activity

Get rid of ascribe-btn-gray

Browse Source
This commit is contained in:
vrde 2015-08-28 15:56:08 +02:00
parent b229dbb79f
commit 3f34fc680e
5 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/components/whitelabel/prize/components/prize_settings_container.js
View File

@ -190,7 +190,7 @@ let PrizeJurySettings = React.createClass({
{getLangText('RESEND')} {getLangText('RESEND')}
</button> </button>
<button <button
className="btn btn-default btn-sm ascribe-btn-gray margin-left-2px" className="btn btn-warning btn-sm margin-left-2px"
onClick={this.handleRevoke} onClick={this.handleRevoke}
data-id={member.email}> data-id={member.email}>
{getLangText('REVOKE')} {getLangText('REVOKE')}
@ -218,7 +218,7 @@ let PrizeJurySettings = React.createClass({
} }
buttons={ buttons={
<button <button
className="btn btn-default btn-sm ascribe-btn-gray" className="btn btn-warning btn-sm"
onClick={this.handleRevoke} onClick={this.handleRevoke}
data-id={member.email}> data-id={member.email}>
{getLangText('REVOKE')} {getLangText('REVOKE')}

9
sass/ascribe_button.scss
View File

@ -1,9 +0,0 @@
.ascribe-btn-gray {
border-color: #CCCCCC;
background-color: #CCCCCC;
&:hover{
border-color: #AAAAAA;
background-color: #AAAAAA;
}
}

1
sass/ascribe_variables.scss
View File

@ -1,4 +1,3 @@
$ascribe-color-green: rgba(2, 182, 163, 1); $ascribe-color-green: rgba(2, 182, 163, 1);
$ascribe-brand-danger: #FC535F; $ascribe-brand-danger: #FC535F;
$ascribe-brand-warning: #FFC354;

1
sass/main.scss
View File

@ -29,7 +29,6 @@ $BASE_URL: '<%= BASE_URL %>';
@import 'ascribe_slides_container'; @import 'ascribe_slides_container';
@import 'ascribe_form'; @import 'ascribe_form';
@import 'ascribe_panel'; @import 'ascribe_panel';
@import 'ascribe_button';
@import 'whitelabel/index'; @import 'whitelabel/index';

2
sass/variables.scss
View File

@ -18,7 +18,7 @@ $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
$brand-primary: darken(#428bca, 6.5%) !default; // #337ab7 $brand-primary: darken(#428bca, 6.5%) !default; // #337ab7
$brand-success: #5cb85c !default; $brand-success: #5cb85c !default;
$brand-info: #5bc0de !default; $brand-info: #5bc0de !default;
$brand-warning: $ascribe-brand-warning !default; $brand-warning: #ccc !default;
$brand-danger: $ascribe-brand-danger !default; $brand-danger: $ascribe-brand-danger !default;