Skip to content

Commit 25d184d

Browse files
committed
feat: updates from tup-ui (except paths)
TACC/tup-ui@a30002a TACC/tup-ui@24db51b TACC/tup-ui@141464f P.S. a30002a originates from TACC/tup-ui#38
1 parent 8d5129c commit 25d184d

25 files changed

+721
-27
lines changed

src/lib/_imports/components/bootstrap.container.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Add to Bootstrap styles. See:
77
88
Styleguide Components.Bootstrap.Grid
99
*/
10-
@import url("_imports/tools/media-queries.css");
10+
@import url("../tools/media-queries.css");
1111

1212
@media (--x-wide-and-above) {
1313
.container { max-width: var(--global-max-width--x-wide); }
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
Form (Bootstrap)
3+
Override Bootstrap styles. See:
4+
- [ReactStrap Forms](https://reactstrap.github.io/components/form/)
5+
- [Bootstrap Forms](https://getbootstrap.com/docs/4.4/components/forms/)
6+
Styleguide Components.Bootstrap.Form
7+
*/
8+
@import url('../settings/border.css');
9+
10+
.form-control {
11+
border: var(--global-border--normal);
12+
border-radius: 0;
13+
}
14+
input.form-control,
15+
textarea.form-control {
16+
/* FAQ: Vertical padding reduced by 1px each to near input height of design * 1.2 */
17+
padding: 6px 12px; /* 6px 10px design * 1.2 design-to-app ratio */
18+
}
19+
.input-group-prepend {
20+
z-index: 1; /* so child button border is above sibling input border */
21+
}
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
/* TODO: Migrate any other should-be-global Portal modal styles to here */
2+
/* FP-344: Consider a Modal component and a CSS module */
3+
/*
4+
Modal (Bootstrap)
5+
6+
Override Bootstrap styles. See:
7+
8+
- [ReactStrap Forms](https://reactstrap.github.io/components/modals/)
9+
- [Bootstrap Forms](https://getbootstrap.com/docs/4.4/components/modal/)
10+
11+
Styleguide Components.Bootstrap.Modal
12+
*/
13+
@import url('../tools/x-truncate.css');
14+
15+
.modal-content,
16+
.modal-header,
17+
.modal-body,
18+
.modal-footer {
19+
border-radius: 0;
20+
}
21+
.modal-content,
22+
.modal-header,
23+
.modal-body {
24+
border: none;
25+
}
26+
.modal-footer {
27+
border-left: none;
28+
border-right: none;
29+
border-bottom: none;
30+
}
31+
32+
.modal-header {
33+
background-color: var(--global-color-primary--x-light);
34+
padding: 1.35rem 1.75rem; /* (18px 23.5px design * 1.2 design-to-app ratio) */
35+
}
36+
.modal-title {
37+
color: var(--global-color-primary--xx-dark);
38+
font-weight: normal;
39+
font-size: 1.2rem; /* 16px design * 1.2 design-to-app ratio */
40+
41+
@extend .x-truncate--one-line;
42+
}
43+
44+
/* To darken close button */
45+
.modal-header .close {
46+
color: var(--global-color-primary--x-dark);
47+
opacity: 1;
48+
}
49+
/* FAQ: The specificity matches Bootstrap */
50+
.modal-header .close:not(:disabled):not(.disabled):focus,
51+
.modal-header .close:not(:disabled):not(.disabled):hover {
52+
color: var(--global-color-primary--xx-dark);
53+
opacity: 1;
54+
}
55+
56+
/* To render modal close button icon as a Cortal icon */
57+
/* CAVEAT: Pass `charCode="&#xe912;"` to `<ModalHeader>` */
58+
.modal-header .close span {
59+
/* To mimic `.icon` styles without `@extend` or `composes` (unavailable) */
60+
/* HACK: Copied (and reduced and edited) from `src/styles/trumps/icon...` */
61+
font-size: 1.5rem; /* bigger to match header text font height (like design) */
62+
font-family: Cortal-Icons !important;
63+
}
64+
65+
.modal-header.has-MuiTabs {
66+
flex-direction: row;
67+
position: relative;
68+
height: 63.5px;
69+
border-bottom: 1px solid #afafaf;
70+
padding: 5px;
71+
}
72+
.modal-header.has-MuiTabs .close {
73+
transform: translate(-25%, 25%);
74+
}

src/lib/_imports/components/bootstrap.pagination.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Style Bootstrap pagination. See:
77
88
Styleguide Components.Bootstrap.Pagination
99
*/
10-
@import url("_imports/components/c-page.css");
10+
@import url("../components/c-page.css");
1111

1212

1313

src/lib/_imports/components/c-button.css

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import url("_imports/tools/x-truncate.css");
1+
@import url("../tools/x-truncate.css");
22

33

44

@@ -235,6 +235,13 @@
235235

236236
/* Modifiers: Sizes */
237237

238+
.c-button:not(
239+
.c-button--width-short,
240+
.c-button--width-medium,
241+
.c-button--width-long,
242+
.c-button--size-small,
243+
.c-button--as-link
244+
),
238245
.c-button--width-short {
239246
width: var(--min-width);
240247
}
@@ -256,6 +263,10 @@
256263

257264
/* Elements */
258265

266+
.c-button > * {
267+
vertical-align: middle;
268+
}
269+
259270
.c-button__icon--before {
260271
margin-right: 0.5em;
261272
}

src/lib/_imports/components/c-button/c-button.hbs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,14 @@
4141
<dt>Icons</dt>
4242
<dd>
4343
<button class="c-button c-button--{{this._self.name}}
44+
{{#if supports.width}}c-button--width-long{{/if}}
4445
{{#if type}}{{type}}{{/if}}"
4546
{{#if disabled}}disabled{{/if}}>
4647
<i class="c-button__icon--before" aria-description="validate input">…</i>
4748
<span class="c-button__text">__icon--before</span>
4849
</button>
4950
<button class="c-button c-button--{{this._self.name}}
51+
{{#if supports.width}}c-button--width-long{{/if}}
5052
{{#if type}}{{type}}{{/if}}"
5153
{{#if disabled}}disabled{{/if}}>
5254
<span class="c-button__text">__icon--after</span>
@@ -58,7 +60,7 @@
5860
{{#if supports.width}}
5961
<dt>Width</dt>
6062
<dd>
61-
<button class="c-button c-button--{{this._self.name}} c-button--width-short
63+
<button class="c-button c-button--{{this._self.name}}
6264
{{#if type}}{{type}}{{/if}}"
6365
{{#if disabled}}disabled{{/if}}>
6466
<span class="c-button__text">--width-short</span>
@@ -67,9 +69,9 @@
6769
{{#if disabled}}disabled{{/if}}>
6870
<span class="c-button__text">--width-medium</span>
6971
</button>
70-
<button class="c-button c-button--{{this._self.name}} c-button--width-large {{#if type}}{{type}}{{/if}}"
72+
<button class="c-button c-button--{{this._self.name}} c-button--width-long {{#if type}}{{type}}{{/if}}"
7173
{{#if disabled}}disabled{{/if}}>
72-
<span class="c-button__text">--width-large</span>
74+
<span class="c-button__text">--width-long</span>
7375
</button>
7476
</dd>
7577
{{/if}}

src/lib/_imports/components/c-callout.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Markup: c-callout.html
77
88
Styleguide Components.Callout
99
*/
10-
@import url("_imports/tools/media-queries.css");
11-
@import url("_imports/tools/x-article-link.css");
10+
@import url("../tools/media-queries.css");
11+
@import url("../tools/x-article-link.css");
1212

1313

1414

src/lib/_imports/components/c-card.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Markup: c-card.html
1111
1212
Styleguide Components.Card
1313
*/
14-
@import url("_imports/tools/x-article-link.css");
14+
@import url("../tools/x-article-link.css");
1515

1616
/* Modifiers */
1717

src/lib/_imports/components/c-data-list.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Markup: c-data-list.html
2929
3030
Styleguide Components.DataList
3131
*/
32-
@import url("_imports/tools/x-truncate.css");
32+
@import url("../tools/x-truncate.css");
3333

3434

3535

src/lib/_imports/components/c-nav.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Markup: c-nav.html
1717
1818
Styleguide Components.Nav
1919
*/
20-
@import url("_imports/tools/media-queries.css");
20+
@import url("../tools/media-queries.css");
2121

2222

2323

0 commit comments

Comments
 (0)