diff --git a/website/css/style.css b/website/css/style.css index ac6df65..a0fdb5b 100644 --- a/website/css/style.css +++ b/website/css/style.css @@ -239,15 +239,23 @@ p { box-shadow: 0 10px 20px rgba(0, 0, 0, 0.1); } .merchant-list { - /* max-width: 210px; */ + width: 210px; + height: 210px; - border-radius: 10px; text-align: center; } +.merchant-item { + width: 210px; + height: 210px; + display: flex; + align-items: center; + padding: 0 14px; + box-shadow: 0px 0px 40px -5px rgba(74, 84, 123, 0.15); + border-radius: 10px; +} .merchant-list img { width: 100%; - display: inline-block; - box-shadow: 0px 0px 40px -5px rgba(74, 84, 123, 0.15); + align-items: center; } .merchant-img-container { width: 117vw; @@ -1770,7 +1778,53 @@ p { margin-bottom: 50px; } } - +.team-container { + width: 100%; + overflow-x: auto; + margin-bottom: 40px; +} +.team-box { + width: 2600px; +} +.team-box::after { + clear: both; + content: ''; + display: block; +} +.team-card { + width: 485px; + height: 232px; + background: #ffffff; + box-shadow: 0px 0px 40px 0px rgba(110, 127, 193, 0.1); + border-radius: 20px; + margin-right: 32px; + padding: 32px; + float: left; +} +.team-card img { + width: 168px; + height: 168px; + border-radius: 50%; +} +.team-card .team-info { + display: inline-block; + vertical-align: middle; + margin-left: 10px; + font-family: PingFangSC-Medium, PingFang SC; +} +.team-card .team-info p { + font-size: 32px; + font-weight: 500; + color: #232323; + line-height: 30px; + margin-bottom: 25px; +} +.team-card .team-info span { + font-size: 32px; + font-weight: 400; + color: #7a7a7a; + line-height: 30px; +} /* ---------------------------------------------------------------- */ /* 13.Testimonial Section /* ---------------------------------------------------------------- */ diff --git a/website/img/101.jpg b/website/img/101.jpg new file mode 100644 index 0000000..2a53647 Binary files /dev/null and b/website/img/101.jpg differ diff --git a/website/img/47.jpg b/website/img/47.jpg new file mode 100644 index 0000000..5f054d7 Binary files /dev/null and b/website/img/47.jpg differ diff --git a/website/img/Bitmap1.png b/website/img/Bitmap1.png new file mode 100644 index 0000000..c9f662c Binary files /dev/null and b/website/img/Bitmap1.png differ diff --git a/website/img/Bitmap1@2x.png b/website/img/Bitmap1@2x.png new file mode 100644 index 0000000..2433aff Binary files /dev/null and b/website/img/Bitmap1@2x.png differ diff --git a/website/img/Bitmap1@3x.png b/website/img/Bitmap1@3x.png new file mode 100644 index 0000000..bbc41bd Binary files /dev/null and b/website/img/Bitmap1@3x.png differ diff --git a/website/img/Bitmap2.png b/website/img/Bitmap2.png new file mode 100644 index 0000000..cc2fe76 Binary files /dev/null and b/website/img/Bitmap2.png differ diff --git a/website/img/Bitmap2@2x.png b/website/img/Bitmap2@2x.png new file mode 100644 index 0000000..ea6b89b Binary files /dev/null and b/website/img/Bitmap2@2x.png differ diff --git a/website/img/Bitmap2@3x.png b/website/img/Bitmap2@3x.png new file mode 100644 index 0000000..1abcd19 Binary files /dev/null and b/website/img/Bitmap2@3x.png differ diff --git a/website/img/Bitmap3.png b/website/img/Bitmap3.png new file mode 100644 index 0000000..3915cca Binary files /dev/null and b/website/img/Bitmap3.png differ diff --git a/website/img/Bitmap3@2x.png b/website/img/Bitmap3@2x.png new file mode 100644 index 0000000..938152b Binary files /dev/null and b/website/img/Bitmap3@2x.png differ diff --git a/website/img/Bitmap3@3x.png b/website/img/Bitmap3@3x.png new file mode 100644 index 0000000..1833953 Binary files /dev/null and b/website/img/Bitmap3@3x.png differ diff --git a/website/img/Group 2 Copy 2.png b/website/img/Group 2 Copy 2.png new file mode 100644 index 0000000..343c592 Binary files /dev/null and b/website/img/Group 2 Copy 2.png differ diff --git a/website/img/Group 2 Copy 2@2x.png b/website/img/Group 2 Copy 2@2x.png new file mode 100644 index 0000000..a60c26f Binary files /dev/null and b/website/img/Group 2 Copy 2@2x.png differ diff --git a/website/img/Group 2 Copy 2@3x.png b/website/img/Group 2 Copy 2@3x.png new file mode 100644 index 0000000..023d629 Binary files /dev/null and b/website/img/Group 2 Copy 2@3x.png differ diff --git a/website/img/Group 3 Copy.png b/website/img/Group 3 Copy.png new file mode 100644 index 0000000..210231a Binary files /dev/null and b/website/img/Group 3 Copy.png differ diff --git a/website/img/Group 3 Copy@2x.png b/website/img/Group 3 Copy@2x.png new file mode 100644 index 0000000..7ab1bcf Binary files /dev/null and b/website/img/Group 3 Copy@2x.png differ diff --git a/website/img/Group 3 Copy@3x.png b/website/img/Group 3 Copy@3x.png new file mode 100644 index 0000000..55b9fbc Binary files /dev/null and b/website/img/Group 3 Copy@3x.png differ diff --git a/website/img/Group Copy 4.png b/website/img/Group Copy 4.png new file mode 100644 index 0000000..1ebfece Binary files /dev/null and b/website/img/Group Copy 4.png differ diff --git a/website/img/Group Copy 4@2x.png b/website/img/Group Copy 4@2x.png new file mode 100644 index 0000000..3f81b92 Binary files /dev/null and b/website/img/Group Copy 4@2x.png differ diff --git a/website/img/Group Copy 4@3x.png b/website/img/Group Copy 4@3x.png new file mode 100644 index 0000000..da3eaeb Binary files /dev/null and b/website/img/Group Copy 4@3x.png differ diff --git a/website/img/digital.jpg b/website/img/digital.jpg new file mode 100644 index 0000000..8af84e6 Binary files /dev/null and b/website/img/digital.jpg differ diff --git a/website/img/logo1.svg b/website/img/logo1.svg new file mode 100644 index 0000000..a3c3910 --- /dev/null +++ b/website/img/logo1.svg @@ -0,0 +1,15 @@ + + + + hw.b9123f6c + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/website/img/logo2.svg b/website/img/logo2.svg new file mode 100644 index 0000000..fa8ab1d --- /dev/null +++ b/website/img/logo2.svg @@ -0,0 +1,15 @@ + + + + Group 8 + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/website/img/logo3.svg b/website/img/logo3.svg new file mode 100644 index 0000000..0278048 --- /dev/null +++ b/website/img/logo3.svg @@ -0,0 +1,15 @@ + + + + Group 7 + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/website/img/ralap.jpg b/website/img/ralap.jpg new file mode 100644 index 0000000..8248375 Binary files /dev/null and b/website/img/ralap.jpg differ diff --git a/website/img/siwjie.jpg b/website/img/siwjie.jpg new file mode 100644 index 0000000..9a3aa67 Binary files /dev/null and b/website/img/siwjie.jpg differ diff --git a/website/img/徐小夕.jpg b/website/img/徐小夕.jpg new file mode 100644 index 0000000..df3a353 Binary files /dev/null and b/website/img/徐小夕.jpg differ diff --git a/website/img/背完单词看视频.jpg b/website/img/背完单词看视频.jpg new file mode 100644 index 0000000..0163bfd Binary files /dev/null and b/website/img/背完单词看视频.jpg differ diff --git a/website/img/黎光.jpg b/website/img/黎光.jpg new file mode 100644 index 0000000..fb9e4c6 Binary files /dev/null and b/website/img/黎光.jpg differ diff --git a/website/index.html b/website/index.html index 6d24980..9c2acd5 100644 --- a/website/index.html +++ b/website/index.html @@ -458,9 +458,9 @@
- - - + + +
@@ -489,22 +489,22 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -525,6 +525,45 @@ + +
+
+
+ +
+

产品/技术/运营

+ 徐小夕 +
+
+
+ +
+

技术

+ 背完单词看视频 +
+
+
+ +
+

技术

+ Ralap_C +
+
+
+ +
+

设计师

+ 47 +
+
+
+ +
+

运营

+ 黎光 +
+
+