diff --git a/about.html b/about.html index 7a17189..fcb1465 100644 --- a/about.html +++ b/about.html @@ -22,7 +22,6 @@
Milkymist was founded in summer 2007 by Sébastien Bourdeauducq. The open source project tackled the development of a system-on-chip design capable of running MilkDrop. The name "Milkymist" was chosen to evoke a parallel MilkDrop. The development was no small task, as it required designing and/or integrating a powerful 32-bit microprocessor core, basic peripherals, many interfaces, a fast SDRAM controller, and graphics acceleration. The video synthesizer born out of those efforts, the Milkymist One, was launched in September 2011 with the help of open hardware company Sharism at Work.
-Components of the Milkymist system-on-chip soon found many other uses, such as software-defined radio on board the International Space Station. The community grew and activities diversified, with the development of a TDC core for CERN (using a variant of the Milkymist SoC for integration), the Migen logic design system and its application to the Rhino software-defined radio platform, and the Mixxeo digital video mixer. In 2013, Milkymist was renamed to M-Labs to mark the more varied activities. It is formally incorporated as M-Labs Limited.
+Components of the Milkymist system-on-chip soon found many other uses, such as software-defined radio on board the International Space Station. The community grew and activities diversified, with the development of a TDC core for CERN (using a variant of the Milkymist SoC for integration), the Migen logic design system and its application to the Rhino software-defined radio platform, and the Mixxeo digital video mixer. In 2013, Milkymist was renamed to M-Labs to mark the more varied activities, and formally incorporated in Hong Kong as M-Labs Limited.
-The company's current main project is ARTIQ, a next-generation open source control system for quantum information experiments.
+The company's current main project is ARTIQ, a leading-edge open source control system for quantum information experiments. In 2016, Robert Jördens joined the directorate of the company to further develop ARTIQ and other physics-related projects.
-Our address is:
+M-Labs Limited
+Workshop 15B 6/F Block B1
+Yau Tong Industrial City
+17 Ko Fai Rd
+Yau Tong, Hong Kong
+
It is a short walk from the Yau Tong MTR station. Take exit A2. Viewed from the MTR exit, Yau Tong Industrial City is inside that building:
+
+When entering from Ko Fai Road, get inside the courtyard, the entrance to Block B1 is in front of you on your left. Take the elevator or the stairs to the 6th floor. Call +852 59362721 if you get lost.
+
For the purpose of US government contracts (only), use the following address: 5/F Yat Chau Building, 262 Des Voeux Road Central, Hong Kong.
+ +We'd love to hear from you! Here is how you can communicate with us.
-For most questions and feedback, the best way is to use the mailing list. If you do not know how, simply send your message to devel at lists dot m-labs dot hk. Sébastien's email address is sb at m-labs dot hk but it is often better to use the mailing list (for example, other people may reply to technical questions, and answers stay archived and searchable).
-A good means of contact is also the IRC channel #m-labs on Freenode.
-Finally, you can follow our Twitter account.
-Patches should be sent to the mailing list, preferably using git-format-patch. Please do not use GitHub pull requests.
+For sales inquiries, email sales@m-***s.hk. You may also write to Sébastien or Robert respectively at sb@m-***s.hk and rj@m-***.hk. For questions regarding SolveSpace, write to Peter Zotov at pz@m-***s.hk.
+For technical inquiries, ask on the IRC channel #m-labs on Freenode, open a GitHub issue in the relevant project, or write to the mailing list devel (for Migen/MiSoC) or ARTIQ.
+Patches should be sent via a GitHub pull request, or to the mailing list preferably using git-format-patch.
|
M-Labs Limited |
- Freenode #m-labs Developer mailing list + | Freenode #m-labs GitHub: m-labs Twitter: @M_Labs_Ltd |
diff --git a/artiq/comp.png b/artiq/comp.png
deleted file mode 100644
index 517ebd8..0000000
Binary files a/artiq/comp.png and /dev/null differ
diff --git a/artiq/comp.svg b/artiq/comp.svg
new file mode 100644
index 0000000..2f391c2
--- /dev/null
+++ b/artiq/comp.svg
@@ -0,0 +1,558 @@
+
+
+
+
diff --git a/artiq/forkme_right_white_ffffff.png b/artiq/forkme_right_white_ffffff.png
deleted file mode 100644
index 8fe3a7e..0000000
Binary files a/artiq/forkme_right_white_ffffff.png and /dev/null differ
diff --git a/artiq/index.html b/artiq/index.html
index 1b7ed80..95e56e3 100644
--- a/artiq/index.html
+++ b/artiq/index.html
@@ -14,8 +14,6 @@
-
-
+ | + |
+ | |
|
M-Labs Limited |
- Freenode #m-labs Developer mailing list + | Freenode #m-labs GitHub: m-labs Twitter: @M_Labs_Ltd |
diff --git a/artiq/ion_trap.png b/artiq/ion_trap.png
deleted file mode 100644
index 75aa976..0000000
Binary files a/artiq/ion_trap.png and /dev/null differ
diff --git a/artiq/logo_arl.png b/artiq/logo_arl.png
new file mode 100644
index 0000000..5da6b87
Binary files /dev/null and b/artiq/logo_arl.png differ
diff --git a/artiq/logo_duke.png b/artiq/logo_duke.png
new file mode 100644
index 0000000..52dbb43
Binary files /dev/null and b/artiq/logo_duke.png differ
diff --git a/artiq/logo_ise.png b/artiq/logo_ise.png
new file mode 100644
index 0000000..6363f02
Binary files /dev/null and b/artiq/logo_ise.png differ
diff --git a/artiq/logo_jqi.png b/artiq/logo_jqi.png
new file mode 100644
index 0000000..e04ad13
Binary files /dev/null and b/artiq/logo_jqi.png differ
diff --git a/artiq/logo_nist.png b/artiq/logo_nist.png
new file mode 100644
index 0000000..865f9d7
Binary files /dev/null and b/artiq/logo_nist.png differ
diff --git a/artiq/logo_oxford.png b/artiq/logo_oxford.png
new file mode 100644
index 0000000..eef11c6
Binary files /dev/null and b/artiq/logo_oxford.png differ
diff --git a/artiq/nist_crate1.jpg b/artiq/nist_crate1.jpg
new file mode 100644
index 0000000..0cff09a
Binary files /dev/null and b/artiq/nist_crate1.jpg differ
diff --git a/artiq/nist_crate2.jpg b/artiq/nist_crate2.jpg
new file mode 100644
index 0000000..21549ff
Binary files /dev/null and b/artiq/nist_crate2.jpg differ
diff --git a/artiq/sinara1.png b/artiq/sinara1.png
new file mode 100644
index 0000000..79a2139
Binary files /dev/null and b/artiq/sinara1.png differ
diff --git a/artiq/sinara2.png b/artiq/sinara2.png
new file mode 100644
index 0000000..9692db8
Binary files /dev/null and b/artiq/sinara2.png differ
diff --git a/edaplayground.png b/edaplayground.png
deleted file mode 100644
index 6a56193..0000000
Binary files a/edaplayground.png and /dev/null differ
diff --git a/gateware.html b/gateware.html
index b3c0e2f..6a46b55 100644
--- a/gateware.html
+++ b/gateware.html
@@ -22,7 +22,6 @@
|
M-Labs Limited |
- Freenode #m-labs Developer mailing list + | Freenode #m-labs GitHub: m-labs Twitter: @M_Labs_Ltd |
diff --git a/index.html b/index.html
index 39b3eea..a4b30c5 100644
--- a/index.html
+++ b/index.html
@@ -22,22 +22,20 @@
|
M-Labs Limited |
- Freenode #m-labs Developer mailing list + | Freenode #m-labs GitHub: m-labs Twitter: @M_Labs_Ltd |
diff --git a/logo_small.png b/logo_small.png
index ff4c0e8..0cc5f21 100644
Binary files a/logo_small.png and b/logo_small.png differ
diff --git a/mixxeo_logo.png b/mixxeo_logo.png
index 571bcd2..a5a98bd 100644
Binary files a/mixxeo_logo.png and b/mixxeo_logo.png differ
diff --git a/mixxeo_logo_small.png b/mixxeo_logo_small.png
index 0dc12de..8ed82bc 100644
Binary files a/mixxeo_logo_small.png and b/mixxeo_logo_small.png differ
diff --git a/public_events.html b/public_events.html
deleted file mode 100644
index 95133f7..0000000
--- a/public_events.html
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
-
-
|
M-Labs Limited |
- Freenode #m-labs Developer mailing list + | Freenode #m-labs GitHub: m-labs Twitter: @M_Labs_Ltd |
diff --git a/style.css b/style.css
index f093919..d28c25a 100644
--- a/style.css
+++ b/style.css
@@ -3,16 +3,16 @@ body {
padding: 0;
font-size: 13px;
font-family: Arial, Helvetica, sans-serif;
- background: #1d1d20;
- color: #b3b3bb;
+ background: #fff;
+ color: #000;
}
a:link, a:visited {
- color: #7389ae;
+ color: #0053A1;
}
a:hover, a:active {
- color: #faec8f;
+ color: #00050A;
}
img {
@@ -29,25 +29,23 @@ h2 {
font-size: 20px;
border-bottom: 1px solid #27272a;
margin: 3px 0 3px;
- padding: 5px 0 4px;
- color: #fff;
+ padding: 5px 0 0px;
+ color: #0053A1;
clear: both;
- text-shadow: 1px 2px 1px #131315;
}
h3 {
font-size: 18px;
margin: 10px 0 3px;
- color: #fff;
+ color: #0053A1;
clear: both;
- text-shadow: 1px 2px 1px #131315;
text-align: center;
}
h4 {
font-size: 16px;
margin: 10px 0 3px;
- color: #fff;
+ color: #0053A1;
clear: both;
border-bottom: 1px solid #27272a;
}
@@ -74,9 +72,8 @@ table.td td {
}
div#header {
- background: #171814;
height: 91px;
- border-bottom: 2px solid rgb(239,1,124);
+ background: rgb(0,0,0);
}
div#header p, div#header h1 {
@@ -144,36 +141,31 @@ ul#menu li a {
height: 15px;
padding: 5px 0;
display: block;
- background: #606c88; /* Old browsers */
- background: -moz-linear-gradient(top, #606c88 0%, #3f4c6b 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#606c88), color-stop(100%,#3f4c6b)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /* Opera 11.10+ */
- background: -ms-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /* IE10+ */
- background: linear-gradient(to bottom, #606c88 0%,#3f4c6b 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#606c88', endColorstr='#3f4c6b',GradientType=0 ); /* IE6-9 */
+ background: #0053A1; /* Old browsers */
+ background: -moz-linear-gradient(top, #0053A1 0%, #004280 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0053A1), color-stop(100%,#004280)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #0053A1 0%,#004280 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #0053A1 0%,#004280 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #0053A1 0%,#004280 100%); /* IE10+ */
+ background: linear-gradient(to bottom, #0053A1 0%,#004280 100%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0053A1', endColorstr='#004280',GradientType=0 ); /* IE6-9 */
}
ul#menu li a:hover, ul#menu li a:active {
- background: #8993ab; /* Old browsers */
- background: -moz-linear-gradient(top, #8993ab 0%, #6376a3 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#8993ab), color-stop(100%,#6376a3)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #8993ab 0%,#6376a3 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #8993ab 0%,#6376a3 100%); /* Opera 11.10+ */
- background: -ms-linear-gradient(top, #8993ab 0%,#6376a3 100%); /* IE10+ */
- background: linear-gradient(to bottom, #8993ab 0%,#6376a3 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#8993ab', endColorstr='#6376a3',GradientType=0 ); /* IE6-9 */
+ background: #007cf1; /* Old browsers */
+ background: -moz-linear-gradient(top, #007cf1 0%, #004280 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#007cf1), color-stop(100%,#004280)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #007cf1 0%,#004280 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #007cf1 0%,#004280 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #007cf1 0%,#004280 100%); /* IE10+ */
+ background: linear-gradient(to bottom, #007cf1 0%,#004280 100%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#007cf1', endColorstr='#004280',GradientType=0 ); /* IE6-9 */
}
ul#menu li a.selected {
- background: rgb(255,93,177); /* Old browsers */
- background: -moz-linear-gradient(top, rgba(255,93,177,1) 0%, rgba(239,1,124,1) 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,93,177,1)), color-stop(100%,rgba(239,1,124,1))); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, rgba(255,93,177,1) 0%,rgba(239,1,124,1) 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, rgba(255,93,177,1) 0%,rgba(239,1,124,1) 100%); /* Opera 11.10+ */
- background: -ms-linear-gradient(top, rgba(255,93,177,1) 0%,rgba(239,1,124,1) 100%); /* IE10+ */
- background: linear-gradient(to bottom, rgba(255,93,177,1) 0%,rgba(239,1,124,1) 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff5db1', endColorstr='#ef017c',GradientType=0 ); /* IE6-9 */
+ background: rgb(255,255,255);
+ color: #000;
+ text-shadow: none;
}
div.pictures {
@@ -182,8 +174,8 @@ div.pictures {
}
div.picture {
- background: #171814;
- color: #b3b3bb;
+ background: #fff;
+ color: #000;
border: 1px solid #000;
}
@@ -209,22 +201,22 @@ div.full {
}
#container h2.section a:hover, #container h2.options a:hover {
- color: #faf3c7;
+ color: #cac397;
}
#footer {
- border-top: 2px solid #2a2a2f;
+ border-top: 1px solid #808080;
margin-top: 30px;
font-size: 9px;
- color: #595965;
+ color: #000;
line-height: 1.5em;
clear: both;
- background: rgb(23,24,20); /* Old browsers */
- background: -moz-linear-gradient(top, rgba(23,24,20,1) 0%, rgba(29,29,32,1) 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(23,24,20,1)), color-stop(100%,rgba(29,29,32,1))); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, rgba(23,24,20,1) 0%,rgba(29,29,32,1) 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, rgba(23,24,20,1) 0%,rgba(29,29,32,1) 100%); /* Opera 11.10+ */
- background: -ms-linear-gradient(top, rgba(23,24,20,1) 0%,rgba(29,29,32,1) 100%); /* IE10+ */
- background: linear-gradient(to bottom, rgba(23,24,20,1) 0%,rgba(29,29,32,1) 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#171814', endColorstr='#1d1d20',GradientType=0 ); /* IE6-9 */
+ background: rgb(192,192,192); /* Old browsers */
+ background: -moz-linear-gradient(top, rgba(192,192,192,1) 0%, rgba(255,255,255,1) 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(192,192,192,1)), color-stop(100%,rgba(255,255,255,1))); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, rgba(192,192,192,1) 0%,rgba(255,255,255,1) 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, rgba(192,192,192,1) 0%,rgba(255,255,255,1) 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, rgba(192,192,192,1) 0%,rgba(255,255,255,1) 100%); /* IE10+ */
+ background: linear-gradient(to bottom, rgba(192,192,192,1) 0%,rgba(255,255,255,1) 100%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#c0c0c0', endColorstr='#ffffff',GradientType=0 ); /* IE6-9 */
}
diff --git a/video.html b/video.html
index 1e6b92c..837541e 100644
--- a/video.html
+++ b/video.html
@@ -22,7 +22,6 @@
|
M-Labs Limited |
- Freenode #m-labs Developer mailing list + | Freenode #m-labs GitHub: m-labs Twitter: @M_Labs_Ltd |