FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

refactor(search-bar): Added MD styling and moved some variables around · Java1024/ionic@3b6e178 · GitHub

  1. Java1024
  2. ionic

Repository navigation

Commit 3b6e178

Browse files
brandyscarney
committed
refactor(search-bar): Added MD styling and moved some variables around
References ionic-team#247
1 parent 03017be commit 3b6e178

5 files changed

Lines changed: 88 additions & 9 deletions

File tree

‎ionic/components/search-bar/modes/ios.scss‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22
// iOS Search Bar
33
// --------------------------------------------------
44

5+
$search-bar-ios-padding: 0 8px !default;
56
$search-bar-ios-background-color: rgba(0, 0, 0, 0.2) !default;
67
$search-bar-ios-border-color: rgba(0, 0, 0, 0.05) !default;
7-
$search-bar-ios-padding: 0 8px !default;
8-
$search-bar-ios-input-height: 28px !default;
9-
$search-bar-ios-input-text-color: #9D9D9D !default;
10-
$search-bar-ios-input-background-color: #FFFFFF !default;
11-
$search-bar-ios-input-transition: all 0.3s cubic-bezier(.25, .45, .05, 1) !default;
8+
$search-bar-ios-min-height: 44px !default;
129

1310
$search-bar-ios-input-search-icon-color: #767676 !default;
1411
$search-bar-ios-input-search-icon-svg: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 13 13'><path fill='" + $search-bar-ios-input-search-icon-color + "' d='M5,1c2.2,0,4,1.8,4,4S7.2,9,5,9S1,7.2,1,5S2.8,1,5,1 M5,0C2.2,0,0,2.2,0,5s2.2,5,5,5s5-2.2,5-5S7.8,0,5,0 L5,0z'/><line stroke='" + $search-bar-ios-input-search-icon-color + "' stroke-miterlimit='10' x1='12.6' y1='12.6' x2='8.2' y2='8.2'/></svg>" !default;
1512
$search-bar-ios-input-search-icon-size: 13px !default;
1613

14+
$search-bar-ios-input-height: 28px !default;
15+
$search-bar-ios-input-text-color: #9D9D9D !default;
16+
$search-bar-ios-input-background-color: #FFFFFF !default;
17+
$search-bar-ios-input-transition: all 0.3s cubic-bezier(.25, .45, .05, 1) !default;
18+
1719
$search-bar-ios-input-close-icon-color: #8F8E94 !default;
1820
$search-bar-ios-input-close-icon-svg: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><path fill='" + $search-bar-ios-input-close-icon-color + "' d='M403.1,108.9c-81.2-81.2-212.9-81.2-294.2,0s-81.2,212.9,0,294.2c81.2,81.2,212.9,81.2,294.2,0S484.3,190.1,403.1,108.9z M352,340.2L340.2,352l-84.4-84.2l-84,83.8L160,339.8l84-83.8l-84-83.8l11.8-11.8l84,83.8l84.4-84.2l11.8,11.8L267.6,256L352,340.2z'/></svg>" !default;
1921
$search-bar-ios-input-close-icon-size: 17px !default;
@@ -23,6 +25,7 @@ $search-bar-ios-input-close-icon-size: 17px !default;
2325
padding: $search-bar-ios-padding;
2426
background: $search-bar-ios-background-color;
2527
border-bottom: 1px solid $search-bar-ios-border-color;
28+
min-height: $search-bar-ios-min-height;
2629
}
2730

