secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Rounded buttons-arama

Browse Source
This commit is contained in:
James Barnsley
2017-02-09 21:23:26 +13:00
parent e149afd79a
commit c9e5e28838
4 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/components/VersionManager.js
View File

@ -17,7 +17,7 @@ class VersionManager extends React.Component{
renderUpgradeButton(){
if( this.props.pusher.upgrading ){
return (
<button disabled>
<button className="outline" disabled>
<FontAwesome name="circle-o-notch" spin />
&nbsp;
Upgrading
@ -26,14 +26,14 @@ class VersionManager extends React.Component{
}
if( !this.props.pusher.version.is_root ){
return <button className="secondary" disabled>Not running as root</button>
return <button className="outline" disabled>Not running as root</button>
}
if( this.props.pusher.version.upgrade_available ){
return <button className="secondary" onClick={() => this.props.pusherActions.startUpgrade()}>Upgrade to { this.props.pusher.version.latest }</button>
return <button className="primary" onClick={() => this.props.pusherActions.startUpgrade()}>Upgrade to { this.props.pusher.version.latest }</button>
}
return <button className="secondary" disabled>No updates available</button>
return <button className="outline" disabled>No updates available</button>
}
render(){

2
src/js/views/Settings.js
View File

@ -119,8 +119,6 @@ class Settings extends React.Component{
return (
<button onClick={e => this.props.uiActions.openModal('send_authorization', {}) }>
<FontAwesome name="share-square-o" />
&nbsp;
Share authentication
</button>
)

2
src/scss/components/_header.scss
View File

@ -33,8 +33,10 @@ main {
font-size: 14px;
font-weight: 600;
padding: 13px 10px;
margin: 0;
line-height: 24px;
text-transform: uppercase;
min-width: 0;
}
}
}

29
src/scss/global/_forms.scss
View File

@ -37,27 +37,23 @@ input[type="submit"] {
@include animate();
padding: 10px 20px;
border: 0;
margin: 0 10px 5px 0;
margin: 0 10px 20px 0;
margin-right: 20px;
text-align: center;
min-width: 140px;
border-radius: 20px;
color: #000000;
background: $light_grey;
@include responsive( $bp_medium ){
min-width: none;
}
&:hover{
cursor: pointer;
background: darken( $light_grey, 6%);
}
&.rounded {
margin-right: 20px;
padding: 10px 20px;
text-align: center;
min-width: 140px;
border-radius: 20px;
@include responsive( $bp_medium ){
min-width: none;
}
}
&.outline {
color: #FFFFFF;
padding: 9px 19px;
@ -152,13 +148,10 @@ input[type="submit"] {
&[disabled],
&[disabled="disabled"]{
background: rgba(200,200,200,0.4) !important;
background: none !important;
color: $mid_grey !important;
cursor: not-allowed !important;
}
&:last-of-type {
margin-right: 0;
border-color: $mid_grey !important;
}
}