Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

UI fixings: Unify forms, shadow to main tabs #310

Merged
merged 5 commits into from
Jun 2, 2017
Merged

UI fixings: Unify forms, shadow to main tabs #310

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b65f73a
Make search form similar to send form
reyraa Jun 1, 2017
1fad1fb
Add shadow to main tabs
reyraa Jun 2, 2017
935f286
Merge branch 'development' into 301-unifying-forms
reyraa Jun 2, 2017
96c11de
Merge branch 'development' into 301-unifying-forms
reyraa Jun 2, 2017
4aa23a5
Merge branch 'development' into 301-unifying-forms
reyraa Jun 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/components/delegates/delegates.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ delegates {
}
}

.md-title.search {
font-size: 1em;
font-weight: normal;
md-input-container {
width: 232px;
}
}

.search-append {
color: #aaa;
cursor: pointer;
Expand Down
2 changes: 1 addition & 1 deletion src/components/delegates/delegates.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ div.offline-hide
md-card(flex-gt-xs=100)
md-card-title
md-card-title-text
span.md-title(layout='row')
span.md-title.search(layout='row')
md-input-container.md-block
label Search
input.search(type='text', name='name', ng-model='search', ng-model-options='{ debounce: 200 }')
Expand Down
7 changes: 6 additions & 1 deletion src/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,14 @@ md-tabs.main-tabs {
md-tabs-wrapper {
margin: 0 8px;

md-tabs-canvas {
margin-left: -2px;
}

&.md-stretch-tabs md-pagination-wrapper {
width: auto;
display: block;
padding-left: 2px;
}
md-ink-bar {
bottom: auto;
Expand All @@ -120,7 +125,7 @@ md-tabs.main-tabs {
box-shadow: inset 0px -1px 1px -1px rgba(0, 0, 0, 0.12);
&.md-active {
background: white;
box-shadow: 0px -2px 1px 0px rgba(0,0,0,0.54);
box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.12);
}
}
}