2831
.search-bar-search-icon {

‎ionic/components/search-bar/modes/md.scss‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
2+
// Material Design Search Bar
3+
// --------------------------------------------------
4+
5+
$search-bar-md-padding: 8px !default;
6+
$search-bar-md-background-color: inherit !default;
7+
8+
$search-bar-md-input-search-icon-color: #5B5B5B !default;
9+
$search-bar-md-input-search-icon-svg: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><path fill='" + $search-bar-md-input-search-icon-color + "' d='M337.509,305.372h-17.501l-6.571-5.486c20.791-25.232,33.922-57.054,33.922-93.257C347.358,127.632,283.896,64,205.135,64C127.452,64,64,127.632,64,206.629s63.452,142.628,142.225,142.628c35.011,0,67.831-13.167,92.991-34.008l6.561,5.487v17.551L415.18,448L448,415.086L337.509,305.372z M206.225,305.372c-54.702,0-98.463-43.887-98.463-98.743c0-54.858,43.761-98.742,98.463-98.742c54.7,0,98.462,43.884,98.462,98.742C304.687,261.485,260.925,305.372,206.225,305.372z'/></svg>" !default;
10+
$search-bar-md-input-search-icon-size: 20px !default;
11+
12+
$search-bar-md-input-height: 28px !default;
13+
$search-bar-md-input-box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.12) !default;
14+
$search-bar-md-input-placeholder-color: #AEAEAE !default;
15+
$search-bar-md-input-text-color: #141414 !default;
16+
$search-bar-md-input-background-color: #FFFFFF !default;
17+
$search-bar-md-input-border-radius: 2px !default;
18+
19+
$search-bar-md-input-close-icon-color: #5B5B5B !default;
20+
$search-bar-md-input-close-icon-svg: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><polygon fill='" + $search-bar-md-input-close-icon-color + "' points='405,136.798 375.202,107 256,226.202 136.798,107 107,136.798 226.202,256 107,375.202 136.798,405 256,285.798 375.202,405 405,375.202 285.798,256'/></svg>" !default;
21+
$search-bar-md-input-close-icon-size: 22px !default;
22+
23+
24+
.search-bar {
25+
padding: $search-bar-md-padding;
26+
background: $search-bar-md-background-color;
27+
}
28+
29+
.search-bar-search-icon {
30+
width: $search-bar-md-input-search-icon-size + 1;
31+
height: $search-bar-md-input-search-icon-size + 1;
32+
33+
@include svg-background-image($search-bar-md-input-search-icon-svg);
34+
background-size: $search-bar-md-input-search-icon-size;
35+
background-repeat: no-repeat;
36+
position: absolute;
37+
left: 13px;
38+
top: 13px;
39+
}
40+
41+
.search-bar-input {
42+
padding: 8px 55px;
43+
44+
height: $search-bar-md-input-height;
45+
box-shadow: $search-bar-md-input-box-shadow;
46+
47+
font-size: 1.6rem;
48+
font-weight: 400;
49+
50+
border-radius: $search-bar-md-input-border-radius;
51+
color: $search-bar-md-input-text-color;
52+
background-color: $search-bar-md-input-background-color;
53+
background-repeat: no-repeat;
54+
background-position: 8px center;
55+
56+
&::placeholder {
57+
color: $search-bar-md-input-placeholder-color;
58+
}
59+
}
60+
61+
.search-bar-close-icon {
62+
width: $search-bar-md-input-close-icon-size;
63+
height: $search-bar-md-input-close-icon-size;
64+
65+
@include svg-background-image($search-bar-md-input-close-icon-svg);
66+
background-size: $search-bar-md-input-close-icon-size;
67+
background-repeat: no-repeat;
68+
position: absolute;
69+
right: 13px;
70+
top: 13px;
71+
}

‎ionic/components/search-bar/search-bar.scss‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22
// Search Bar
33
// --------------------------------------------------
44

5-
$search-bar-min-height: 44px !default;
6-
75

86
.search-bar {
97
position: relative;
108
display: flex;
119
align-items: center;
1210
width: 100%;
13-
min-height: $search-bar-min-height;
1411
}
1512

1613
.search-bar-icon {

‎ionic/components/search-bar/search-bar.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@ import {IonicConfig} from '../../config/config';
66
import {IonicComponent, IonicView} from '../../config/decorators';
77

88
/**
9-
* TODO
9+
* @name Search Bar
10+
* @description
11+
* The Search Bar service adds an input field which can be used to search or filter items.
12+
*
13+
* @usage
14+
* ```html
15+
* <ion-search-bar ng-control="searchQuery"></ion-search-bar>
16+
* ```
1017
*/
1118
@IonicComponent({
1219
selector: 'ion-search-bar',

‎ionic/ionic.md.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"components/nav-bar/modes/md",
1616
"components/popup/modes/md",
1717
"components/radio/modes/md",
18+
"components/search-bar/modes/md",
1819
"components/switch/modes/md",
1920
"components/tabs/modes/md",
2021
"components/tap-click/ripple";

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL