Skip to content

Commit 47242d4

Browse files
authored
Merge pull request #1071 from openmsupply/pre-build-B-1.0.12
Pre build b 1.0.12
2 parents 866fda0 + 847c89f commit 47242d4

33 files changed

+1136
-607
lines changed

semantic/src/site/globals/site.overrides

Lines changed: 142 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,16 @@ a:hover {
7272
justify-content: center;
7373
}
7474

75-
.flex-row-space_between {
75+
.flex-row-space-between {
7676
.flex-row();
7777
justify-content: space-between;
7878
}
7979

80+
.flex-row-space_evenly {
81+
.flex-row();
82+
justify-content: space-evenly;
83+
}
84+
8085
.flex-row-start {
8186
.flex-row();
8287
justify-content: flex-start;
@@ -97,8 +102,18 @@ a:hover {
97102
align-items: center;
98103
}
99104

100-
.flex-row-space_between-center {
101-
.flex-row-space_between();
105+
.flex-row-space-between-center {
106+
.flex-row-space-between();
107+
align-items: center;
108+
}
109+
110+
.flex-row-space-between-center-wrap {
111+
.flex-row-space-between-center();
112+
flex-wrap: wrap;
113+
}
114+
115+
.flex-row-space_evenly-center {
116+
.flex-row-space_evenly();
102117
align-items: center;
103118
}
104119

@@ -121,6 +136,12 @@ a:hover {
121136
.flex-row-start-center;
122137
flex-wrap: wrap;
123138
}
139+
140+
.flex-row-end {
141+
.flex-row();
142+
width: 100%;
143+
justify-content: flex-end;
144+
}
124145
.flex-column {
125146
display: flex;
126147
flex-direction: column;
@@ -174,6 +195,30 @@ a:hover {
174195
margin: 0px !important;
175196
}
176197

198+
.full-width-container {
199+
width: 100%;
200+
}
201+
202+
.text-block-width {
203+
max-width: 800px;
204+
}
205+
206+
.right-margin-space-10 {
207+
margin-right: 10px !important;
208+
}
209+
210+
.left-margin-space-10 {
211+
margin-left: 10px !important;
212+
}
213+
214+
.flex-gap-10 {
215+
gap: 10px;
216+
}
217+
218+
.flex-gap-20 {
219+
gap: 20px;
220+
}
221+
177222
/*--------------------------------
178223
Login page
179224
---------------------------------*/
@@ -1603,18 +1648,27 @@ a:hover {
16031648
.io-wrapper {
16041649
.flex-row();
16051650
align-items: stretch;
1606-
margin: 2px;
1651+
margin: 2px 2px 8px;
1652+
min-height: 25px;
16071653
.io-component {
16081654
flex-grow: 1;
16091655
margin: 0px;
1610-
text-align: center;
1611-
white-space: nowrap;
1612-
border: 2px solid @indicatorColor;
1656+
border: 2px solid @surfacesLight;
16131657
border-radius: @borderRadius;
16141658
font-size: 12px;
16151659
padding: 2px;
16161660
padding-left: 10px;
16171661
padding-right: 10px;
1662+
line-height: 1.4285em // resets height set by Modal;;
1663+
}
1664+
1665+
.ui.checkbox {
1666+
vertical-align: middle;
1667+
}
1668+
1669+
.io-component-negative {
1670+
.io-component();
1671+
border: 1px solid @surfacesDark;
16181672
}
16191673

16201674
input,
@@ -1624,18 +1678,24 @@ a:hover {
16241678
padding: 0px !important;
16251679
font-size: 12px !important;
16261680
width: none !important;
1627-
min-width: 200px;
16281681
}
16291682

16301683
.key {
16311684
border-end-end-radius: 0px;
16321685
border-start-end-radius: 0px;
1633-
background-color: @indicatorColor;
1686+
background-color: @surfacesLight;
16341687
a {
16351688
text-decoration: underline;
16361689
}
16371690
}
16381691

1692+
.key-negative {
1693+
.key();
1694+
background-color: @headersInteractiveMed;
1695+
border: 1px solid @headersInteractiveMed;
1696+
color: white;
1697+
}
1698+
16391699
.value {
16401700
border-start-start-radius: 0px !important;
16411701
border-end-start-radius: 0px !important;
@@ -1646,7 +1706,7 @@ a:hover {
16461706

16471707
.from-existing-dropdown {
16481708
font-size: 12px !important;
1649-
border: 2px solid @indicatorColor !important;
1709+
border: 1px solid @surfacesDark !important;
16501710
border-radius: @borderRadius !important;
16511711
margin: 2px !important;
16521712
}
@@ -1661,7 +1721,7 @@ a:hover {
16611721
.longer {
16621722
input,
16631723
textarea {
1664-
min-width: 600px !important;
1724+
min-width: 500px !important;
16651725
}
16661726
}
16671727
.long {
@@ -1693,7 +1753,15 @@ a:hover {
16931753
width: @applicationListWidth;
16941754
.template-builder-info-bar {
16951755
.flex-row();
1696-
justify-content: center;
1756+
justify-content: flex-end;
1757+
width: 100%;
1758+
flex-wrap: wrap;
1759+
}
1760+
.template-builder-content {
1761+
.flex-column-center();
1762+
background-color: @surfacesWhite;
1763+
padding: 20px 2rem 30px;
1764+
margin-top: 20px;
16971765
}
16981766
.template-builder-tabs {
16991767
.flex-row();
@@ -1714,7 +1782,7 @@ a:hover {
17141782
margin: 3px;
17151783
padding: 20px;
17161784
border-radius: @borderRadius;
1717-
background: @surfacesWhite;
1785+
background: @surfacesLight;
17181786
p {
17191787
font-size: @slightlySmallerText;
17201788
margin-top: 10px;
@@ -1734,15 +1802,30 @@ a:hover {
17341802
}
17351803
}
17361804

1805+
.page-controller {
1806+
background-color: @surfacesLight;
1807+
width: fit-content;
1808+
padding: 10px;
1809+
border: 1px solid @surfacesMed;
1810+
border-radius: @borderRadius;
1811+
margin: 15px;
1812+
}
1813+
1814+
.filter-joins {
1815+
.ui.label {
1816+
margin-right: 7px;
1817+
margin-bottom: 7px;
1818+
}
1819+
}
1820+
17371821
.builder-page-elements-wrapper {
17381822
background: white;
17391823
padding: 10px;
1740-
margin: 10px;
1824+
min-width: 900px;
17411825
.element-config-options-container {
17421826
.flex-row();
17431827
align-items: flex-start;
17441828
justify-content: flex-end;
1745-
width: 100px;
17461829
margin-right: 30px;
17471830
margin: 5px;
17481831
}
@@ -1752,15 +1835,17 @@ a:hover {
17521835
}
17531836

17541837
.evaluation-container {
1838+
width: 100%;
17551839
border-radius: @borderRadius;
17561840
border: 1px solid @indicatorColor;
17571841
padding: 2px;
1758-
padding-left: 5px;
1759-
padding-right: 5px;
1842+
padding-left: 10px;
1843+
padding-right: 10px;
17601844
margin: 2px;
17611845
background-color: @surfacesWhite;
17621846
.evaluation-container-title {
1763-
.flex-row-center-center();
1847+
.flex-row-start-center();
1848+
white-space: nowrap;
17641849
}
17651850
.evaluation-container-content {
17661851
.flex-row() !important;
@@ -1770,29 +1855,58 @@ a:hover {
17701855
}
17711856

17721857
.config-modal {
1773-
width: 90% !important;
1858+
min-width: 700px !important;
1859+
max-width: 90% !important;
1860+
width: fit-content !important;
1861+
border-radius: @borderRadius !important;
17741862

17751863
.config-modal-container {
17761864
.flex-column-center-center();
1777-
padding: 10px;
1865+
padding: 0 0 10px 0;
1866+
border-radius: @borderRadius !important;
17781867
}
17791868
.config-modal-info {
17801869
background-color: @surfacesWhite !important;
1870+
display: flex;
1871+
flex-direction: column;
1872+
align-items: center;
1873+
padding-left: 20px;
1874+
padding-right: 20px;
1875+
}
1876+
.config-modal-header {
1877+
.flex-row-center-center();
1878+
gap: 50px;
1879+
background-color: @surfacesLight;
1880+
width: 100%;
1881+
margin-top: 0;
1882+
margin-bottom: 10px;
1883+
padding: 10px;
1884+
border-top-left-radius: @borderRadius;
1885+
border-top-right-radius: @borderRadius;
17811886
}
17821887
}
17831888

1889+
.alert-success {
1890+
position: absolute !important;
1891+
bottom: 60px;
1892+
left: 20px;
1893+
width: fit-content !important;
1894+
box-shadow: 0 0 0 1px rgba(34, 36, 38, 0.22) inset, 0 2px 4px 0 rgba(34, 36, 38, 0.12),
1895+
0 2px 10px 0 rgba(34, 36, 38, 0.15) !important;
1896+
}
1897+
17841898
.object-properties-container {
17851899
.flex-column-start-center();
17861900
margin-left: 30px;
1901+
max-width: 500px;
17871902
}
17881903
.evaluator-operator-container {
17891904
.flex-column-start-stretch();
17901905
background: rgba(0, 0, 0, 0.03);
17911906
padding: 5px;
17921907
margin: 2px;
17931908
border-radius: @borderRadius;
1794-
border: 2px solid rgba(0, 0, 0, 0.2);
1795-
background-color: rgba(50, 252, 50, 0.01);
1909+
border: 1px solid @surfacesMed;
17961910
}
17971911

17981912
.config-container {
@@ -1805,7 +1919,12 @@ a:hover {
18051919

18061920
.config-container-alternate {
18071921
.config-container();
1808-
background-color: rgba(0, 0, 0, 0.03);
1922+
background-color: @surfacesLight;
1923+
}
1924+
1925+
.config-container-outline {
1926+
.config-container();
1927+
border: 1px solid @surfacesMed;
18091928
}
18101929

18111930
/*******************************

0 commit comments

Comments
 (0)