diff --git a/frontend/src/App.css b/frontend/src/App.css index 1b7399d..7a7c2cf 100644 --- a/frontend/src/App.css +++ b/frontend/src/App.css @@ -84,14 +84,6 @@ html { font-size: 14px; } -.multi-switch-container { - width: 180px; - background-color: white; - border-color: black; - height: 30px; - margin-left: 14px; - z-index: 0; -} .container-fluid { display: flex; @@ -117,7 +109,7 @@ html { width: 89px; } -.test-example{ +.test-example { padding: 2px; } @@ -1007,6 +999,14 @@ h5 { text-underline-offset: 1px; } + .switchDescendants h3 { + color: #e16e00; + text-transform: uppercase; + margin-left: 3px !important; + margin-top: 14px; + font-size: 12px; + } + .ReactModal__Content--after-open { width: 269px; font-size: 12px; @@ -1020,7 +1020,7 @@ h5 { outline: none !important; padding: 16px !important; } - + .ReactModal__Content--after-open p { font-size: 14px; font-weight: normal; @@ -1043,11 +1043,11 @@ h5 { /* margin-left: 27px; */ } - .container-fluid{ + .container-fluid { display: flex; width: 100%; margin-right: 0px; - margin-left: 0px; + margin-left: 0px; justify-content: center; height: 35px; } @@ -1061,7 +1061,7 @@ h5 { flex-direction: row-reverse; align-content: space-between; justify-content: center; -} + } .exampleQueries { border: none; diff --git a/frontend/src/components/Datasets/ResultsDatasets.css b/frontend/src/components/Datasets/ResultsDatasets.css index 293eb94..4344b93 100644 --- a/frontend/src/components/Datasets/ResultsDatasets.css +++ b/frontend/src/components/Datasets/ResultsDatasets.css @@ -115,7 +115,7 @@ margin-bottom: -3px; } .tittle { - width: 40vw; + width: 38vw; background: #c8d4e6; border-radius: 2px; /* height: 80px; */ @@ -216,7 +216,7 @@ justify-content: flex-start; } .tittle { - width: 80vw; + width: 71vw; background: #c8d4e6; border-radius: 2px; /* height: 80px; */ diff --git a/frontend/src/components/Individuals/Individuals.css b/frontend/src/components/Individuals/Individuals.css index 3717ea3..92963c1 100644 --- a/frontend/src/components/Individuals/Individuals.css +++ b/frontend/src/components/Individuals/Individuals.css @@ -1,3 +1,4 @@ + .resultsIndividuals { display: flex; margin-top: 9px; @@ -318,20 +319,31 @@ h4 { } } -@media (max-width: 1349px) { +@media (min-width: 872px){ .tittleResults h1 { font-size: 12px; color: black !important; } + + +.multi-switch-container { + width: 237px !important; + background-color: white; + border-color: black; + height: 29px !important; + margin-left: 14px; + z-index: 0; +} + } -@media (max-width: 800px) { + +@media (max-width: 873px) { label { font-size: 10px; } - h3{ - width: 70vw; + h3 { color: #c11524; text-transform: uppercase; margin-top: 17px; @@ -359,14 +371,22 @@ h4 { .multi-switch-container label { font-size: 10px !important; - width: 36px !important; - } + width: 53px !important; +} .multi-switch-container span { - width: 37px !important; - left: 2px; + width: 45px !important; height: 23px; line-height: 23px; background-color: rgb(226, 147, 72); } + + .multi-switch-container { + width: 219px !important; + background-color: white; + border-color: black; + height: 29px !important; + margin-left: 14px; + z-index: 0; + } } diff --git a/frontend/src/components/Layout/Layout.js b/frontend/src/components/Layout/Layout.js index 6dd0867..31d4c54 100644 --- a/frontend/src/components/Layout/Layout.js +++ b/frontend/src/components/Layout/Layout.js @@ -1,4 +1,5 @@ import '../../App.css' +import './LayoutVariantsTable.css' import FilteringTerms from '../FilteringTerms/FilteringTerms' import { NavLink } from 'react-router-dom' @@ -271,16 +272,20 @@ function Layout (props) { if (props.collection === 'Individuals') { setExampleQ([ ['Weight>100'], - ['NCIT:C16576','female'], + ['NCIT:C16576', 'female'], ['geographicOrigin=%land%'], ['geographicOrigin!England'], - ['NCIT:C42331','African'], - ['NCIT:C4784','Cardiovascular Neoplasm'] + ['NCIT:C42331', 'African'], + ['NCIT:C4784', 'Cardiovascular Neoplasm'] ]) } else if (props.collection === 'Variant') { setExampleQ([['GENO:GENO_0000458']]) } else if (props.collection === 'Biosamples') { - setExampleQ([['UBERON:0000178','blood'], ['EFO:0009654','reference sample'], ['sampleOriginType:blood']]) + setExampleQ([ + ['UBERON:0000178', 'blood'], + ['EFO:0009654', 'reference sample'], + ['sampleOriginType:blood'] + ]) } else if (props.collection === 'Runs') { setExampleQ([['']]) } else if (props.collection === 'Analyses') { @@ -576,12 +581,11 @@ function Layout (props) { src='../light-bulb.png' alt='bulbIcon' > -
+ Overall Impression: An elegant, malty German + amber lager with a clean, rich, toasty and bready malt flavor, + restrained bitterness, and a dry finish that encourages + another drink. The overall malt impression is soft, elegant, + and complex, with a rich aftertaste that is never cloying or + heavy. +
++ History: As the name suggests, brewed as a + stronger “March beer” in March and lagered in cold caves over + the summer. Modern versions trace back to the lager developed + by Spaten in 1841, contemporaneous to the development of + Vienna lager. However, the Märzen name is much older than + 1841; the early ones were dark brown, and in Austria the name + implied a strength band (14 °P) rather than a style. The + German amber lager version (in the Viennese style of the time) + was first served at Oktoberfest in 1872, a tradition that + lasted until 1990 when the golden Festbier was adopted as the + standard festival beer. +
++ Overall Impression: An elegant, malty German + amber lager with a balanced, complementary beechwood smoke + character. Toasty-rich malt in aroma and flavor, restrained + bitterness, low to high smoke flavor, clean fermentation + profile, and an attenuated finish are characteristic. +
++ History: A historical specialty of the city + of Bamberg, in the Franconian region of Bavaria in Germany. + Beechwood-smoked malt is used to make a Märzen-style amber + lager. The smoke character of the malt varies by maltster; + some breweries produce their own smoked malt (rauchmalz). +
++ Overall Impression: A dark, strong, malty + German lager beer that emphasizes the malty-rich and somewhat + toasty qualities of continental malts without being sweet in + the finish. +
++ History: Originated in the Northern German + city of Einbeck, which was a brewing center and popular + exporter in the days of the Hanseatic League (14th to 17th + century). Recreated in Munich starting in the 17th century. + The name “bock” is based on a corruption of the name “Einbeck” + in the Bavarian dialect, and was thus only used after the beer + came to Munich. “Bock” also means “Ram” in German, and is + often used in logos and advertisements. +
+