Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
Breeze
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DeStream-public
Breeze
Commits
3780b9f7
Commit
3780b9f7
authored
Oct 13, 2017
by
dev0tion
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'design' of
http://www.github.com/stratisproject/breeze
into design
parents
b084b177
d442966c
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
65 additions
and
26 deletions
+65
-26
dashboard.component.html
Breeze.UI/src/app/wallet/dashboard/dashboard.component.html
+1
-1
send.component.html
Breeze.UI/src/app/wallet/send/send.component.html
+16
-1
_buttons.scss
Breeze.UI/src/scss/_buttons.scss
+1
-1
_custom.scss
Breeze.UI/src/scss/_custom.scss
+18
-9
_dropdown.scss
Breeze.UI/src/scss/_dropdown.scss
+1
-1
_modal.scss
Breeze.UI/src/scss/_modal.scss
+1
-1
_variables.scss
Breeze.UI/src/scss/_variables.scss
+2
-2
styles.css
Breeze.UI/src/styles.css
+24
-9
styles.css.map
Breeze.UI/src/styles.css.map
+1
-1
No files found.
Breeze.UI/src/app/wallet/dashboard/dashboard.component.html
View file @
3780b9f7
...
...
@@ -8,7 +8,7 @@
<div
class=
"col-xs-12 col-md-3 text-left"
>
<h5>
Active Wallet
</h5>
<p
class=
"lead"
>
<s
trong>
{{ walletName }}
</strong
>
<s
pan
class=
"walletName text-capitalize"
>
{{ walletName }}
</span
>
</p>
</div>
<div
class=
"col-xs-12 col-md-3 text-left"
>
...
...
Breeze.UI/src/app/wallet/send/send.component.html
View file @
3780b9f7
...
...
@@ -40,16 +40,31 @@
</div> -->
<div
class=
"form-group clearfix"
>
<label
for=
"feeSlider"
>
Fee
</label>
<input
class=
"form-control col text-center"
formControlName=
"fee"
type=
"range"
min=
"1"
max=
"3"
value=
"2"
>
<!-- fee buttons -->
<div
class=
"radioButtons"
data-toggle=
"buttons"
>
<label
class=
"btn btn-outline-danger"
>
<input
type=
"radio"
name=
"options"
id=
"option1"
autocomplete=
"off"
>
Slow
</label>
<label
class=
"btn btn-outline-warning"
>
<input
type=
"radio"
name=
"options"
id=
"option2"
autocomplete=
"off"
checked
>
Medium
</label>
<label
class=
"btn btn-outline-success"
>
<input
type=
"radio"
name=
"options"
id=
"option3"
autocomplete=
"off"
>
Fast
</label>
</div>
<p>
Here is the line to put the fee estimation.
</p>
<!-- /fee buttons -->
</div>
<div
class=
"form-group clearfix"
>
<label
for=
"walletPassword"
>
Wallet Password
</label>
<input
type=
"password"
class=
"form-control form-control-success"
formControlName=
"password"
id=
"walletPassword"
placeholder=
"Please enter your wallet password."
>
<div
*
ngIf=
"formErrors.password"
class=
"form-control-feedback"
>
{{formErrors.password}}
</div>
</div>
<!--
<button type="button" class="btn btn-link" (click)="buildTransaction()" [disabled]="!sendForm.valid">Estimate Fee</button>
<label *ngIf="estimatedFee">Estimated Fee: </label>
<label *ngIf="estimatedFee">{{ estimatedFee | coinNotation }} {{ coinUnit }}</label>
-->
</form>
<!-- /form-->
</div>
...
...
Breeze.UI/src/scss/_buttons.scss
View file @
3780b9f7
...
...
@@ -30,7 +30,7 @@
&
.disabled
,
&
:disabled
{
cursor
:
$cursor-disabled
;
opacity
:
1
;
opacity
:
0
;
@include
box-shadow
(
none
);
}
...
...
Breeze.UI/src/scss/_custom.scss
View file @
3780b9f7
...
...
@@ -143,12 +143,17 @@ em {
font-size
:
1
.85em
;
font-weight
:
500
;
margin-bottom
:
0
;
.walletName
{
font-size
:
0
.7em
;
font-weight
:
normal
;
}
.h2
{
font-size
:
2em
;
font-weight
:
600
;
}
small
{
font-size
:
.
7
5em
;
font-size
:
.5em
;
padding-left
:
.5em
;
font-weight
:
400
;
}
...
...
@@ -248,20 +253,24 @@ em {
}
}
#modalSend
{
label
{
label
{
font-size
:
.825em
;}
.float-right
{
a
{
text-decoration
:
underline
;
&
:hover
{
text-decoration
:
none
;}}}
// Fee Buttons
.radioButtons
{
.btn
{
border-radius
:
50px
;
}
}
p
{
color
:
$blue
;
text-transform
:
uppercase
;
font-size
:
.825em
;
font-style
:
italic
;
}
.
float-right
{
a
{
text-decoration
:
underline
;
&
:hover
{
text-decoration
:
none
;}}
}
.
btn-link
{
padding
:
0
!
important
;
}
}
#modalReceive
{
.modal-body
{
padding
:
0
3em
;}
label
{
color
:
$blue
;
text-transform
:
uppercase
;
font-size
:
.825em
;
}
label
{
font-size
:
.825em
;}
}
#modalDetail
,
#modalCheck
,
#modalSettings
{
.blockLabel
{
...
...
Breeze.UI/src/scss/_dropdown.scss
View file @
3780b9f7
...
...
@@ -51,7 +51,7 @@
background-color
:
$dropdown-bg
;
background-clip
:
padding-box
;
border
:
$dropdown-border-width
solid
$dropdown-border-color
;
@include
border-radius
(
$border-radius
)
;
border-radius
:
50px
;
@include
box-shadow
(
$dropdown-box-shadow
);
}
...
...
Breeze.UI/src/scss/_modal.scss
View file @
3780b9f7
...
...
@@ -91,7 +91,7 @@
.modal-title
{
text-align
:
center
;
line-height
:
$modal-title-line-height
;
margin-bottom
:
2
em
;
margin-bottom
:
1
em
;
color
:
$blue
;
font-size
:
1em
;
}
...
...
Breeze.UI/src/scss/_variables.scss
View file @
3780b9f7
...
...
@@ -798,8 +798,8 @@ $badge-pill-border-radius: 10rem !default;
// Padding applied to the modal body
$modal-inner-padding
:
3em
!
default
;
$modal-dialog-margin
:
3
0px
!
default
;
$modal-dialog-sm-up-margin-y
:
3
0px
!
default
;
$modal-dialog-margin
:
2
0px
!
default
;
$modal-dialog-sm-up-margin-y
:
2
0px
!
default
;
$modal-title-line-height
:
$line-height-base
!
default
;
...
...
Breeze.UI/src/styles.css
View file @
3780b9f7
...
...
@@ -174,13 +174,18 @@ em.display-4 {
margin-bottom
:
0
;
}
.jumbotron
.lead
.walletName
{
font-size
:
0.7em
;
font-weight
:
normal
;
}
.jumbotron
.lead
.h2
{
font-size
:
2em
;
font-weight
:
600
;
}
.jumbotron
.lead
small
{
font-size
:
.
7
5em
;
font-size
:
.5em
;
padding-left
:
.5em
;
font-weight
:
400
;
}
...
...
@@ -292,8 +297,6 @@ em.display-4 {
}
#modalSend
label
{
color
:
#7385A0
;
text-transform
:
uppercase
;
font-size
:
.825em
;
}
...
...
@@ -305,13 +308,25 @@ em.display-4 {
text-decoration
:
none
;
}
#modalSend
.radioButtons
.btn
{
border-radius
:
50px
;
}
#modalSend
p
{
color
:
#7385A0
;
font-size
:
.825em
;
font-style
:
italic
;
}
#modalSend
.btn-link
{
padding
:
0
!important
;
}
#modalReceive
.modal-body
{
padding
:
0
3em
;
}
#modalReceive
label
{
color
:
#7385A0
;
text-transform
:
uppercase
;
font-size
:
.825em
;
}
...
...
@@ -3251,7 +3266,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.btn.disabled
,
.btn
:disabled
{
cursor
:
not-allowed
;
opacity
:
1
;
opacity
:
0
;
}
.btn
:active
,
.btn.active
{
...
...
@@ -5752,7 +5767,7 @@ button.close {
.modal-dialog {
position: relative;
width: auto;
margin:
3
0px;
margin:
2
0px;
}
.modalBg {
...
...
@@ -5797,7 +5812,7 @@ button.close {
.modal-title {
text-align: center;
line-height: 1.5;
margin-bottom:
2
em;
margin-bottom:
1
em;
color: #7385A0;
font-size: 1em;
}
...
...
@@ -5834,7 +5849,7 @@ button.close {
@media (min-width: 576px) {
.modal-dialog {
max-width: 500px;
margin:
3
0px auto;
margin:
2
0px auto;
}
.modal-sm {
max-width: 360px;
...
...
Breeze.UI/src/styles.css.map
View file @
3780b9f7
This source diff could not be displayed because it is too large. You can
view the blob
instead.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment