Skip to content

Commit 14cf99a

Browse files
Merge pull request #22 from SAP/feature/Issue#7-status-indicator
Issue#7: adds status for label component
2 parents ff4b228 + f1286c6 commit 14cf99a

File tree

7 files changed

+1303
-382
lines changed

7 files changed

+1303
-382
lines changed

src/App.css

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6295,8 +6295,14 @@ input-addon
62956295
.App {
62966296
background-color: white; }
62976297

6298-
.fd-tile__content .fd-badge, .fd-tile__content .fd-label, .fd-tile__content .fd-tag,
6299-
.fd-tile__content [class*='fd-button'], .fd-tile__content [class*='fd-identifier'], .fd-tile__content [class*='fd-image'], .fd-tile__content [class*='fd-form'] {
6298+
.fd-tile__content .fd-badge,
6299+
.fd-tile__content .fd-label,
6300+
.fd-tile__content .fd-status-label,
6301+
.fd-tile__content .fd-tag,
6302+
.fd-tile__content [class*='fd-button'],
6303+
.fd-tile__content [class*='fd-identifier'],
6304+
.fd-tile__content [class*='fd-image'],
6305+
.fd-tile__content [class*='fd-form'] {
63006306
margin-right: 10px; }
63016307

63026308
.fd-tile__content .fd-button--grouped {
@@ -6338,7 +6344,7 @@ input-addon
63386344
color: inherit; }
63396345

63406346
.logo-subtitle {
6341-
font-size: .75rem; }
6347+
font-size: 0.75rem; }
63426348

63436349
.sidebar {
63446350
color: #21262c;
@@ -6354,7 +6360,7 @@ input-addon
63546360
.nav-item {
63556361
display: block;
63566362
color: #21262c;
6357-
font-size: .875rem;
6363+
font-size: 0.875rem;
63586364
position: relative;
63596365
padding: 13px 40px; }
63606366

@@ -6391,10 +6397,14 @@ input-addon
63916397
.header {
63926398
margin: 12px 0; }
63936399

6394-
input[type=text], input[type=password],
6395-
input[type=email], input[type=url],
6396-
input[type=search], input[type=tel],
6397-
input[type=number], input[type=date],
6400+
input[type='text'],
6401+
input[type='password'],
6402+
input[type='email'],
6403+
input[type='url'],
6404+
input[type='search'],
6405+
input[type='tel'],
6406+
input[type='number'],
6407+
input[type='date'],
63986408
textarea {
63996409
border-radius: 0; }
64006410

src/App.scss

Lines changed: 105 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,193 +1,200 @@
1-
2-
$fd-icons-path: "../node_modules/fundamental-ui/scss/icons/";
3-
$fd-fonts-path: "../node_modules/fundamental-ui/dist/fonts/";
1+
$fd-icons-path: '../node_modules/fundamental-ui/scss/icons/';
2+
$fd-fonts-path: '../node_modules/fundamental-ui/dist/fonts/';
43
@import '../node_modules/fundamental-ui/scss/all.scss';
54

65
.App {
7-
background-color: white;
6+
background-color: white;
87
}
98

109
.fd-tile__content {
11-
.fd-badge, .fd-label, .fd-tag,
12-
[class*='fd-button'], [class*='fd-identifier'], [class*='fd-image'], [class*='fd-form'] {
13-
margin-right: 10px;
14-
}
15-
16-
.fd-button--grouped {
17-
margin-right: 0;
18-
}
19-
20-
.fd-input-group {
21-
[class*='fd-button'] {
22-
margin-right: 0;
10+
.fd-badge,
11+
.fd-label,
12+
.fd-status-label,
13+
.fd-tag,
14+
[class*='fd-button'],
15+
[class*='fd-identifier'],
16+
[class*='fd-image'],
17+
[class*='fd-form'] {
18+
margin-right: 10px;
19+
}
20+
21+
.fd-button--grouped {
22+
margin-right: 0;
23+
}
24+
25+
.fd-input-group {
26+
[class*='fd-button'] {
27+
margin-right: 0;
28+
}
2329
}
24-
}
2530
}
2631

2732
.fd-tabs__content {
28-
padding-top: 10px;
29-
padding-bottom: 10px;
33+
padding-top: 10px;
34+
padding-bottom: 10px;
3035
}
3136

3237
.docs-component {
33-
margin-bottom: -28px;
34-
border-radius: 4px;
35-
border-bottom-left-radius: 0;
36-
border-bottom-right-radius: 0;
37-
padding-bottom: 8px;
38-
border: 1px solid #ccc;
39-
40-
38+
margin-bottom: -28px;
39+
border-radius: 4px;
40+
border-bottom-left-radius: 0;
41+
border-bottom-right-radius: 0;
42+
padding-bottom: 8px;
43+
border: 1px solid #ccc;
4144
}
4245

4346
.fd-side-nav--icons {
44-
max-width: 65px;
47+
max-width: 65px;
4548
}
4649

47-
.container{
50+
.container {
4851
display: flex;
4952
justify-content: space-between;
5053
height: 100vh;
5154
overflow: hidden;
5255
width: 90%;
5356
margin-left: auto;
5457
margin-right: auto;
55-
}
56-
57-
.logo {
58+
}
59+
60+
.logo {
5861
font-size: 1.25rem;
5962
margin-bottom: 0;
6063
display: flex;
6164
justify-content: center;
6265
> a {
63-
color: inherit;
66+
color: inherit;
6467
}
65-
}
66-
67-
.logo-subtitle {
68-
font-size: .75rem;
69-
}
70-
71-
.sidebar {
68+
}
69+
70+
.logo-subtitle {
71+
font-size: 0.75rem;
72+
}
73+
74+
.sidebar {
7275
color: #21262c;
7376
min-width: 16rem;
7477
background-color: #f1f3f6;
75-
}
76-
77-
.nav {
78+
}
79+
80+
.nav {
7881
list-style: none;
7982
border-top: 2px solid #dbe7f3;
8083
height: 90%;
8184
overflow: auto;
82-
}
83-
84-
.nav-item {
85+
}
86+
87+
.nav-item {
8588
display: block;
8689
color: #21262c;
87-
font-size: .875rem;
90+
font-size: 0.875rem;
8891
position: relative;
8992
padding: 13px 40px;
90-
}
91-
92-
.side-nav__headers{
93+
}
94+
95+
.side-nav__headers {
9396
color: #424e5a;
9497
padding: 15px 20px;
9598
display: block;
96-
}
97-
98-
.nav-item--selected {
99+
}
100+
101+
.nav-item--selected {
99102
border-left: 6px solid #2fd0c8;
100-
}
103+
}
101104

102-
.nav-item:hover,
103-
.nav-item--active {
105+
.nav-item:hover,
106+
.nav-item--active {
104107
color: #424e5a;
105108
border-left: 6px solid #2fd0c8;
106109
padding-left: 34px;
107-
}
108-
109-
.content {
110+
}
111+
112+
.content {
110113
flex-grow: 1;
111114
overflow-y: scroll;
112115
padding-bottom: 2rem;
113116
background-color: white;
114-
}
115-
116-
.content-margin {
117+
}
118+
119+
.content-margin {
117120
margin-right: auto;
118121
margin-left: auto;
119122
padding-left: 1rem;
120123
padding-right: 1rem;
121-
}
124+
}
122125

123-
.property-header {
126+
.property-header {
124127
text-align: left;
125128
padding-right: 15px;
126-
}
129+
}
127130

128-
.header {
131+
.header {
129132
margin: 12px 0;
130-
}
133+
}
131134

132-
input[type=text], input[type=password],
133-
input[type=email], input[type=url],
134-
input[type=search], input[type=tel],
135-
input[type=number], input[type=date],
135+
input[type='text'],
136+
input[type='password'],
137+
input[type='email'],
138+
input[type='url'],
139+
input[type='search'],
140+
input[type='tel'],
141+
input[type='number'],
142+
input[type='date'],
136143
textarea {
137-
border-radius: 0;
144+
border-radius: 0;
138145
}
139146

140147
.fd-side-nav {
141-
max-width: 250px;
148+
max-width: 250px;
142149
}
143150

144151
.row {
145-
display: flex;
152+
display: flex;
146153
}
147154

148155
.col {
149-
padding-right: 15px;
150-
padding-left: 15px;
151-
-webkit-box-flex: 1;
152-
flex: 1;
156+
padding-right: 15px;
157+
padding-left: 15px;
158+
-webkit-box-flex: 1;
159+
flex: 1;
153160
}
154161

155162
.form-group {
156-
max-height: 500px;
157-
overflow-y: scroll;
158-
display: block;
159-
padding: 20px;
160-
border: 1px #eee solid;
163+
max-height: 500px;
164+
overflow-y: scroll;
165+
display: block;
166+
padding: 20px;
167+
border: 1px #eee solid;
161168
}
162169

163170
.schema {
164-
display: block;
165-
padding: 20px;
166-
border: 1px #eee solid;
171+
display: block;
172+
padding: 20px;
173+
border: 1px #eee solid;
167174
}
168175

169176
.form-group-sublevel {
170-
display: block;
171-
padding: 20px;
172-
border: 1px #eee solid;
177+
display: block;
178+
padding: 20px;
179+
border: 1px #eee solid;
173180
}
174181

175182
.tn-form__label {
176-
padding-left: 25px;
183+
padding-left: 25px;
177184
}
178185

179186
.fd-calendar__content {
180-
background: white;
187+
background: white;
181188
}
182189

183190
.fd-date-picker {
184-
display: inline-block;
191+
display: inline-block;
185192
}
186193

187194
.demo-icon-wrapper {
188-
padding: 10px;
189-
float: left;
190-
width: 16%;
191-
text-align: center;
192-
height: 120px;
193-
}
195+
padding: 10px;
196+
float: left;
197+
width: 16%;
198+
text-align: center;
199+
height: 120px;
200+
}

0 commit comments

Comments
 (0)